Skip to content

Commit cbb96b5

Browse files
committed
chore: merge latest main
2 parents 461b9f2 + 5b227ed commit cbb96b5

File tree

104 files changed

+10743
-2053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+10743
-2053
lines changed

.github/workflows/_tdiff.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: (tdiff)
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
root:
7+
required: true
8+
type: string
9+
10+
jobs:
11+
generate-report:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- run: echo "🎉 The '${{ github.workflow }}' was triggered by a ${{ github.event_name }} event."
15+
- run: echo "🔎 The name of your branch is ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} and your repository is ${{ github.repository }}."
16+
- name: GET BRANCH NAME
17+
shell: bash
18+
run: echo "branch=$(echo ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} | sed -r 's/[\/]+/\//g')" >> $GITHUB_OUTPUT
19+
id: extract_branch
20+
- name: CHECKOUT TDIFF from ${{ github.repository }}/main
21+
uses: actions/checkout@v4
22+
with:
23+
repository: ${{ github.repository }}
24+
path: ./
25+
ref: main
26+
- name: SETUP NODE
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version: "20.12.2"
30+
- name: NPM INSTALL
31+
working-directory: ./tools/diff-generator
32+
run: |
33+
pwd &&
34+
npm install
35+
- name: CREATE REPORT
36+
working-directory: ./tools/diff-generator
37+
run: |
38+
node src/lib/cli.js report -otb ${{ inputs.root }} -ntb ${{ steps.extract_branch.outputs.branch }} --repo ${{ github.repository }} --format markdown --output logs/output.md
39+
- name: ADD SUMMARY
40+
working-directory: ./tools/diff-generator
41+
run: |
42+
cat ./logs/output.md >> $GITHUB_STEP_SUMMARY
43+
- name: COMPLETE
44+
run: echo "🍏 This job's status is ${{ job.status }}."
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Release Snapshot
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
get-snapshot-tag:
7+
name: Split branch name
8+
runs-on: ubuntu-latest
9+
steps:
10+
- id: split
11+
env:
12+
BRANCH: ${{ github.ref_name }}
13+
run: echo "::set-output name=fragment::${BRANCH##*/}"

.github/workflows/release.yml

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
id: changesets
2929
uses: changesets/action@v1
3030
with:
31+
# this expects you to have a npm script called version that runs some logic and then calls `changeset version`.
32+
# version: pnpm version
3133
commit: "chore: release"
3234
# This expects you to have a script called release which does a build for your packages and calls changeset publish
3335
publish: pnpm release
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: TDIFF - SPECTRUM FOUNDATIONS
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
tdiff:
8+
uses: ./.github/workflows/_tdiff.yml
9+
with:
10+
root: snapshot-s2-foundations # the spectrum-tokens data we want to compare against (branch of the repo)
11+
secrets: inherit

.github/workflows/tdiff-spectrum1.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: TDIFF - SPECTRUM 1
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
tdiff:
8+
uses: ./.github/workflows/_tdiff.yml
9+
with:
10+
root: main # the spectrum-tokens data we want to compare against (branch of the repo)
11+
secrets: inherit

.github/workflows/tdiff-spectrum2.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: TDIFF - SPECTRUM 2
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
tdiff:
8+
uses: ./.github/workflows/_tdiff.yml
9+
with:
10+
root: beta # the spectrum-tokens data we want to compare against (branch of the repo)
11+
secrets: inherit

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,6 @@ dist
112112
# moon
113113
.moon/cache
114114
.moon/docker
115+
116+
# visual studio code
117+
.vscode/

.moon/toolchain.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ node:
2020

2121
# The version of the package manager (above) to use.
2222
pnpm:
23-
version: "9.11.0"
23+
version: "9.12.1"
2424

2525
# Add `node.version` as a constraint in the root `package.json` `engines`.
2626
addEnginesConstraint: true

.moon/workspace.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ projects:
77
csvGenerator: tools/token-csv-generator
88
transform-tokens-json: "tools/transform-tokens-json"
99
root: "."
10+
diff: "tools/diff-generator"
1011
vcs:
1112
manager: "git"
1213
defaultBranch: "main"

.vscode/launch.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"configurations": [
3+
{
4+
"type": "chrome",
5+
"name": "http://localhost:8000/demo/",
6+
"request": "launch",
7+
"url": "http://localhost:8000/demo/"
8+
}
9+
]
10+
}

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Packages in this monorepo:
1919
- [Spectrum Token Visualizer Tool](docs/visualizer/) a visualizer for inspecting tokens. Published as a [static site](https://opensource.adobe.com/spectrum-tokens/visualizer/), not an NPM package.
2020
- [Spectrum Token Visualizer Tool S2](docs/s2-visualizer/) a version of the visualizer that shows the Spectrum 2 data. Published as a [static site](https://opensource.adobe.com/spectrum-tokens/s2-visualizer/).
2121
- [Spectrum Tokens Docs](docs/site/) a static site to show the component options API and other token data.
22+
- [Spectrum Token Diff Generator](tools/diff-generator/) a library and cli tool that reports changes made between two schema/releases/branches.
2223

2324
## Setup monorepo locally
2425

docs/site/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# site
2+
3+
## 0.1.0
4+
5+
### Minor Changes
6+
7+
- [`413ef5a`](https://github.com/adobe/spectrum-tokens/commit/413ef5adad9083b7e133cc867e0436a879004ec8) Thanks [@GarthDB](https://github.com/GarthDB)! - Added `private` metadata to global tokens.

docs/site/moon.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
# OF ANY KIND, either express or implied. See the License for the specific language
99
# governing permissions and limitations under the License.
1010
$schema: "https://moonrepo.dev/schemas/project.json"
11-
stack: "frontend"
11+
stack: frontend
12+
type: application
1213
tags:
1314
- docs
1415
- site

docs/site/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
"name": "site",
33
"private": true,
44
"access": "restricted",
5-
"version": "0.0.0",
5+
"version": "0.1.0",
66
"repository": {
77
"type": "git",
88
"url": "git+https://github.com/adobe/spectrum-tokens.git"
99
},
1010
"dependencies": {
11-
"@spectrum-css/link": "^4.2.5",
12-
"@spectrum-css/page": "^7.1.4",
13-
"@spectrum-css/sidenav": "^4.2.4",
14-
"@spectrum-css/table": "^5.2.5",
15-
"@spectrum-css/tokens": "^13.2.0",
16-
"@spectrum-css/typography": "^5.1.5",
17-
"ajv": "^8.12.0",
11+
"@spectrum-css/link": "^5.1.3",
12+
"@spectrum-css/page": "^8.1.3",
13+
"@spectrum-css/sidenav": "^5.1.3",
14+
"@spectrum-css/table": "^6.1.3",
15+
"@spectrum-css/tokens": "^14.4.0",
16+
"@spectrum-css/typography": "^6.1.3",
17+
"ajv": "^8.17.1",
1818
"ajv-formats": "^3.0.1",
19-
"next": "^14.2.1",
20-
"react": "^18.2.0",
21-
"react-dom": "^18.2.0",
22-
"rimraf": "^5.0.5"
19+
"next": "^14.2.15",
20+
"react": "^18.3.1",
21+
"react-dom": "^18.3.1",
22+
"rimraf": "^6.0.1"
2323
},
2424
"license": "Apache-2.0",
2525
"bugs": {

0 commit comments

Comments
 (0)