Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: install patch versions from 2024-01-06 #623

Merged
merged 13 commits into from
Jan 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
interval: "monthly"
time: "09:00"
timezone: "Europe/Amsterdam"
reviewers:
- "nl-design-system/kernteam-sysadmin"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
interval: "monthly"
time: "09:00"
timezone: "Europe/Amsterdam"
versioning-strategy: "increase-if-necessary"
open-pull-requests-limit: 20
reviewers:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
node-version-file: ".nvmrc"

- uses: pnpm/action-setup@v2.4.0
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -54,13 +54,13 @@ jobs:
- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
node-version-file: ".nvmrc"

- uses: pnpm/action-setup@v2.4.0
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -94,13 +94,13 @@ jobs:
- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
node-version-file: ".nvmrc"

- uses: pnpm/action-setup@v2.4.0
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
pnpm run --if-present test-build

- name: "Retain build artifact: storybook"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: storybook
path: packages/storybook/dist/
Expand All @@ -155,13 +155,13 @@ jobs:
- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
node-version-file: ".nvmrc"

- uses: pnpm/action-setup@v2.4.0
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
uses: actions/checkout@v4

- name: "Restore build artifact: Storybook"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: storybook
path: packages/storybook/dist/
Expand All @@ -219,13 +219,13 @@ jobs:
- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: "20"
node-version-file: ".nvmrc"

- uses: pnpm/action-setup@v2.4.0
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false

- name: Get pnpm store directory
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ Thumbs.db
# Example file exceptions
!.env.example

# Only track the npm 7 workspace root package-lock.json
# Only track the pnpm lockfile in the root
yarn.lock
package-lock.json
!/package-lock.json
pnpm-lock.yaml
!/pnpm-lock.yaml

# Ignore generated files from Stencil
components.d.ts
2 changes: 1 addition & 1 deletion .ncurc.major.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const minorConfig = require('./.ncurc.minor');

module.exports = {
reject: ['@mdx-js/react', ...minorConfig.reject],
reject: [...minorConfig.reject],
};
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
engine-strict=true
save-exact=true
save-prefix=
strict-peer-dependencies=false
auto-install-peers=false
78 changes: 8 additions & 70 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"scss/at-rule-no-unknown": true,
"scss/dollar-variable-default": true,
"scss/dollar-variable-first-in-block": [true, { "ignore": ["comments", "imports"] }],
"scss/dollar-variable-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9-]+$",
"scss/percent-placeholder-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9-]+$",
"scss/dollar-variable-pattern": "^(example|utrecht)-[a-z0-9-]+$",
"scss/percent-placeholder-pattern": "^(example|utrecht)-[a-z0-9-]+$",
"scss/operator-no-newline-after": null,
"scss/at-extend-no-missing-placeholder": null,
"custom-property-pattern": "^_?(denhaag|example|nl|utrecht)-[a-z0-9-]+$",
"selector-class-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9_-]+$",
"keyframes-name-pattern": "^(denhaag|example|nl|utrecht)-[a-z0-9-]+$",
"custom-property-pattern": "^_?(example|denhaag|utrecht)-[a-z0-9-]+$",
"selector-class-pattern": "^(example|denhaag|utrecht)-[a-z0-9_-]+$",
"keyframes-name-pattern": "^(example|utrecht)-[a-z0-9-]+$",
"at-rule-no-unknown": null,
"block-no-empty": [true],
"color-no-invalid-hex": [true],
Expand All @@ -31,7 +31,6 @@
"no-duplicate-at-import-rules": [true],
"no-duplicate-selectors": [true],
"no-empty-source": [true],
"no-extra-semicolons": null,
"no-invalid-double-slash-comments": [true],
"property-no-unknown": [true],
"selector-pseudo-class-no-unknown": [true],
Expand All @@ -57,8 +56,6 @@
"unit-disallowed-list": [["s"]],
"font-family-name-quotes": ["always-unless-keyword"],
"function-url-quotes": ["always"],
"number-leading-zero": null,
"number-no-trailing-zeros": null,
"declaration-property-value-disallowed-list": [
{
"text-align": ["left", "right"]
Expand Down Expand Up @@ -119,70 +116,11 @@
]
],
"selector-max-id": [0],
"indentation": null,
"linebreaks": null,
"max-line-length": null,
"function-comma-newline-after": null,
"function-comma-newline-before": null,
"function-comma-space-after": null,
"function-comma-space-before": null,
"function-max-empty-lines": null,
"function-parentheses-newline-inside": null,
"function-parentheses-space-inside": null,
"value-list-comma-newline-after": null,
"value-list-comma-newline-before": null,
"value-list-comma-space-after": null,
"value-list-comma-space-before": null,
"value-list-max-empty-lines": null,
"declaration-colon-newline-after": null,
"declaration-colon-space-after": null,
"declaration-colon-space-before": null,
"declaration-block-semicolon-newline-after": null,
"declaration-block-semicolon-newline-before": null,
"declaration-block-semicolon-space-after": null,
"declaration-block-semicolon-space-before": null,
"declaration-block-trailing-semicolon": null,
"block-closing-brace-empty-line-before": null,
"block-closing-brace-newline-after": null,
"block-closing-brace-newline-before": null,
"block-closing-brace-space-after": null,
"block-closing-brace-space-before": null,
"block-opening-brace-newline-after": null,
"block-opening-brace-newline-before": null,
"block-opening-brace-space-after": null,
"block-opening-brace-space-before": null,
"selector-attribute-quotes": ["always"],
"selector-combinator-space-after": null,
"selector-combinator-space-before": null,
"selector-descendant-combinator-no-non-space": null,
"selector-list-comma-newline-after": null,
"selector-list-comma-newline-before": null,
"selector-list-comma-space-after": null,
"selector-list-comma-space-before": null,
"media-query-list-comma-newline-after": null,
"media-query-list-comma-newline-before": null,
"media-query-list-comma-space-after": null,
"media-query-list-comma-space-before": null,
"value-keyword-case": ["lower", { "camelCaseSvgKeywords": true }],
"declaration-block-no-redundant-longhand-properties": null,
"at-rule-empty-line-before": null,
"at-rule-name-newline-after": null,
"at-rule-semicolon-newline-after": null,
"max-empty-lines": null,
"no-eol-whitespace": null,
"no-missing-end-of-source-newline": null,
"no-empty-first-line": null,
"unicode-bom": null,
"rule-empty-line-before": null,
"color-hex-case": null,
"unit-case": null,
"property-case": null,
"selector-pseudo-class-case": null,
"selector-pseudo-element-case": null,
"selector-max-empty-lines": null,
"media-feature-name-case": null,
"at-rule-name-case": null,
"string-quotes": null,
"property-no-vendor-prefix": null,
"value-keyword-case": ["lower", { "camelCaseSvgKeywords": true }],
"declaration-block-no-redundant-longhand-properties": null
"property-no-vendor-prefix": null
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"allowBranch": ["main"],
"conventionalCommits": true,
"exact": true,
"message": "docs(release): design system packages\n\nskip-checks: true",
"message": "docs(release): design system packages\n\n[skip ci]",
"syncWorkspaceLock": true
}
}
Expand Down
43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,40 @@
],
"private": true,
"engines": {
"node": "^20"
"node": "^20",
"pnpm": "^8"
},
"workspaces": [
"./packages/*",
"./proprietary/*"
],
"devDependencies": {
"@lerna-lite/cli": "3.0.0",
"@lerna-lite/publish": "3.0.0",
"@lerna-lite/run": "3.0.0",
"@lerna-lite/version": "3.0.0",
"@types/node": "20.10.1",
"@typescript-eslint/eslint-plugin": "6.13.1",
"@typescript-eslint/parser": "6.13.1",
"eslint": "8.54.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.29.0",
"@lerna-lite/cli": "3.2.0",
"@lerna-lite/publish": "3.2.0",
"@lerna-lite/run": "3.2.0",
"@lerna-lite/version": "3.2.0",
"@types/node": "20.10.6",
"@typescript-eslint/eslint-plugin": "6.17.0",
"@typescript-eslint/parser": "6.17.0",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-mdx": "2.2.0",
"eslint-plugin-mdx": "2.3.2",
"eslint-plugin-react": "7.33.2",
"husky": "8.0.3",
"lint-staged": "15.1.0",
"markdownlint-cli": "0.37.0",
"npm-check-updates": "16.14.11",
"lint-staged": "15.2.0",
"markdownlint-cli": "0.38.0",
"npm-check-updates": "16.14.12",
"npm-package-json-lint": "7.1.0",
"npm-run-all": "4.1.5",
"postcss": "8.4.31",
"prettier": "3.1.0",
"stylelint": "15.11.0",
"postcss": "8.4.33",
"prettier": "3.1.1",
"stylelint": "16.1.0",
"stylelint-config-prettier": "9.0.5",
"stylelint-config-standard-scss": "11.1.0",
"stylelint-order": "6.0.3",
"typescript": "5.3.2"
"stylelint-config-standard-scss": "13.0.0",
"stylelint-order": "6.0.4",
"typescript": "5.3.3"
},
"scripts": {
"build": "lerna run build",
Expand Down
11 changes: 1 addition & 10 deletions packages/components-css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,5 @@
"keywords": [
"nl-design-system"
],
"private": true,
"devDependencies": {
"@babel/core": "7.23.5",
"@mdx-js/react": "1.6.22",
"@storybook/addon-docs": "7.6.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.3.2",
"webpack": "5.89.0"
}
"private": true
}
Loading
Loading