Merge branch 'main' into cjs-to-esm

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [16.x, 18.x, 20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,4 +22,4 @@ jobs:
       - run: rm -rf node_modules && yarn install --frozen-lockfile
       - run: yarn gulp lint release
         env:
-          NODE_OPTIONS: '--max_old_space_size=4096'
+          NODE_OPTIONS: "--max_old_space_size=4096"

CHANGES.md

@@ -1,5 +1,25 @@
 # Change Log
 
+#### 0.2.3
+
+**2024-11-29**
+
+- Updated TerriaJS to `8.7.10`
+  - Added OpenStreetMap as a default map
+  - Upgraded gulp to version 5
+    - Gulp 5 defaults to encoding copied files as utf-8, had turn off encoding by setting `encoding: false` to correctly copy binary assets from dependencies.
+  - Bunch of other packages upgraded, [see CHANGES](https://github.com/TerriaJS/terriajs/blob/main/CHANGES.md#8710---2024-11-29).
+
+### `0.2.2`
+
+**2024-11-22**
+
+- Updated TerriaJS to `8.7.9`.
+  - **Breaking changes:**
+    - Removed the basemaps - positron, darkmatter and black-marble - from the default settings. The Carto ones are no longer free and requires an [Enterprise or Grantee license](https://carto.com/basemaps). If you have the appropriate license you can add them via your [initialization file](https://docs.terria.io/guide/customizing/initialization-files/#basemaps). [Example configuration](https://gist.github.com/na9da/ef7871afee7cbe3d0a95e5b6351834c9).
+  - Added [I3SCatalogItem](https://docs.terria.io/guide/connecting-to-data/catalog-type-details/i3s/)
+  - Added [CogCatalogItem](https://docs.terria.io/guide/connecting-to-data/catalog-type-details/cog/)
+
 ### `0.2.1`
 
 **2024-08-07**

gulpfile.js

@@ -164,7 +164,7 @@ gulp.task("copy-terriajs-assets", function () {
   var destPath = path.resolve(__dirname, "wwwroot", "build", "TerriaJS");
 
   return gulp
-    .src([sourceGlob], { base: terriaWebRoot })
+    .src([sourceGlob], { base: terriaWebRoot, encoding: false })
     .pipe(gulp.dest(destPath));
 });
 

package.json

@@ -13,7 +13,7 @@
     ]
   },
   "name": "terriajs-map",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Geospatial catalog explorer based on TerriaJS.",
   "license": "Apache-2.0",
   "engines": {
@@ -46,6 +46,7 @@
     "@babel/eslint-parser": "^7.23.3",
     "@babel/preset-env": "^7.23.5",
     "@babel/preset-react": "^7.23.3",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.12.0",
     "babel-loader": "^8.2.3",
@@ -55,20 +56,21 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "fetch-mock": "^11.1.5",
     "file-loader": "^3.0.1",
     "fork-ts-checker-notifier-webpack-plugin": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^6.0.0",
     "fs-extra": "^7.0.1",
-    "gulp": "^4.0.0",
+    "gulp": "^5.0.0",
     "husky": "^8.0.3",
     "is-subdir": "^1.2.0",
     "json5": "^2.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.8",
-    "node-notifier": "^5.1.2",
+    "node-notifier": "^10.0.1",
     "plugin-error": "^1.0.1",
     "prettier": "2.7.1",
-    "pretty-quick": "^1.10.0",
+    "pretty-quick": "^4.0.0",
     "prop-types": "^15.6.0",
     "raw-loader": "^1.0.0",
     "react": "^16.14.0",
@@ -80,17 +82,16 @@
     "semver": "^5.0.0",
     "style-loader": "^0.23.1",
     "svg-sprite-loader": "^6.0.11",
-    "terriajs": "8.7.8",
+    "terriajs": "8.7.10",
     "terriajs-cesium": "8.0.1",
     "terriajs-plugin-api": "0.0.1-alpha.16",
     "terriajs-plugin-sample": "0.0.1-alpha.7",
-    "ts-loader": "^5.3.3",
     "typescript": "~5.2.0",
     "urijs": "^1.18.12",
     "url-loader": "^1.1.2",
     "webpack": "~4.47.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.1.14",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.15.2",
     "yargs": "^17.7.2"
   },
   "scripts": {

wwwroot/init/simple.json

@@ -762,7 +762,7 @@
   ],
   "viewerMode": "3dSmooth",
   "baseMaps": {
-    "defaultBaseMapId": "basemap-positron",
-    "previewBaseMapId": "basemap-positron"
+    "defaultBaseMapId": "basemap-openstreetmap",
+    "previewBaseMapId": "basemap-natural-earth-II"
   }
 }