Skip to content

Commit 6f5eef0

Browse files
authored
Merge pull request #648 from TerriaJS/sass-upgrade
Replace `node-sass` with (dart) `sass`
2 parents f3876b9 + 2d8a769 commit 6f5eef0

5 files changed

Lines changed: 73 additions & 397 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node-version: [14.x, 16.x]
14+
node-version: [16.x, 18.x, 20.x]
1515

1616
steps:
1717
- uses: actions/checkout@v2
@@ -22,4 +22,5 @@ jobs:
2222
- run: rm -rf node_modules && yarn install --frozen-lockfile
2323
- run: yarn gulp lint release
2424
env:
25-
NODE_OPTIONS: --max_old_space_size=4096
25+
# We need to use --openssl-legacy-provider for node 18.x and node 20.x
26+
NODE_OPTIONS: ${{ matrix.node-version != '16.x' && '--max_old_space_size=4096 --openssl-legacy-provider' || '--max_old_space_size=4096'}}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ yarn-error.log
2828
.npmrc
2929

3030
package-lock.json
31+
.nvmrc

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
### The Next Release
44

5+
- Updated TerriaJS to `8.4.x`.
6+
- Replaced `node-sass` with `sass`. ("both packages expose the same JavaScript API", so no changes should be required)
57
- [The next improvement]
68

79
### `0.0.9`

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
"json5": "^2.1.0",
6161
"minimist": "^1.2.8",
6262
"node-notifier": "^5.1.2",
63-
"node-sass": "^6.0.1",
6463
"plugin-error": "^1.0.1",
6564
"prettier": "2.7.1",
6665
"pretty-quick": "^1.10.0",
@@ -70,11 +69,12 @@
7069
"react-dom": "^16.14.0",
7170
"redbox-react": "^1.3.6",
7271
"resolve-url-loader": "^3.0.1",
72+
"sass": "^1.66.1",
7373
"sass-loader": "^10",
7474
"semver": "^5.0.0",
7575
"style-loader": "^0.23.1",
7676
"svg-sprite-loader": "4.1.3",
77-
"terriajs": "8.3.9",
77+
"terriajs": "8.4.0",
7878
"terriajs-cesium": "1.92.0-tile-error-provider-fix-2",
7979
"ts-loader": "^5.3.3",
8080
"typescript": "^4.9.5",

0 commit comments

Comments
 (0)