Skip to content
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

Webpack 5 upgrade #7351

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

Webpack 5 upgrade #7351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 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
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"
],
"assumptions": {
"setPublicClassFields": false
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 [email protected]

# Clone and build TerriaMap, using this version of TerriaJS
TERRIAJS_COMMIT_HASH=$(git rev-parse HEAD)
git clone -b cjs-to-esm 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
Loading