Skip to content

Upgrade TS, cesium, mobx etc. #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Upgrade TS, cesium, mobx etc. #765

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1271fb9
Use default babel config from terriajs to build terriamap.
na9da Sep 11, 2025
c03d576
Cleanup resolutions, upgrade packages, remove webpack-dev-server.
na9da Sep 11, 2025
a790827
Temporarily switch terriajs dep to git branch.
na9da Sep 11, 2025
6414236
Add cesium packages to workspace.
na9da Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 deletions buildprocess/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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 })]
Comment on lines -39 to +40
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use same default babel settings as terriajs defined here - https://github.com/TerriaJS/terriajs/blob/upgrade-ts-592/buildprocess/defaultBabelLoader.js

},
// import html file as string
{
Expand Down
26 changes: 9 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"workspaces": {
"packages": [
"packages/terriajs",
"packages/terriajs-cesium/packages/engine",
"packages/terriajs-cesium/packages/widgets",
"packages/terriajs-server",
"packages/plugin-sample"
],
Expand Down Expand Up @@ -34,20 +32,16 @@
}
},
"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.23.5",
"@babel/preset-env": "^7.23.5",
"@babel/preset-react": "^7.23.3",
"@babel/core": "^7.28.0",
"@babel/preset-env": "^7.28.0",
"@babel/preset-react": "^7.27.1",
"@typescript-eslint/eslint-plugin": "^8.24.0",
"@typescript-eslint/parser": "^8.24.0",
"babel-loader": "^9.2.1",
"babel-loader": "^10.0.0",
"css-loader": "^7.1.2",
"ejs": "^3.1.10",
"eslint": "^8.57.1",
Expand All @@ -66,7 +60,7 @@
"minimist": "^1.2.8",
"node-notifier": "^10.0.1",
"plugin-error": "^2.0.1",
"prettier": "2.7.1",
"prettier": "2.8.8",
"pretty-quick": "^4.0.0",
"prop-types": "^15.6.0",
"react": "^18.3.1",
Expand All @@ -76,15 +70,14 @@
"sass-loader": "^16.0.3",
"style-loader": "^4.0.0",
"svg-sprite-loader": "^6.0.11",
"terriajs": "8.10.0",
"terriajs-cesium": "8.0.2",
"terriajs": "terriajs/terriajs#upgrade-ts-592",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just make sure this is updated before merging

"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": {
Expand All @@ -95,7 +88,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 ."
}
Expand Down
Loading