Skip to content

Commit 7484e74

Browse files
committed
Merge branch 'main' into webpack5
2 parents ba5c5d9 + 8e6791c commit 7484e74

6 files changed

Lines changed: 175 additions & 86 deletions

File tree

.eslintrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
3+
module.exports = {
4+
extends: "./node_modules/terriajs/.eslintrc.js"
5+
};

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To get in touch:
1717

1818
## Major announcements
1919

20-
Following is a list of major announcements and upgrades that may affect users maintaining a fork (copied from [TerriaJS announcements](https://github.com/TerriaJS/terriajs/discussions/categories/announcements)). For a full list of changes to TerriaMap, including the latest versions of TerriaJS included with each release please refer to [CHANGES.md](https://github.com/TerriaJS/TerriaMap/blob/main/CHANGES.md).
20+
Following is a list of major announcements and upgrades that may affect users maintaining a fork (copied from [TerriaJS announcements](https://github.com/TerriaJS/terriajs/discussions/categories/announcements)). For a full list of changes to TerriaMap, including the latest versions of TerriaJS included with each release please refer to [CHANGES.md](https://github.com/TerriaJS/TerriaMap/blob/main/CHANGES.md).
2121

2222
### We have released TerriaJS v8.3.0 (2023-05-22)
2323

gulpfile.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,9 @@ gulp.task(
186186

187187
gulp.task("lint", function (done) {
188188
var runExternalModule = require("terriajs/buildprocess/runExternalModule");
189-
190-
runExternalModule("eslint/bin/eslint.js", [
191-
"-c",
192-
path.join(getPackageRoot("terriajs"), ".eslintrc.js"),
193-
"--ignore-pattern",
194-
"lib/ThirdParty",
189+
const eslintDir = path.dirname(require.resolve("eslint/package.json"));
190+
const eslintExecutable = path.join(eslintDir, "bin", "eslint.js");
191+
runExternalModule(eslintExecutable, [
195192
"--max-warnings",
196193
"0",
197194
"index.js",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"devDependencies": {
4444
"@babel/core": "^7.23.5",
4545
"@babel/eslint-parser": "^7.23.3",
46+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
4647
"@babel/preset-env": "^7.23.5",
4748
"@babel/preset-react": "^7.23.3",
48-
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
4949
"@typescript-eslint/eslint-plugin": "^6.12.0",
5050
"@typescript-eslint/parser": "^6.12.0",
5151
"babel-loader": "^9.2.1",

0 commit comments

Comments
 (0)