Skip to content

Commit

Permalink
Merge branch 'main' into build/extend-figma-tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
NickDITP committed Nov 27, 2024
2 parents cf5bd34 + ffe2de5 commit d26c920
Show file tree
Hide file tree
Showing 58 changed files with 7,106 additions and 5,976 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install pnpm package manager
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0

- name: Set up Node.js version
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version-file: .nvmrc
cache: pnpm
Expand All @@ -34,13 +34,13 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install pnpm package manager
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0

- name: Set up Node.js version
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version-file: .nvmrc
cache: pnpm
Expand All @@ -57,13 +57,13 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install pnpm package manager
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0

- name: Set up Node.js version
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version-file: .nvmrc
cache: pnpm
Expand All @@ -87,7 +87,7 @@ jobs:
run: pnpm run --if-present test-build

- name: "Retain build artifact: storybook"
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: storybook
path: packages/storybook/dist/
Expand All @@ -99,13 +99,13 @@ jobs:

steps:
- name: Checkout branch
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install pnpm package manager
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0

- name: Set up Node.js version
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version-file: .nvmrc
cache: pnpm
Expand All @@ -123,16 +123,16 @@ jobs:

steps:
- name: Checkout release branch
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: "Restore build artifact: Storybook"
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: storybook
path: packages/storybook/dist/

- name: Continuous Deployment to GitHub Pages
uses: JamesIves/github-pages-deploy-action@5c6e9e9f3672ce8fd37b9856193d2a537941e66c # v4.6.1
uses: JamesIves/github-pages-deploy-action@881db5376404c5c8d621010bcbec0310b58d5e29 # v4.6.8
with:
branch: gh-pages
folder: packages/storybook/dist/
Expand All @@ -144,15 +144,15 @@ jobs:

steps:
- name: Checkout release branch
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.GH_TOKEN }}

- name: Install pnpm package manager
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0

- name: Set up Node.js version
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version-file: .nvmrc
cache: pnpm
Expand Down
2 changes: 1 addition & 1 deletion npmpackagejsonlint.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
{
patterns: ['proprietary/**/package.json'],
rules: {
'valid-values-license': ['error', ['SEE LICENSE IN ../LICENSE.md']],
'valid-values-license': ['error', ['SEE LICENSE IN LICENSE.md']],
},
},
],
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@
"./proprietary/*"
],
"devDependencies": {
"@lerna-lite/cli": "3.4.0",
"@lerna-lite/cli": "3.10.0",
"@lerna-lite/publish": "3.4.0",
"@lerna-lite/run": "3.4.0",
"@lerna-lite/version": "3.4.0",
"@types/node": "20.12.12",
"@lerna-lite/run": "3.10.0",
"@lerna-lite/version": "3.10.0",
"@types/node": "20.17.1",
"@typescript-eslint/eslint-plugin": "7.17.0",
"@typescript-eslint/parser": "7.17.0",
"eslint": "8.57.0",
"eslint": "8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-mdx": "3.1.5",
"eslint-plugin-react": "7.34.1",
"husky": "9.0.11",
"lint-staged": "15.2.7",
"markdownlint-cli": "0.41.0",
"npm-check-updates": "16.14.20",
"npm-package-json-lint": "7.1.0",
"eslint-plugin-react": "7.37.2",
"husky": "9.1.6",
"lint-staged": "15.2.10",
"markdownlint-cli": "0.42.0",
"npm-check-updates": "17.1.8",
"npm-package-json-lint": "8.0.0",
"npm-run-all": "4.1.5",
"postcss": "8.4.40",
"postcss": "8.4.47",
"prettier": "3.3.3",
"stylelint": "16.7.0",
"stylelint": "16.10.0",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-order": "6.0.4",
"typescript": "5.5.4"
Expand Down
32 changes: 16 additions & 16 deletions packages/components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,43 +35,43 @@
"clsx": "2.1.1"
},
"devDependencies": {
"@babel/core": "7.24.9",
"@babel/plugin-transform-runtime": "7.24.7",
"@babel/preset-env": "7.24.8",
"@babel/preset-react": "7.24.7",
"@babel/preset-typescript": "7.24.7",
"@babel/runtime": "7.24.8",
"@babel/core": "7.26.0",
"@babel/plugin-transform-runtime": "7.25.9",
"@babel/preset-env": "7.26.0",
"@babel/preset-react": "7.25.9",
"@babel/preset-typescript": "7.26.0",
"@babel/runtime": "7.26.0",
"@tilburg/components-css": "workspace:*",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "25.0.8",
"@rollup/plugin-node-resolve": "15.2.3",
"@testing-library/dom": "10.1.0",
"@rollup/plugin-commonjs": "26.0.3",
"@rollup/plugin-node-resolve": "15.3.0",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.4.5",
"@testing-library/react": "15.0.7",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/react": "18.3.3",
"@types/testing-library__jest-dom": "5.14.9",
"@vitejs/plugin-react": "4.3.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"next": "14.2.3",
"next": "14.2.8",
"npm-run-all": "4.1.5",
"postcss": "8.4.38",
"postcss": "8.4.47",
"react": "18.3.1",
"react-dom": "18.3.1",
"rimraf": "5.0.7",
"rollup": "4.19.0",
"rimraf": "6.0.1",
"rollup": "4.24.2",
"rollup-plugin-filesize": "10.0.0",
"rollup-plugin-node-externals": "7.1.2",
"rollup-plugin-node-externals": "7.1.3",
"rollup-plugin-node-polyfills": "0.2.1",
"rollup-plugin-peer-deps-external": "2.2.4",
"rollup-plugin-postcss": "4.0.2",
"rollup-plugin-typescript2": "0.36.0",
"sass": "1.77.8",
"tslib": "2.6.3",
"typescript": "5.4.5",
"vite": "5.3.5",
"vite": "5.4.10",
"vite-plugin-runtime-config": "1.0.2"
},
"peerDependencies": {
Expand Down
38 changes: 19 additions & 19 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,38 @@
"storybook": "storybook dev --config-dir config/ --port 6006"
},
"devDependencies": {
"@storybook/addon-a11y": "8.2.6",
"@storybook/addon-actions": "8.2.6",
"@storybook/addon-docs": "8.2.6",
"@storybook/addon-interactions": "8.2.6",
"@storybook/addon-links": "8.2.6",
"@storybook/addon-viewport": "8.2.6",
"@storybook/manager-api": "8.2.6",
"@storybook/react": "8.2.6",
"@storybook/react-vite": "8.2.6",
"@storybook/theming": "8.2.6",
"@storybook/addon-a11y": "8.3.6",
"@storybook/addon-actions": "8.3.6",
"@storybook/addon-docs": "8.3.6",
"@storybook/addon-interactions": "8.3.6",
"@storybook/addon-links": "8.3.6",
"@storybook/addon-viewport": "8.3.6",
"@storybook/manager-api": "8.3.6",
"@storybook/react": "8.3.6",
"@storybook/react-vite": "8.3.6",
"@storybook/theming": "8.3.6",
"@tilburg/assets": "workspace:*",
"@tilburg/components-css": "workspace:*",
"@tilburg/design-tokens": "workspace:*",
"@tilburg/font": "workspace:*",
"@tilburg/web-components-react": "workspace:*",
"@tilburg/web-components-stencil": "workspace:*",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@utrecht/component-library-react": "4.2.0",
"@utrecht/components": "6.1.0",
"@utrecht/components": "6.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"rimraf": "5.0.9",
"storybook": "8.2.6",
"rimraf": "6.0.1",
"storybook": "8.3.6",
"typescript": "5.5.4",
"vite": "5.3.5"
"vite": "5.4.10"
},
"dependencies": {
"@amsterdam/design-system-css": "0.10.0",
"@amsterdam/design-system-react": "0.10.0",
"@amsterdam/design-system-css": "0.11.1",
"@amsterdam/design-system-react": "0.11.1",
"@amsterdam/design-system-assets": "0.2.1",
"@amsterdam/design-system-tokens": "0.10.0",
"@amsterdam/design-system-tokens": "0.11.0",
"clsx": "2.1.1"
}
}
2 changes: 1 addition & 1 deletion packages/web-components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/react-dom": "18.3.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"rimraf": "5.0.9",
"rimraf": "6.0.1",
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion packages/web-components-stencil/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/jest": "29.5.12",
"chokidar-cli": "3.0.0",
"npm-run-all": "4.1.5",
"rimraf": "5.0.7",
"rimraf": "6.0.1",
"tslib": "2.6.2",
"typescript": "5.4.5"
},
Expand Down
Loading

0 comments on commit d26c920

Please sign in to comment.