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.

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

[node-build-scripts] feat: upgrade to node-sass v6 #5211

Merged
merged 14 commits into from
Mar 31, 2022
42 changes: 26 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
version: 2
version: 2.1

orbs:
browser-tools: circleci/browser-tools@1.2.5

aliases:
- &docker-node-lts
- image: circleci/node:12
- &docker-node-image
- image: cimg/node:12.22

- &docker-node-browsers
- image: circleci/node:12-browsers
- &docker-node-browsers-image
- image: cimg/node:12.22-browsers
environment:
CHROME_BIN: "/usr/bin/google-chrome"

Expand Down Expand Up @@ -35,7 +38,7 @@ references:

jobs:
checkout-code:
docker: *docker-node-lts
docker: *docker-node-image
steps:
- checkout
- restore_cache: *restore-yarn-cache
Expand All @@ -51,14 +54,14 @@ jobs:
paths: [packages/*/node_modules]

clean-lockfile:
docker: *docker-node-lts
docker: *docker-node-image
steps:
- checkout
- restore_cache: *restore-node-modules-cache
- run: ./scripts/verifyCleanLockfile.sh

compile:
docker: *docker-node-lts
docker: *docker-node-image
resource_class: large
steps:
- checkout
Expand All @@ -70,7 +73,7 @@ jobs:
paths: [packages/*/lib, packages/*/src/generated]

format-check:
docker: *docker-node-lts
docker: *docker-node-image
environment:
JUNIT_REPORT_PATH: reports
NODE_ENV: test
Expand All @@ -81,7 +84,7 @@ jobs:
- run: yarn format-check

lint:
docker: *docker-node-lts
docker: *docker-node-image
resource_class: large
environment:
JUNIT_REPORT_PATH: reports
Expand All @@ -97,7 +100,7 @@ jobs:
- store_artifacts: { path: ./reports }

dist:
docker: *docker-node-lts
docker: *docker-node-image
resource_class: large
steps:
- checkout
Expand All @@ -109,7 +112,7 @@ jobs:
paths: [packages/*/lib, packages/*/dist]

test-node-libs:
docker: *docker-node-lts
docker: *docker-node-image
environment:
JUNIT_REPORT_PATH: reports
parallelism: 2
Expand All @@ -129,14 +132,21 @@ jobs:
- store_artifacts: { path: ./reports }

test-react-16: &test-react
docker: *docker-node-browsers
docker: *docker-node-browsers-image
environment:
JUNIT_REPORT_PATH: reports
parallelism: 7
steps:
- checkout
- restore_cache: *restore-node-modules-cache
- attach_workspace: { at: "." }
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- run:
name: Verify Chrome browser installed
command: |
google-chrome --version
chromedriver --version
- run: mkdir -p ./reports
- run:
# split karma tests into containers because they can take up a lot of memory
Expand All @@ -157,7 +167,7 @@ jobs:
- store_artifacts: { path: ./reports }

test-iso-react-16: &test-iso
docker: *docker-node-lts
docker: *docker-node-image
environment:
JUNIT_REPORT_PATH: reports
steps:
Expand All @@ -170,7 +180,7 @@ jobs:
- store_artifacts: { path: ./reports }

deploy-preview:
docker: *docker-node-lts
docker: *docker-node-image
steps:
- checkout
- restore_cache: *restore-node-modules-cache
Expand Down Expand Up @@ -199,7 +209,7 @@ jobs:
node ./scripts/preview.js

deploy-npm:
docker: *docker-node-lts
docker: *docker-node-image
steps:
- checkout
- restore_cache: *restore-node-modules-cache
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12
v12.22
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "3.22.0",
"lerna": "4.0.0",
"npmClient": "yarn",
"useWorkspaces": true,
"version": "independent"
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@
"eslint-plugin-prettier": "^3.3.1",
"gh-pages": "^3.1.0",
"http-server": "^0.12.3",
"lerna": "^3.22.1",
"lerna": "^4.0.0",
"npm-run-all": "^4.1.5",
"prettier": "~2.2.1",
"sinon": "^9.2.1",
"stylelint-config-palantir": "^5.0.0",
"stylelint-scss": "^3.18.0",
"typescript": "~4.6.2",
"yarn-deduplicate": "^3.1.0"
"yarn-deduplicate": "^4.0.0"
},
"resolutions": {
"@types/react": "16.14.2"
},
"engines": {
"node": ">=12 <14"
"node": ">=12.22 <17"
},
"repository": {
"type": "git",
Expand Down
18 changes: 9 additions & 9 deletions packages/node-build-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
"sass-lint": "./sass-lint.js"
},
"dependencies": {
"autoprefixer": "^10.0.4",
"autoprefixer": "^10.4.4",
"cross-spawn": "^7.0.3",
"eslint": "^7.15.0",
"glob": "^7.1.6",
"node-sass": "^4.14.1",
"glob": "^7.2.0",
"node-sass": "^6.0.1",
"node-sass-chokidar": "^1.5.0",
"node-sass-package-importer": "^5.3.2",
"postcss": "^8.1.14",
"postcss-cli": "^8.3.0",
"postcss-discard-comments": "^4.0.2",
"postcss": "^8.4.12",
"postcss-cli": "^9.1.0",
"postcss-discard-comments": "^5.1.1",
"strip-css-comments": "^4.1.0",
"stylelint": "~13.8.0",
"stylelint": "~13.13.1",
"stylelint-junit-formatter": "^0.2.2",
"yargs": "^17.1.1"
"yargs": "^17.4.0"
},
"devDependencies": {
"@types/yargs": "^17.0.2"
"@types/yargs": "^17.0.10"
},
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/webpack-build-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"react-refresh": "^0.11.0",
"sass-loader": "^12.6.0",
"source-map-loader": "^3.0.1",
"stream-browserify": "^3.0.0",
"style-loader": "^3.3.1",
"ts-loader": "^9.2.8",
"webpack": "^5.21.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-build-scripts/webpack.config.karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = {
fallback: {
assert: require.resolve("assert/"),
buffer: false,
stream: false,
stream: require.resolve("stream-browserify"),
},
},

Expand Down
Loading