From 1d9f32446f5525c601677e0c2e858cc91896ab05 Mon Sep 17 00:00:00 2001 From: Josh Wooding <12938082+joshwooding@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:04:20 +0100 Subject: [PATCH] Patch changesets --- .changeset/famous-glasses-fry.md | 13 ++ ...changesets-cli-npm-2.27.7-1c109a185d.patch | 74 +++++++++ package.json | 2 +- packages/core/package.json | 6 +- packages/countries/package.json | 6 +- packages/data-grid/package.json | 10 +- packages/icons/package.json | 4 +- packages/lab/package.json | 8 +- yarn.lock | 142 +++++++++++++----- 9 files changed, 210 insertions(+), 55 deletions(-) create mode 100644 .changeset/famous-glasses-fry.md create mode 100644 .yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch diff --git a/.changeset/famous-glasses-fry.md b/.changeset/famous-glasses-fry.md new file mode 100644 index 00000000000..e4753676082 --- /dev/null +++ b/.changeset/famous-glasses-fry.md @@ -0,0 +1,13 @@ +--- +"@salt-ds/ag-grid-theme": patch +"@salt-ds/countries": patch +"@salt-ds/data-grid": patch +"@salt-ds/styles": patch +"@salt-ds/window": patch +"@salt-ds/icons": patch +"@salt-ds/theme": patch +"@salt-ds/core": patch +"@salt-ds/lab": patch +--- + +Update build tooling diff --git a/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch b/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch new file mode 100644 index 00000000000..1024d840be6 --- /dev/null +++ b/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch @@ -0,0 +1,74 @@ +diff --git a/dist/changesets-cli.cjs.js b/dist/changesets-cli.cjs.js +index 9fdc475d0aed8135bb8f0f0b57cf98204dad27c8..7324fe54cd0493e13ba7f46163942060db5c85b0 100644 +--- a/dist/changesets-cli.cjs.js ++++ b/dist/changesets-cli.cjs.js +@@ -740,6 +740,7 @@ let getOtpCode = async twoFactorState => { + async function internalPublish(pkgName, opts, twoFactorState) { + let publishTool = await getPublishTool(opts.cwd); + let publishFlags = opts.access ? ["--access", opts.access] : []; ++ + publishFlags.push("--tag", opts.tag); + + if ((await twoFactorState.isRequired) && !ciInfo.isCI) { +@@ -760,14 +761,24 @@ async function internalPublish(pkgName, opts, twoFactorState) { + code, + stdout, + stderr +- } = publishTool.name === "pnpm" ? await spawn__default["default"]("pnpm", ["publish", "--json", ...publishFlags], { +- env: Object.assign({}, process.env, envOverride), +- cwd: opts.cwd +- }) : await spawn__default["default"](publishTool.name, ["publish", opts.publishDir, "--json", ...publishFlags], { ++ } = await spawn__default["default"]("yarn", ["npm", "publish", ...publishFlags], { ++ cwd: opts.cwd, + env: Object.assign({}, process.env, envOverride) + }); + + if (code !== 0) { ++ const output = stdout ++ .toString() ++ .trim() ++ .split("\n") ++ // this filters out "unnamed" logs: https://yarnpkg.com/advanced/error-codes/#yn0000---unnamed ++ // this includes a list of packed files and the "summary output" like: "Failed with errors in 0s 75ms" ++ // those are not that interesting so we reduce the noise by dropping them ++ .filter(line => !/YN0000:/.test(line)) ++ .join("\n"); ++ logger.error(`an error occurred while publishing ${pkgName}:`, `\n${output}`); ++ return { published: false }; ++ + // NPM's --json output is included alongside the `prepublish` and `postpublish` output in terminal + // We want to handle this as best we can but it has some struggles: + // - output of those lifecycle scripts can contain JSON +diff --git a/dist/changesets-cli.esm.js b/dist/changesets-cli.esm.js +index 67ec717f672f330d742beb4cdddf9fa330f7dd5c..b537b313ec2915012a2e96af560ebb46a98abd64 100644 +--- a/dist/changesets-cli.esm.js ++++ b/dist/changesets-cli.esm.js +@@ -720,14 +720,24 @@ async function internalPublish(pkgName, opts, twoFactorState) { + code, + stdout, + stderr +- } = publishTool.name === "pnpm" ? await spawn$1("pnpm", ["publish", "--json", ...publishFlags], { +- env: Object.assign({}, process.env, envOverride), +- cwd: opts.cwd +- }) : await spawn$1(publishTool.name, ["publish", opts.publishDir, "--json", ...publishFlags], { ++ } = await spawn$1("yarn", ["npm", "publish", ...publishFlags], { ++ cwd: opts.cwd, + env: Object.assign({}, process.env, envOverride) + }); + + if (code !== 0) { ++ const output = stdout ++ .toString() ++ .trim() ++ .split("\n") ++ // this filters out "unnamed" logs: https://yarnpkg.com/advanced/error-codes/#yn0000---unnamed ++ // this includes a list of packed files and the "summary output" like: "Failed with errors in 0s 75ms" ++ // those are not that interesting so we reduce the noise by dropping them ++ .filter(line => !/YN0000:/.test(line)) ++ .join("\n"); ++ error(`an error occurred while publishing ${pkgName}:`, `\n${output}`); ++ return { published: false }; ++ + // NPM's --json output is included alongside the `prepublish` and `postpublish` output in terminal + // We want to handle this as best we can but it has some struggles: + // - output of those lifecycle scripts can contain JSON diff --git a/package.json b/package.json index 9c57d8a4bfa..d7d48b08abb 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@biomejs/biome": "1.8.3", "@biomejs/js-api": "^0.6.2", "@biomejs/wasm-nodejs": "^1.8.3", - "@changesets/cli": "^2.27.7", + "@changesets/cli": "patch:@changesets/cli@npm%3A2.27.7#~/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch", "@cypress/code-coverage": "^3.12.44", "@faker-js/faker": "^8.0.0", "@fontsource/open-sans": "^4.5.13", diff --git a/packages/core/package.json b/packages/core/package.json index ba51277cbaa..adc6380b566 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -12,9 +12,9 @@ "sideEffects": false, "dependencies": { "@floating-ui/react": "^0.26.5", - "@salt-ds/icons": "workspace:*", - "@salt-ds/styles": "workspace:*", - "@salt-ds/window": "workspace:*", + "@salt-ds/icons": "workspace:^", + "@salt-ds/styles": "workspace:^", + "@salt-ds/window": "workspace:^", "clsx": "^2.0.0" }, "peerDependencies": { diff --git a/packages/countries/package.json b/packages/countries/package.json index 4dcce4ad3d1..89a3cf7e8b2 100644 --- a/packages/countries/package.json +++ b/packages/countries/package.json @@ -22,9 +22,9 @@ "copy:css": "yarn node ./scripts/copyCss.mjs" }, "dependencies": { - "@salt-ds/core": "workspace:*", - "@salt-ds/styles": "workspace:*", - "@salt-ds/window": "workspace:*", + "@salt-ds/core": "workspace:^", + "@salt-ds/styles": "workspace:^", + "@salt-ds/window": "workspace:^", "clsx": "^2.0.0" }, "peerDependencies": { diff --git a/packages/data-grid/package.json b/packages/data-grid/package.json index 21e2bfae883..739c08e6238 100644 --- a/packages/data-grid/package.json +++ b/packages/data-grid/package.json @@ -11,11 +11,11 @@ "main": "src/index.ts", "sideEffects": false, "dependencies": { - "@salt-ds/core": "workspace:*", - "@salt-ds/icons": "workspace:*", - "@salt-ds/lab": "workspace:", - "@salt-ds/styles": "workspace:*", - "@salt-ds/window": "workspace:*", + "@salt-ds/core": "workspace:^", + "@salt-ds/icons": "workspace:^", + "@salt-ds/lab": "workspace:*", + "@salt-ds/styles": "workspace:^", + "@salt-ds/window": "workspace:^", "clsx": "^2.0.0" }, "peerDependencies": { diff --git a/packages/icons/package.json b/packages/icons/package.json index 904087a9c34..e1e57bf5b75 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -21,8 +21,8 @@ "clean": "rimraf ./src/components" }, "dependencies": { - "@salt-ds/styles": "workspace:*", - "@salt-ds/window": "workspace:*", + "@salt-ds/styles": "workspace:^", + "@salt-ds/window": "workspace:^", "clsx": "^2.0.0" }, "peerDependencies": { diff --git a/packages/lab/package.json b/packages/lab/package.json index 250ca40587e..a5eba754bcf 100644 --- a/packages/lab/package.json +++ b/packages/lab/package.json @@ -14,10 +14,10 @@ "@floating-ui/react": "^0.26.5", "@fluentui/react-overflow": "^9.0.19", "@internationalized/date": "^3.0.0", - "@salt-ds/core": "workspace:*", - "@salt-ds/icons": "workspace:*", - "@salt-ds/styles": "workspace:*", - "@salt-ds/window": "workspace:*", + "@salt-ds/core": "workspace:^", + "@salt-ds/icons": "workspace:^", + "@salt-ds/styles": "workspace:^", + "@salt-ds/window": "workspace:^", "@types/react-window": "^1.8.2", "aria-hidden": "^1.1.1", "attr-accept": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 83d40c8f5f4..6cede146c96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2042,7 +2042,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.24.6 resolution: "@babel/runtime@npm:7.24.6" dependencies: @@ -2051,6 +2051,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.20.1": + version: 7.24.8 + resolution: "@babel/runtime@npm:7.24.8" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10/e6f335e472a8a337379effc15815dd0eddf6a7d0c00b50deb4f9e9585819b45431d0ff3c2d3d0fa58c227a9b04dcc4a85e7245fb57493adb2863b5208c769cbd + languageName: node + linkType: hard + "@babel/template@npm:^7.24.7": version: 7.24.7 resolution: "@babel/template@npm:7.24.7" @@ -2282,7 +2291,7 @@ __metadata: languageName: node linkType: hard -"@changesets/cli@npm:^2.27.7": +"@changesets/cli@npm:2.27.7": version: 2.27.7 resolution: "@changesets/cli@npm:2.27.7" dependencies: @@ -2324,6 +2333,48 @@ __metadata: languageName: node linkType: hard +"@changesets/cli@patch:@changesets/cli@npm%3A2.27.7#~/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch": + version: 2.27.7 + resolution: "@changesets/cli@patch:@changesets/cli@npm%3A2.27.7#~/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch::version=2.27.7&hash=e4c1df" + dependencies: + "@babel/runtime": "npm:^7.20.1" + "@changesets/apply-release-plan": "npm:^7.0.4" + "@changesets/assemble-release-plan": "npm:^6.0.3" + "@changesets/changelog-git": "npm:^0.2.0" + "@changesets/config": "npm:^3.0.2" + "@changesets/errors": "npm:^0.2.0" + "@changesets/get-dependents-graph": "npm:^2.1.1" + "@changesets/get-release-plan": "npm:^4.0.3" + "@changesets/git": "npm:^3.0.0" + "@changesets/logger": "npm:^0.1.0" + "@changesets/pre": "npm:^2.0.0" + "@changesets/read": "npm:^0.6.0" + "@changesets/should-skip-package": "npm:^0.1.0" + "@changesets/types": "npm:^6.0.0" + "@changesets/write": "npm:^0.3.1" + "@manypkg/get-packages": "npm:^1.1.3" + "@types/semver": "npm:^7.5.0" + ansi-colors: "npm:^4.1.3" + chalk: "npm:^2.1.0" + ci-info: "npm:^3.7.0" + enquirer: "npm:^2.3.0" + external-editor: "npm:^3.1.0" + fs-extra: "npm:^7.0.1" + human-id: "npm:^1.0.2" + mri: "npm:^1.2.0" + outdent: "npm:^0.5.0" + p-limit: "npm:^2.2.0" + preferred-pm: "npm:^3.0.0" + resolve-from: "npm:^5.0.0" + semver: "npm:^7.5.3" + spawndamnit: "npm:^2.0.0" + term-size: "npm:^2.1.0" + bin: + changeset: bin.js + checksum: 10/297505a4b822634e684a01874f668fdc77585477519562eda9e038ead809fc0a71baeed8a43f077efe1ea11ef5fdd821c843ae460950a4cbe1002282e5a44a52 + languageName: node + linkType: hard + "@changesets/config@npm:^3.0.2": version: 3.0.2 resolution: "@changesets/config@npm:3.0.2" @@ -4286,14 +4337,14 @@ __metadata: languageName: unknown linkType: soft -"@salt-ds/core@npm:^1.33.0, @salt-ds/core@workspace:*, @salt-ds/core@workspace:packages/core": +"@salt-ds/core@npm:^1.33.0, @salt-ds/core@workspace:^, @salt-ds/core@workspace:packages/core": version: 0.0.0-use.local resolution: "@salt-ds/core@workspace:packages/core" dependencies: "@floating-ui/react": "npm:^0.26.5" - "@salt-ds/icons": "workspace:*" - "@salt-ds/styles": "workspace:*" - "@salt-ds/window": "workspace:*" + "@salt-ds/icons": "workspace:^" + "@salt-ds/styles": "workspace:^" + "@salt-ds/window": "workspace:^" clsx: "npm:^2.0.0" peerDependencies: "@types/react": ">=16.14.0" @@ -4309,9 +4360,9 @@ __metadata: version: 0.0.0-use.local resolution: "@salt-ds/countries@workspace:packages/countries" dependencies: - "@salt-ds/core": "workspace:*" - "@salt-ds/styles": "workspace:*" - "@salt-ds/window": "workspace:*" + "@salt-ds/core": "workspace:^" + "@salt-ds/styles": "workspace:^" + "@salt-ds/window": "workspace:^" clsx: "npm:^2.0.0" glob: "npm:^8.0.0" mustache: "npm:^4.2.0" @@ -4331,11 +4382,11 @@ __metadata: version: 0.0.0-use.local resolution: "@salt-ds/data-grid@workspace:packages/data-grid" dependencies: - "@salt-ds/core": "workspace:*" - "@salt-ds/icons": "workspace:*" - "@salt-ds/lab": "workspace:" - "@salt-ds/styles": "workspace:*" - "@salt-ds/window": "workspace:*" + "@salt-ds/core": "workspace:^" + "@salt-ds/icons": "workspace:^" + "@salt-ds/lab": "workspace:*" + "@salt-ds/styles": "workspace:^" + "@salt-ds/window": "workspace:^" clsx: "npm:^2.0.0" peerDependencies: "@types/react": ">=16.14.0" @@ -4347,12 +4398,12 @@ __metadata: languageName: unknown linkType: soft -"@salt-ds/icons@npm:^1.12.1, @salt-ds/icons@workspace:*, @salt-ds/icons@workspace:packages/icons": +"@salt-ds/icons@npm:^1.12.1, @salt-ds/icons@workspace:^, @salt-ds/icons@workspace:packages/icons": version: 0.0.0-use.local resolution: "@salt-ds/icons@workspace:packages/icons" dependencies: - "@salt-ds/styles": "workspace:*" - "@salt-ds/window": "workspace:*" + "@salt-ds/styles": "workspace:^" + "@salt-ds/window": "workspace:^" clsx: "npm:^2.0.0" glob: "npm:^8.0.0" mustache: "npm:^4.2.0" @@ -4375,10 +4426,10 @@ __metadata: "@floating-ui/react": "npm:^0.26.5" "@fluentui/react-overflow": "npm:^9.0.19" "@internationalized/date": "npm:^3.0.0" - "@salt-ds/core": "workspace:*" - "@salt-ds/icons": "workspace:*" - "@salt-ds/styles": "workspace:*" - "@salt-ds/window": "workspace:*" + "@salt-ds/core": "workspace:^" + "@salt-ds/icons": "workspace:^" + "@salt-ds/styles": "workspace:^" + "@salt-ds/window": "workspace:^" "@types/react-window": "npm:^1.8.2" aria-hidden: "npm:^1.1.1" attr-accept: "npm:^2.0.0" @@ -4408,7 +4459,7 @@ __metadata: "@biomejs/biome": "npm:1.8.3" "@biomejs/js-api": "npm:^0.6.2" "@biomejs/wasm-nodejs": "npm:^1.8.3" - "@changesets/cli": "npm:^2.27.7" + "@changesets/cli": "patch:@changesets/cli@npm%3A2.27.7#~/.yarn/patches/@changesets-cli-npm-2.27.7-1c109a185d.patch" "@cypress/code-coverage": "npm:^3.12.44" "@faker-js/faker": "npm:^8.0.0" "@fontsource/open-sans": "npm:^4.5.13" @@ -4514,7 +4565,7 @@ __metadata: languageName: unknown linkType: soft -"@salt-ds/styles@workspace:*, @salt-ds/styles@workspace:packages/styles": +"@salt-ds/styles@workspace:^, @salt-ds/styles@workspace:packages/styles": version: 0.0.0-use.local resolution: "@salt-ds/styles@workspace:packages/styles" peerDependencies: @@ -4535,7 +4586,7 @@ __metadata: languageName: unknown linkType: soft -"@salt-ds/window@workspace:*, @salt-ds/window@workspace:packages/window": +"@salt-ds/window@workspace:^, @salt-ds/window@workspace:packages/window": version: 0.0.0-use.local resolution: "@salt-ds/window@workspace:packages/window" peerDependencies: @@ -6524,9 +6575,9 @@ __metadata: linkType: hard "@types/node@npm:^12.7.1": - version: 12.20.46 - resolution: "@types/node@npm:12.20.46" - checksum: 10/c5347aa669ff439e9177a2799d0bc464d8533e4fb07f2ec112be118adf2668bf29b4fef153f9639550f190c84c8e96afcf96a04309af42e49754b42578cf1572 + version: 12.20.55 + resolution: "@types/node@npm:12.20.55" + checksum: 10/1f916a06fff02faadb09a16ed6e31820ce170798b202ef0b14fc244bfbd721938c54a3a99836e185e4414ca461fe96c5bb5c67c3d248f153555b7e6347f061dd languageName: node linkType: hard @@ -6637,13 +6688,20 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0": +"@types/semver@npm:^7.3.4": version: 7.5.3 resolution: "@types/semver@npm:7.5.3" checksum: 10/452c2f37b16358805efcae2d9888a2cfe696b7fb9962451eb0fb46b0fa0bbd68924977cfd28afca91507eb6e3fc19909855a4f7fe4b1f1221d5aeed780e800ae languageName: node linkType: hard +"@types/semver@npm:^7.5.0": + version: 7.5.8 + resolution: "@types/semver@npm:7.5.8" + checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178 + languageName: node + linkType: hard + "@types/send@npm:*": version: 0.17.2 resolution: "@types/send@npm:0.17.2" @@ -9801,7 +9859,17 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.0, enquirer@npm:^2.3.6": +"enquirer@npm:^2.3.0": + version: 2.4.1 + resolution: "enquirer@npm:2.4.1" + dependencies: + ansi-colors: "npm:^4.1.1" + strip-ansi: "npm:^6.0.1" + checksum: 10/b3726486cd98f0d458a851a03326a2a5dd4d84f37ff94ff2a2960c915e0fc865865da3b78f0877dc36ac5c1189069eca603e82ec63d5bc6b0dd9985bf6426d7a + languageName: node + linkType: hard + +"enquirer@npm:^2.3.6": version: 2.3.6 resolution: "enquirer@npm:2.3.6" dependencies: @@ -16217,14 +16285,14 @@ __metadata: linkType: hard "preferred-pm@npm:^3.0.0": - version: 3.0.3 - resolution: "preferred-pm@npm:3.0.3" + version: 3.1.4 + resolution: "preferred-pm@npm:3.1.4" dependencies: find-up: "npm:^5.0.0" find-yarn-workspace-root2: "npm:1.2.16" path-exists: "npm:^4.0.0" - which-pm: "npm:2.0.0" - checksum: 10/0de0948cb6ae22213f2ad7868032d89f1e1443d9caabc22ceeb9d284f19d359d65b67fab178f4db5c8c6ca6ae34642bdc72730b70ab1899ea158e2677a88a6d0 + which-pm: "npm:^2.2.0" + checksum: 10/bde91a492cc2662a5229cdc7a0fe35584674d4200227cf2db4ea9fc726874d2ec469f83ac27f0fb13cf215a6ac0eeabd5d6ac0f6995ea29af4e63ae5fb71b65c languageName: node linkType: hard @@ -20247,13 +20315,13 @@ __metadata: languageName: node linkType: hard -"which-pm@npm:2.0.0": - version: 2.0.0 - resolution: "which-pm@npm:2.0.0" +"which-pm@npm:^2.2.0": + version: 2.2.0 + resolution: "which-pm@npm:2.2.0" dependencies: load-yaml-file: "npm:^0.2.0" path-exists: "npm:^4.0.0" - checksum: 10/8f9dc47ab1302d536458a3d28b891907540d67e18b95d8cf0a41ba768b679c2bc7b64c17d9b80c85443c4b300a3e2d5c29ae1e9c7c6ad2833760070fbdbd3b6f + checksum: 10/f6fe0ad163ba5385c7b8f3465cd29492ab1af6e5c2d5eb0c320008ac458c1614241ebe8d7d7d76d79021aa866a66e2454e181ac681f525cf259ec27abab9468c languageName: node linkType: hard