Skip to content

Webpack 5 upgrade #7351

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

Merged
na9da merged 49 commits into from
Feb 12, 2025
Merged

Webpack 5 upgrade #7351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
055f80e
Initial changes for webpack 5 upgrade.
na9da Dec 4, 2024
24432ee
Migrate to modern SASS api.
na9da Dec 4, 2024
5bf5b22
Convert spec fixtures imports to valid ESM style.
na9da Dec 4, 2024
8ce997a
Convert asset imports to valid ESM style.
na9da Dec 4, 2024
ed0ddbd
Remove nullish checks.
na9da Dec 4, 2024
1ec85e7
Update parameters.
na9da Dec 4, 2024
ceced0c
Update .babelrc.
na9da Dec 4, 2024
3edacc0
Add types for csv, dac and xml imports.
na9da Dec 4, 2024
018a6aa
Use webpack5 version of tiff imagery provider.
na9da Dec 4, 2024
913b35e
Temporarily use webpack5 branch for CI.
na9da Dec 4, 2024
f9c6a68
Disable lint temporarily until we fix the import problem.
na9da Dec 4, 2024
56f96b3
Prettier scss files.
na9da Dec 4, 2024
d3736be
Remove cesium debug pragma from dev mode (for now).
na9da Dec 4, 2024
212044f
Rewrite search provider specs to not depend on CJS module feature.
na9da Dec 4, 2024
18609cf
Fix SASS import for timeline component.
na9da Dec 4, 2024
95d9bb2
Fix tools build script.
na9da Dec 5, 2024
3d63532
Update terriajs-tiff-imagery-provider.
na9da Dec 5, 2024
7ce0d00
Fix TIFF imagery provider import.
na9da Dec 5, 2024
02309d0
Replace require() for images with import.
na9da Dec 6, 2024
77cf215
Replace asset require() in lib with import.
na9da Dec 6, 2024
0de2466
Convert remaining require() in specs to import.
na9da Dec 6, 2024
2e60b04
Merge remote-tracking branch 'origin/main' into webpack5
zoran995 Feb 10, 2025
23f8a29
update yarn.lock
zoran995 Feb 10, 2025
672c043
uninstall removed babel plugins
zoran995 Dec 9, 2024
5ea136c
remove terser-webpack-plugin resolution
zoran995 Dec 9, 2024
e083423
change default token message
zoran995 Jan 28, 2025
30a1e4f
reorder entries in package.json
zoran995 Jan 29, 2025
7d6051e
bump fork-ts-checker webpack plugins
zoran995 Jan 29, 2025
c9b7816
bump copy-webpack-plugin
zoran995 Jan 29, 2025
a410a2a
remove @types/webpack as it is now published by webpack in v5
zoran995 Jan 29, 2025
c6c82b7
remove istanbul-instrumenter-loader as unused dependency
zoran995 Jan 29, 2025
99c1e5b
pass correct dev mode param to webpack config
zoran995 Feb 2, 2025
abefbe0
remove unused scss classes
zoran995 Feb 2, 2025
583ab55
use already resolve cesiumDir path
zoran995 Feb 2, 2025
0d9ee28
remove sideeffects: false from package.json
zoran995 Feb 6, 2025
216787d
fix protomaps import warning
zoran995 Feb 6, 2025
2eebf40
fix protomap build issue
zoran995 Feb 6, 2025
32cbd31
convert polyfill.js to esm
zoran995 Feb 6, 2025
d7c44eb
feat: restore worker-loader
zoran995 Feb 7, 2025
5dc73d4
Upgrade to terriajs-cesium 8.0.2.
na9da Feb 11, 2025
b2f845b
Set node engine version to match nvmrc.
na9da Feb 11, 2025
375f6f4
Upgrade min node engine version to > 20.x.
na9da Feb 11, 2025
6bf71b0
Update eslint version.
na9da Feb 11, 2025
37a99e9
Update terriajs-cesium-widgets.
na9da Feb 11, 2025
5994753
Remove polyfill.js.
na9da Feb 11, 2025
055923e
Remove unused dependency.
na9da Feb 11, 2025
2a1cae0
Update CHANGES.md.
na9da Feb 11, 2025
0d74644
Prettier fix.
na9da Feb 11, 2025
86a5722
Formatting fix.
na9da Feb 11, 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
7 changes: 1 addition & 6 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@
["@babel/typescript", { "allowNamespaces": true }]
],
"plugins": [
"@babel/plugin-transform-modules-commonjs",
["@babel/plugin-proposal-decorators", { "legacy": true }],
"@babel/plugin-proposal-class-properties",
"@babel/proposal-object-rest-spread",
"babel-plugin-styled-components",
"@babel/plugin-syntax-dynamic-import",
"babel-plugin-lodash"
"babel-plugin-styled-components"

@pjonsson pjonsson Dec 14, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is there anything else controlling babel plugins in the tree, or should the removed babel plugins also be removed from package.json/yarn.lock?

Edit: (I think removing these plugins from package.json/yarn.lock would remove a bunch of warnings, and possibly also remove something from yarn audit so I would love that.)

@zoran995 zoran995 Jan 22, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

to make it easier pjonsson is referring to

  • @babel/plugin-proposal-class-properties
  • @babel/plugin-proposal-nullish-coalescing-operator
  • @babel/plugin-proposal-object-rest-spread
  • @babel/plugin-proposal-optional-chaining
  • babel/plugin-syntax-dynamic-import

@pjonsson pjonsson Dec 16, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm not sure where this comment fits, but commit dfaf253 added a lib/Core/prerequisites.js which seems to be about compiling to ES5 (which is also what Babel does?).

Should some things be removed from that file as well?

],
"assumptions": {
"setPublicClassFields": false
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.19.1
v20.18.3
10 changes: 10 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

#### next release (8.7.12)

- **Breaking changes:**
- Upgrade Webpack to version 5
- Converted remaining CJS style modules and `require()` calls to ESM and `import` statements.
- Removed babel transformation to CJS for default build (we still use it for nodejs).
- Removed several other babel transforms (for JS features that should now be widely supported).
- Refactor and clean up configureWebpack.js. `configureWebpack()` now accepts a single object parameter.
- Removed code for hot reloading
- Upgraded `sass` to version 1.80+
- Migrated SASS files to use `modern` API (by running the `sass-migrator` script)
- Replaced webpack aliases `~terriajs-variables` and `~terriajs-mixins` with respective relative path. This was necessary to run the migrator. It also results in simpler webpack configuration.
- Remove `MapboxImageryProvider`, `createRegionMappedImageryProvider` now uses `ProtomapsImageryProvider`.
- Update `protomaps` to `protomaps-leaflet`. This fixes the 5400 vertex limit in a single tile.
- The very basic support of mvt style spec is now handled by Terria in [`lib/Map/Vector/mapboxStyleJsonToProtomaps.ts`](lib/Map/Vector/mapboxStyleJsonToProtomaps.ts)
Expand Down
2 changes: 1 addition & 1 deletion buildprocess/ci-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ yarn add -W request@2.83.0

# Clone and build TerriaMap, using this version of TerriaJS
TERRIAJS_COMMIT_HASH=$(git rev-parse HEAD)
git clone -b main https://github.com/TerriaJS/TerriaMap.git
git clone -b webpack5 https://github.com/TerriaJS/TerriaMap.git
cd TerriaMap
TERRIAMAP_COMMIT_HASH=$(git rev-parse HEAD)
sed -i -e 's@"terriajs": ".*"@"terriajs": "'$GITHUB_REPOSITORY'#'${GITHUB_BRANCH}'"@g' package.json
Expand Down
Loading