Skip to content

Commit 74d5b2a

Browse files
authored
chore: merge latest updates from main (#3777)
1 parent 13e0204 commit 74d5b2a

File tree

5 files changed

+92
-116
lines changed

5 files changed

+92
-116
lines changed

.github/actions/file-diff/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@actions/core": "^1.11.1",
2727
"@actions/github": "^6.0.0",
2828
"@actions/glob": "^0.5.0",
29-
"diff": "^7.0.0",
29+
"diff": "^8.0.0",
3030
"diff2html": "^3.4.51"
3131
},
3232
"keywords": [

.github/workflows/development.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
steps:
102102
- name: Get changed files
103103
id: changed-files
104-
uses: step-security/changed-files@v45
104+
uses: step-security/changed-files@v46
105105
with:
106106
files_yaml: |
107107
styles:

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@changesets/cli": "^2.27.11",
7171
"@commitlint/cli": "^19.6.1",
7272
"@commitlint/config-conventional": "^19.6.0",
73-
"@nx/devkit": "^19.8.2",
73+
"@nx/devkit": "^21.0.0",
7474
"@spectrum-tools/postcss-rgb-mapping": "1.1.0",
7575
"@yarnpkg/types": "^4.0.0",
7676
"at-rule-packer": "^0.4.2",
@@ -79,7 +79,7 @@
7979
"cross-env": "^7.0.3",
8080
"cssnano": "^7.0.6",
8181
"cssnano-preset-advanced": "^7.0.6",
82-
"diff": "^7.0.0",
82+
"diff": "^8.0.0",
8383
"diff2html": "^3.4.51",
8484
"eslint": "^8.57.0",
8585
"eslint-plugin-jsonc": "^2.18.2",
@@ -95,7 +95,7 @@
9595
"node-gyp": "^11.0.0",
9696
"npm-registry-fetch": "^18.0.2",
9797
"nunjucks": "^3.2.4",
98-
"nx": "^19.8.2",
98+
"nx": "^21.0.0",
9999
"open": "^10.1.0",
100100
"pajv": "^1.2.0",
101101
"postcss": "^8.5.3",

tokens/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@
4242
"diff": {
4343
"cache": true,
4444
"executor": "nx:run-commands",
45-
"inputs": [{ "externalDependencies": ["@adobe/token-diff-generator", "@adobe/spectrum-tokens"] }],
45+
"inputs": [{ "externalDependencies": ["@adobe/token-diff-generator"] }],
4646
"options": {
4747
"commands": [
48-
"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"
48+
"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"
4949
],
50-
"cwd": "{projectRoot}",
5150
"forwardAllArgs": true,
52-
"parallel": false
51+
"v1": "13.7.0"
5352
},
5453
"outputs": [
5554
"{projectRoot}/dist/tokens-diff.md"

0 commit comments

Comments
 (0)