Merge remote-tracking branch 'origin/upgrade-ts-592' into test-lispy-style-eval

Author: na9da

buildprocess/webpack.config.js

@@ -3,6 +3,7 @@
 
 const configureWebpackForTerriaJS = require("terriajs/buildprocess/configureWebpack");
 const configureWebpackForPlugins = require("./configureWebpackForPlugins");
+const defaultBabelLoader = require("terriajs/buildprocess/defaultBabelLoader");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const path = require("path");
 
@@ -36,29 +37,7 @@ module.exports = function (devMode) {
             path.resolve(__dirname, "..", "plugins.ts"),
             path.resolve(__dirname, "..", "lib")
           ],
-          use: [
-            {
-              loader: "babel-loader",
-              options: {
-                cacheDirectory: true,
-                presets: [
-                  [
-                    "@babel/preset-env",
-                    {
-                      corejs: 3,
-                      useBuiltIns: "usage"
-                    }
-                  ],
-                  ["@babel/preset-react", { runtime: "automatic" }],
-                  ["@babel/preset-typescript", { allowNamespaces: true }]
-                ],
-                plugins: [
-                  ["@babel/plugin-proposal-decorators", { legacy: true }],
-                  "babel-plugin-styled-components"
-                ]
-              }
-            }
-          ]
+          use: [defaultBabelLoader({ devMode })]
         },
         // import html file as string
         {

package.json

@@ -34,12 +34,8 @@
     }
   },
   "resolutions": {
-    "underscore": "^1.12.1",
     "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.1",
-    "@types/lodash": "4.14.182",
-    "@types/css-font-loading-module": "^0.0.13",
-    "@types/node": "^22.13.1"
+    "@types/react-dom": "^18.3.1"
   },
   "devDependencies": {
     "@babel/core": "^7.28.0",
@@ -76,15 +72,14 @@
     "sass-loader": "^16.0.3",
     "style-loader": "^4.0.0",
     "svg-sprite-loader": "^6.0.11",
-    "terriajs": "8.10.0",
-    "terriajs-cesium": "18.0.0",
+    "terriajs": "terriajs/terriajs#upgrade-ts-592",
+    "terriajs-cesium": "20.0.1",
     "terriajs-plugin-api": "0.0.1-alpha.17",
     "terriajs-plugin-sample": "0.0.1-alpha.7",
-    "typescript": "5.7.3",
+    "typescript": "^5.9.2",
     "urijs": "^1.18.12",
     "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.1.0",
     "yargs": "^17.7.2"
   },
   "scripts": {
@@ -95,7 +90,6 @@
     "start": "terriajs-server --config-file serverconfig.json",
     "gulp": "gulp",
     "postinstall": "echo 'Installation successful. What to do next:\\n  yarn gulp dev   # Starts the server on port 3001, builds TerriaMap and dependencies, and rebuilds if files change.'",
-    "hot": "webpack-dev-server --inline --config buildprocess/webpack.config.hot.js --hot --host 0.0.0.0",
     "prettier": "prettier --write .",
     "prettier-check": "prettier --check ."
   }