From b84b29ac10e7c019c3c57c6bbdcd20d01a143188 Mon Sep 17 00:00:00 2001 From: castastrophe Date: Mon, 19 May 2025 11:51:33 -0400 Subject: [PATCH] chore: merge latest updates from main --- .github/actions/file-diff/package.json | 2 +- .github/workflows/development.yml | 2 +- package.json | 6 +- tokens/project.json | 7 +- yarn.lock | 191 +++++++++++-------------- 5 files changed, 92 insertions(+), 116 deletions(-) diff --git a/.github/actions/file-diff/package.json b/.github/actions/file-diff/package.json index 1d4cdd838a1..a348b5d86dc 100644 --- a/.github/actions/file-diff/package.json +++ b/.github/actions/file-diff/package.json @@ -26,7 +26,7 @@ "@actions/core": "^1.11.1", "@actions/github": "^6.0.0", "@actions/glob": "^0.5.0", - "diff": "^7.0.0", + "diff": "^8.0.0", "diff2html": "^3.4.51" }, "keywords": [ diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 31d7912f06b..002991ed342 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -101,7 +101,7 @@ jobs: steps: - name: Get changed files id: changed-files - uses: step-security/changed-files@v45 + uses: step-security/changed-files@v46 with: files_yaml: | styles: diff --git a/package.json b/package.json index 92d44ac5ddf..2f541203ef5 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@changesets/cli": "^2.27.11", "@commitlint/cli": "^19.6.1", "@commitlint/config-conventional": "^19.6.0", - "@nx/devkit": "^19.8.2", + "@nx/devkit": "^21.0.0", "@spectrum-tools/postcss-rgb-mapping": "1.1.0", "@yarnpkg/types": "^4.0.0", "at-rule-packer": "^0.4.2", @@ -79,7 +79,7 @@ "cross-env": "^7.0.3", "cssnano": "^7.0.6", "cssnano-preset-advanced": "^7.0.6", - "diff": "^7.0.0", + "diff": "^8.0.0", "diff2html": "^3.4.51", "eslint": "^8.57.0", "eslint-plugin-jsonc": "^2.18.2", @@ -95,7 +95,7 @@ "node-gyp": "^11.0.0", "npm-registry-fetch": "^18.0.2", "nunjucks": "^3.2.4", - "nx": "^19.8.2", + "nx": "^21.0.0", "open": "^10.1.0", "pajv": "^1.2.0", "postcss": "^8.5.3", diff --git a/tokens/project.json b/tokens/project.json index 00be7ea6745..e47da427b4a 100644 --- a/tokens/project.json +++ b/tokens/project.json @@ -42,14 +42,13 @@ "diff": { "cache": true, "executor": "nx:run-commands", - "inputs": [{ "externalDependencies": ["@adobe/token-diff-generator", "@adobe/spectrum-tokens"] }], + "inputs": [{ "externalDependencies": ["@adobe/token-diff-generator"] }], "options": { "commands": [ - "tdiff report --old-token-version @adobe/spectrum-tokens@{args.v1} --new-token-version @adobe/spectrum-tokens@{args.v2} --format markdown --output {projectRoot}/dist/tokens-diff.md" + "tdiff report --old-token-version @adobe/spectrum-tokens@{args.v1} --new-token-version @adobe/spectrum-tokens@{args.v2} --format markdown --output dist/tokens-diff.md" ], - "cwd": "{projectRoot}", "forwardAllArgs": true, - "parallel": false + "v1": "13.7.0" }, "outputs": [ "{projectRoot}/dist/tokens-diff.md" diff --git a/yarn.lock b/yarn.lock index eb42e85878c..7db92bc0d63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -124,7 +124,7 @@ __metadata: "@changesets/cli": "npm:^2.27.11" "@commitlint/cli": "npm:^19.6.1" "@commitlint/config-conventional": "npm:^19.6.0" - "@nx/devkit": "npm:^19.8.2" + "@nx/devkit": "npm:^21.0.0" "@spectrum-tools/postcss-rgb-mapping": "npm:1.1.0" "@yarnpkg/types": "npm:^4.0.0" at-rule-packer: "npm:^0.4.2" @@ -133,7 +133,7 @@ __metadata: cross-env: "npm:^7.0.3" cssnano: "npm:^7.0.6" cssnano-preset-advanced: "npm:^7.0.6" - diff: "npm:^7.0.0" + diff: "npm:^8.0.0" diff2html: "npm:^3.4.51" eslint: "npm:^8.57.0" eslint-plugin-jsonc: "npm:^2.18.2" @@ -149,7 +149,7 @@ __metadata: node-gyp: "npm:^11.0.0" npm-registry-fetch: "npm:^18.0.2" nunjucks: "npm:^3.2.4" - nx: "npm:^19.8.2" + nx: "npm:^21.0.0" open: "npm:^10.1.0" pajv: "npm:^1.2.0" postcss: "npm:^8.5.3" @@ -3153,32 +3153,10 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:19.8.14": - version: 19.8.14 - resolution: "@nrwl/devkit@npm:19.8.14" - dependencies: - "@nx/devkit": "npm:19.8.14" - checksum: 10c0/de398c1fbb53c4737ea3c8361a3c8a66442c24e3ec7fe366de66c5ede8009ff8975c037a3b6ba4784d3a223f0f4ee4f9b47faefa6ce1aa85c26822e7a17689da - languageName: node - linkType: hard - -"@nrwl/tao@npm:19.8.14": - version: 19.8.14 - resolution: "@nrwl/tao@npm:19.8.14" - dependencies: - nx: "npm:19.8.14" - tslib: "npm:^2.3.0" - bin: - tao: index.js - checksum: 10c0/863a28ab4746f5999a8049d5b86e3d7412c17608135b84513f37997874611672b06c61c026b06cbaa12e37016986c90601d82e65efe34e828414c69b159c4457 - languageName: node - linkType: hard - -"@nx/devkit@npm:19.8.14, @nx/devkit@npm:^19.8.2": - version: 19.8.14 - resolution: "@nx/devkit@npm:19.8.14" +"@nx/devkit@npm:^21.0.0": + version: 21.0.3 + resolution: "@nx/devkit@npm:21.0.3" dependencies: - "@nrwl/devkit": "npm:19.8.14" ejs: "npm:^3.1.7" enquirer: "npm:~2.3.6" ignore: "npm:^5.0.4" @@ -3188,77 +3166,77 @@ __metadata: tslib: "npm:^2.3.0" yargs-parser: "npm:21.1.1" peerDependencies: - nx: ">= 19 <= 21" - checksum: 10c0/86de0ba41cd30c2c9ac20fa45d77e7f0f878d7df8423ac3905e6846211ae67b3f843987dec76e712e3e82c05af2e89fa6b1b9cab24675ab30221e678d05d1be7 + nx: 21.0.3 + checksum: 10c0/d4262d692b83204afb71502d33fc7bc65f45d67d5ddb52035f29aecf8eba92a6911c2b6885641e24b71ccc333aeafc7360935ffed479dfb7340300d1dbc009cd languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-darwin-arm64@npm:19.8.14" +"@nx/nx-darwin-arm64@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-darwin-arm64@npm:21.0.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-darwin-x64@npm:19.8.14" +"@nx/nx-darwin-x64@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-darwin-x64@npm:21.0.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-freebsd-x64@npm:19.8.14" +"@nx/nx-freebsd-x64@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-freebsd-x64@npm:21.0.3" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.8.14" +"@nx/nx-linux-arm-gnueabihf@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:21.0.3" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-linux-arm64-gnu@npm:19.8.14" +"@nx/nx-linux-arm64-gnu@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-linux-arm64-gnu@npm:21.0.3" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-linux-arm64-musl@npm:19.8.14" +"@nx/nx-linux-arm64-musl@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-linux-arm64-musl@npm:21.0.3" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-linux-x64-gnu@npm:19.8.14" +"@nx/nx-linux-x64-gnu@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-linux-x64-gnu@npm:21.0.3" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-linux-x64-musl@npm:19.8.14" +"@nx/nx-linux-x64-musl@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-linux-x64-musl@npm:21.0.3" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-win32-arm64-msvc@npm:19.8.14" +"@nx/nx-win32-arm64-msvc@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-win32-arm64-msvc@npm:21.0.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:19.8.14": - version: 19.8.14 - resolution: "@nx/nx-win32-x64-msvc@npm:19.8.14" +"@nx/nx-win32-x64-msvc@npm:21.0.3": + version: 21.0.3 + resolution: "@nx/nx-win32-x64-msvc@npm:21.0.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -5704,7 +5682,7 @@ __metadata: "@actions/core": "npm:^1.11.1" "@actions/github": "npm:^6.0.0" "@actions/glob": "npm:^0.5.0" - diff: "npm:^7.0.0" + diff: "npm:^8.0.0" diff2html: "npm:^3.4.51" languageName: unknown linkType: soft @@ -6768,13 +6746,13 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/parsers@npm:3.0.0-rc.46": - version: 3.0.0-rc.46 - resolution: "@yarnpkg/parsers@npm:3.0.0-rc.46" +"@yarnpkg/parsers@npm:3.0.2": + version: 3.0.2 + resolution: "@yarnpkg/parsers@npm:3.0.2" dependencies: js-yaml: "npm:^3.10.0" tslib: "npm:^2.4.0" - checksum: 10c0/c7f421c6885142f351459031c093fb2e79abcce6f4a89765a10e600bb7ab122949c54bcea2b23de9572a2b34ba29f822b17831c1c43ba50373ceb8cb5b336667 + checksum: 10c0/a0c340e13129643162423d7e666061c0b39b143bfad3fc5a74c7d92a30fd740f6665d41cd4e61832c20375889d793eea1d1d103cacb39ed68f7acd168add8c53 languageName: node linkType: hard @@ -7491,7 +7469,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.6.1, axios@npm:^1.7.4": +"axios@npm:^1.6.1": version: 1.8.2 resolution: "axios@npm:1.8.2" dependencies: @@ -7502,6 +7480,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.8.3": + version: 1.9.0 + resolution: "axios@npm:1.9.0" + dependencies: + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10c0/9371a56886c2e43e4ff5647b5c2c3c046ed0a3d13482ef1d0135b994a628c41fbad459796f101c655e62f0c161d03883454474d2e435b2e021b1924d9f24994c + languageName: node + linkType: hard + "b4a@npm:^1.6.4": version: 1.6.6 resolution: "b4a@npm:1.6.6" @@ -9517,6 +9506,13 @@ __metadata: languageName: node linkType: hard +"diff@npm:^8.0.0": + version: 8.0.1 + resolution: "diff@npm:8.0.1" + checksum: 10c0/43ebbe63881d34067d77d7b9d16220f1efb8013e04be58c7748ab296d2a9637f49424c69477e36c81a53f2c347b396956966e708e1b5b4dde3620f2b4bb93d02 + languageName: node + linkType: hard + "diffable-html@npm:^4.1.0": version: 4.1.0 resolution: "diffable-html@npm:4.1.0" @@ -9723,13 +9719,6 @@ __metadata: languageName: node linkType: hard -"duplexer@npm:^0.1.1": - version: 0.1.2 - resolution: "duplexer@npm:0.1.2" - checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2 - languageName: node - linkType: hard - "eachr@npm:^3.2.0": version: 3.3.0 resolution: "eachr@npm:3.3.0" @@ -15566,26 +15555,25 @@ __metadata: languageName: node linkType: hard -"nx@npm:19.8.14, nx@npm:^19.8.2": - version: 19.8.14 - resolution: "nx@npm:19.8.14" +"nx@npm:^21.0.0": + version: 21.0.3 + resolution: "nx@npm:21.0.3" dependencies: "@napi-rs/wasm-runtime": "npm:0.2.4" - "@nrwl/tao": "npm:19.8.14" - "@nx/nx-darwin-arm64": "npm:19.8.14" - "@nx/nx-darwin-x64": "npm:19.8.14" - "@nx/nx-freebsd-x64": "npm:19.8.14" - "@nx/nx-linux-arm-gnueabihf": "npm:19.8.14" - "@nx/nx-linux-arm64-gnu": "npm:19.8.14" - "@nx/nx-linux-arm64-musl": "npm:19.8.14" - "@nx/nx-linux-x64-gnu": "npm:19.8.14" - "@nx/nx-linux-x64-musl": "npm:19.8.14" - "@nx/nx-win32-arm64-msvc": "npm:19.8.14" - "@nx/nx-win32-x64-msvc": "npm:19.8.14" + "@nx/nx-darwin-arm64": "npm:21.0.3" + "@nx/nx-darwin-x64": "npm:21.0.3" + "@nx/nx-freebsd-x64": "npm:21.0.3" + "@nx/nx-linux-arm-gnueabihf": "npm:21.0.3" + "@nx/nx-linux-arm64-gnu": "npm:21.0.3" + "@nx/nx-linux-arm64-musl": "npm:21.0.3" + "@nx/nx-linux-x64-gnu": "npm:21.0.3" + "@nx/nx-linux-x64-musl": "npm:21.0.3" + "@nx/nx-win32-arm64-msvc": "npm:21.0.3" + "@nx/nx-win32-x64-msvc": "npm:21.0.3" "@yarnpkg/lockfile": "npm:^1.1.0" - "@yarnpkg/parsers": "npm:3.0.0-rc.46" + "@yarnpkg/parsers": "npm:3.0.2" "@zkochan/js-yaml": "npm:0.0.7" - axios: "npm:^1.7.4" + axios: "npm:^1.8.3" chalk: "npm:^4.1.0" cli-cursor: "npm:3.1.0" cli-spinners: "npm:2.6.1" @@ -15605,13 +15593,15 @@ __metadata: npm-run-path: "npm:^4.0.1" open: "npm:^8.4.0" ora: "npm:5.3.0" + resolve.exports: "npm:2.0.3" semver: "npm:^7.5.3" string-width: "npm:^4.2.3" - strong-log-transformer: "npm:^2.1.0" tar-stream: "npm:~2.2.0" tmp: "npm:~0.2.1" + tree-kill: "npm:^1.2.2" tsconfig-paths: "npm:^4.1.2" tslib: "npm:^2.3.0" + yaml: "npm:^2.6.0" yargs: "npm:^17.6.2" yargs-parser: "npm:21.1.1" peerDependencies: @@ -15646,7 +15636,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: 10c0/3bc8b33b341054875a9ddbd9da63d001504948e1e4c7e707c138c939c52ea0269d6bc436aa3b9cf66c315177c626974d8f9322d19a5c1deceb4aa6faaaf67309 + checksum: 10c0/369783793ea44fddd7f99085f564763dcc6aa831e8efb1424481ddb71a3682193c6ec035ca0a007cc18d0217c7ca9f7271d23da9dde71e2b856bf75019588fde languageName: node linkType: hard @@ -18031,7 +18021,7 @@ __metadata: languageName: node linkType: hard -"resolve.exports@npm:^2.0.0": +"resolve.exports@npm:2.0.3, resolve.exports@npm:^2.0.0": version: 2.0.3 resolution: "resolve.exports@npm:2.0.3" checksum: 10c0/1ade1493f4642a6267d0a5e68faeac20b3d220f18c28b140343feb83694d8fed7a286852aef43689d16042c61e2ddb270be6578ad4a13990769e12065191200d @@ -19092,19 +19082,6 @@ __metadata: languageName: node linkType: hard -"strong-log-transformer@npm:^2.1.0": - version: 2.1.0 - resolution: "strong-log-transformer@npm:2.1.0" - dependencies: - duplexer: "npm:^0.1.1" - minimist: "npm:^1.2.0" - through: "npm:^2.3.4" - bin: - sl-log-transformer: bin/sl-log-transformer.js - checksum: 10c0/3c3b8aa8f34d661910563ff996412e2f527fc814e699a376854b554d4a4294ab7e285b4e2c08a080a7b19c5600a9b93a98798d3ac600fe3de545ca6605c07829 - languageName: node - linkType: hard - "style-dictionary@npm:^4.3.3": version: 4.4.0 resolution: "style-dictionary@npm:4.4.0" @@ -19515,7 +19492,7 @@ __metadata: languageName: node linkType: hard -"through@npm:>=2.2.7 <3, through@npm:^2.3.4": +"through@npm:>=2.2.7 <3": version: 2.3.8 resolution: "through@npm:2.3.8" checksum: 10c0/4b09f3774099de0d4df26d95c5821a62faee32c7e96fb1f4ebd54a2d7c11c57fe88b0a0d49cf375de5fee5ae6bf4eb56dbbf29d07366864e2ee805349970d3cc @@ -20762,7 +20739,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.7.1": +"yaml@npm:^2.6.0, yaml@npm:^2.7.1": version: 2.8.0 resolution: "yaml@npm:2.8.0" bin: