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

chore: upgrade to Yarn v4.0.x #6520

Merged
merged 9 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
remove cross-env, drop sass-compile.sh
  • Loading branch information
adidahiya committed Nov 6, 2023
commit 6a43982278d9c5bd8163d24d73cd3ef6ab94a76d
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"@types/sinon": "~17.0.0",
"@types/yargs": "~17.0.22",
"chai": "^4.3.7",
"cross-env": "^7.0.3",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we no longer need cross-env with Yarn v4; this is now built-in to the script runner

"dedent": "^1.5.1",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"compile:css": "sass-compile ./src",
"dev": "run-p \"compile:esm -- --watch\" \"compile:css -- --watch\"",
"dist": "run-s \"dist:*\"",
"dist:bundle": "cross-env NODE_ENV=production webpack",
"dist:bundle": "NODE_ENV=production webpack",
"dist:css": "css-dist lib/css/*.css",
"dist:variables": "generate-css-variables --retainDefault true ../../colors/src/_colors.scss common/_color-aliases.scss common/_variables.scss",
"dist:verify": "assert-package-layout",
Expand Down
2 changes: 1 addition & 1 deletion packages/datetime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"compile:css": "sass-compile ./src",
"dev": "run-p \"compile:esm -- --watch\" \"compile:css -- --watch\"",
"dist": "run-s \"dist:*\"",
"dist:bundle": "cross-env NODE_ENV=production webpack",
"dist:bundle": "NODE_ENV=production webpack",
"dist:css": "css-dist lib/css/*.css",
"dist:verify": "assert-package-layout",
"lint": "run-p lint:scss lint:es",
Expand Down
2 changes: 1 addition & 1 deletion packages/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bundle:analyze": "webpack --profile --json > dist/stats.json && webpack-bundle-analyzer dist/stats.json",
"clean": "rm -rf dist/* || true",
"dev": "webpack-dev-server",
"dist": "cross-env NODE_ENV=production yarn bundle",
"dist": "NODE_ENV=production yarn bundle",
"lint": "run-p lint:scss lint:es",
"lint:scss": "sass-lint",
"lint:es": "es-lint",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bundle:analyze": "webpack --profile --json > dist/stats.json && webpack-bundle-analyzer dist/stats.json",
"clean": "rm -rf dist/* || true",
"dev": "webpack-dev-server",
"dist": "cross-env NODE_ENV=production yarn bundle",
"dist": "NODE_ENV=production yarn bundle",
"lint": "run-p lint:scss lint:es",
"lint:scss": "sass-lint",
"lint:es": "es-lint",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"compile:css": "sass-compile ./src",
"dev": "run-p \"compile:esm -- --watch\" \"compile:css -- --watch\"",
"dist": "run-s \"dist:*\"",
"dist:bundle": "cross-env NODE_ENV=production webpack",
"dist:bundle": "NODE_ENV=production webpack",
"dist:css": "css-dist lib/css/*.css",
"dist:verify": "assert-package-layout",
"lint": "run-p lint:scss lint:es",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"copy:fonts": "scripts/copy-fonts.sh",
"dev": "run-p \"compile:esm -- --watch\" \"compile:css -- --watch\"",
"dist": "run-s \"dist:*\"",
"dist:bundle": "cross-env NODE_ENV=production webpack",
"dist:bundle": "NODE_ENV=production webpack",
"dist:css": "css-dist lib/css/*.css",
"dist:verify": "assert-package-layout",
"generate-icon-src": "node scripts/generate-icon-fonts.mjs && node scripts/generate-icon-paths.mjs && node scripts/generate-icon-components.mjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/landing-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"bundle": "webpack",
"clean": "rm -rf dist/* || true",
"dev": "webpack-dev-server",
"dist": "cross-env NODE_ENV=production yarn bundle",
"dist": "NODE_ENV=production yarn bundle",
"lint": "run-p lint:scss lint:es",
"lint:scss": "sass-lint",
"lint:es": "es-lint",
Expand Down
2 changes: 1 addition & 1 deletion packages/node-build-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"css-dist": "./css-dist.sh",
"es-lint": "./es-lint.mjs",
"generate-css-variables": "./generate-css-variables.mjs",
"sass-compile": "./sass-compile.sh",
"sass-compile": "./sass-compile.mjs",
"sass-lint": "./sass-lint.mjs"
},
"dependencies": {
Expand Down
14 changes: 12 additions & 2 deletions packages/node-build-scripts/sass-compile.mjs
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,18 @@ const args = yargs(truncatedArgv)
type: "string",
description: "Path to file with exported custom sass functions",
})
.option("output", { alias: "o", type: "string", description: "Output folder" })
.option("watch", { alias: "w", type: "boolean", description: "Watch mode" })
.option("output", {
alias: "o",
type: "string",
description: "Output folder",
default: "lib/css/",
})
.option("watch", {
alias: "w",
type: "boolean",
description: "Watch mode",
default: false,
})
.check(argv => {
const hasOneStringArgument = argv._.length === 1 && typeof argv._[0] === "string";
return hasOneStringArgument;
Expand Down
17 changes: 0 additions & 17 deletions packages/node-build-scripts/sass-compile.sh

This file was deleted.

2 changes: 1 addition & 1 deletion packages/select/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"compile:css": "sass-compile ./src",
"dev": "run-p \"compile:esm -- --watch\" \"compile:css -- --watch\"",
"dist": "run-s \"dist:*\"",
"dist:bundle": "cross-env NODE_ENV=production webpack",
"dist:bundle": "NODE_ENV=production webpack",
"dist:css": "css-dist lib/css/*.css",
"dist:verify": "assert-package-layout",
"lint": "run-p lint:scss lint:es",
Expand Down
2 changes: 1 addition & 1 deletion packages/table-dev-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"bundle": "webpack",
"clean": "rm -rf dist/* || true",
"dev": "webpack-dev-server",
"dist": "cross-env NODE_ENV=production yarn bundle",
"dist": "NODE_ENV=production yarn bundle",
"lint": "npm-run-all -p lint:scss lint:es",
"lint:scss": "sass-lint",
"lint:es": "es-lint",
Expand Down
2 changes: 1 addition & 1 deletion packages/table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"compile:css": "sass-compile ./src",
"dev": "run-p \"compile:esm -- --watch\" \"compile:css -- --watch\"",
"dist": "run-s \"dist:*\"",
"dist:bundle": "cross-env NODE_ENV=production webpack",
"dist:bundle": "NODE_ENV=production webpack",
"dist:css": "css-dist lib/css/*.css",
"dist:verify": "assert-package-layout",
"lint": "run-p lint:scss lint:es",
Expand Down
17 changes: 2 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ __metadata:
css-dist: ./css-dist.sh
es-lint: ./es-lint.mjs
generate-css-variables: ./generate-css-variables.mjs
sass-compile: ./sass-compile.sh
sass-compile: ./sass-compile.mjs
sass-lint: ./sass-lint.mjs
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -4737,7 +4737,6 @@ __metadata:
"@types/sinon": "npm:~17.0.0"
"@types/yargs": "npm:~17.0.22"
chai: "npm:^4.3.7"
cross-env: "npm:^7.0.3"
dedent: "npm:^1.5.1"
eslint: "npm:^8.50.0"
eslint-config-prettier: "npm:^9.0.0"
Expand Down Expand Up @@ -5932,18 +5931,6 @@ __metadata:
languageName: node
linkType: hard

"cross-env@npm:^7.0.3":
version: 7.0.3
resolution: "cross-env@npm:7.0.3"
dependencies:
cross-spawn: "npm:^7.0.1"
bin:
cross-env: src/bin/cross-env.js
cross-env-shell: src/bin/cross-env-shell.js
checksum: f3765c25746c69fcca369655c442c6c886e54ccf3ab8c16847d5ad0e91e2f337d36eedc6599c1227904bf2a228d721e690324446876115bc8e7b32a866735ecf
languageName: node
linkType: hard

"cross-spawn@npm:^6.0.5":
version: 6.0.5
resolution: "cross-spawn@npm:6.0.5"
Expand All @@ -5957,7 +5944,7 @@ __metadata:
languageName: node
linkType: hard

"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
dependencies:
Expand Down