Skip to content

Commit

Permalink
build: patch round 2024-07
Browse files Browse the repository at this point in the history
- Align editorconfig with Prettier, rename .prettierrc.json ->
  prettier.config.cjs
- Remove @types/testing-library__jest-dom. @testing-library/jest-dom
  provides its own type definitions.
- Add missing peerDependency @babel/core
- Install patch updates
- Install minor updates
- Install major updates, keep style-dictionary at v3 for now
  • Loading branch information
matijs authored and Robbert committed Jul 4, 2024
1 parent 295dd92 commit f161f5c
Show file tree
Hide file tree
Showing 10 changed files with 1,007 additions and 1,281 deletions.
9 changes: 3 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
root = true

[*.{css,js,json,jsx,html,md,mdx,scss,svg,ts,tsx}]
[*]
charset = UTF-8
end_of_line = lf
indent_size = 2
Expand All @@ -9,8 +9,5 @@ insert_final_newline = true
max_line_length = 120
trim_trailing_whitespace = true

[*ignore]
charset = UTF-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[*.{md,mdx}]
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion .ncurc.major.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ const minorConfig = require('./.ncurc.minor.cjs');

module.exports = {
...minorConfig,
reject: [...minorConfig.reject, 'eslint', 'eslint-plugin-json'],
reject: [...minorConfig.reject, 'eslint', 'eslint-plugin-json', 'style-dictionary'],
target: 'latest',
};
55 changes: 0 additions & 55 deletions .prettierrc.json

This file was deleted.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@
"./proprietary/*"
],
"devDependencies": {
"@lerna-lite/cli": "3.5.1",
"@lerna-lite/publish": "3.5.2",
"@lerna-lite/run": "3.5.1",
"@lerna-lite/version": "3.5.2",
"@types/node": "20.14.2",
"@typescript-eslint/eslint-plugin": "7.13.0",
"@typescript-eslint/parser": "7.13.0",
"@lerna-lite/cli": "3.6.0",
"@lerna-lite/publish": "3.6.0",
"@lerna-lite/run": "3.6.0",
"@lerna-lite/version": "3.6.0",
"@types/node": "20.14.9",
"@typescript-eslint/eslint-plugin": "7.15.0",
"@typescript-eslint/parser": "7.15.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-mdx": "3.1.5",
"eslint-plugin-react": "7.34.2",
"eslint-plugin-react": "7.34.3",
"husky": "9.0.11",
"lint-staged": "15.2.7",
"markdownlint-cli": "0.41.0",
"npm-check-updates": "16.14.20",
"npm-package-json-lint": "8.0.0",
"npm-run-all": "4.1.5",
"postcss": "8.4.38",
"postcss": "8.4.39",
"prettier": "3.3.2",
"stylelint": "16.6.1",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-order": "6.0.4",
"typescript": "5.4.5"
"typescript": "5.5.3"
},
"scripts": {
"build": "lerna run build",
Expand All @@ -58,7 +58,7 @@
"lint-fix:md": "markdownlint --fix '**/*.md'",
"lint-workspaces": "lerna run --no-bail lint",
"lint-build": "lerna run --no-bail lint-build",
"prepare": "husky install",
"prepare": "husky",
"prettier": "prettier --write .",
"publish": "lerna publish from-package --yes",
"release": "lerna version prerelease --conventional-prerelease --no-changelog --no-private --yes",
Expand All @@ -77,5 +77,5 @@
"dependencies": {
"http-server": "14.1.1"
},
"packageManager": "pnpm@9.1.1+sha256.9551e803dcb7a1839fdf5416153a844060c7bce013218ce823410532504ac10b"
"packageManager": "pnpm@9.4.0+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74"
}
9 changes: 4 additions & 5 deletions packages/components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,13 @@
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "26.0.1",
"@rollup/plugin-node-resolve": "15.2.3",
"@testing-library/dom": "10.1.0",
"@testing-library/dom": "10.3.0",
"@testing-library/jest-dom": "6.4.6",
"@testing-library/react": "16.0.0",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/lodash.chunk": "4.2.9",
"@types/react": "18.3.3",
"@types/testing-library__jest-dom": "5.14.9",
"@vitejs/plugin-react": "4.3.1",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
Expand All @@ -69,10 +68,10 @@
"rollup-plugin-peer-deps-external": "2.2.4",
"rollup-plugin-postcss": "4.0.2",
"rollup-plugin-typescript2": "0.36.0",
"sass": "1.77.5",
"sass": "1.77.6",
"tslib": "2.6.3",
"typescript": "5.4.5",
"vite": "5.3.1",
"typescript": "5.5.3",
"vite": "5.3.3",
"vite-plugin-runtime-config": "1.0.2"
},
"peerDependencies": {
Expand Down
37 changes: 19 additions & 18 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,39 @@
"storybook": "storybook dev --config-dir config/ --port 6006"
},
"devDependencies": {
"@babel/core": "7.24.7",
"@etchteam/storybook-addon-status": "5.0.0",
"@kernteam/assets": "workspace:*",
"@kernteam/components-css": "workspace:*",
"@kernteam/design-tokens": "workspace:*",
"@kernteam/font": "workspace:*",
"@kernteam/web-components-react": "workspace:*",
"@kernteam/web-components-stencil": "workspace:*",
"@nl-design-system-unstable/nlds-design-tokens": "1.0.0-alpha.261",
"@nl-design-system-unstable/voorbeeld-design-tokens": "1.0.0-alpha.140",
"@storybook/addon-a11y": "8.1.9",
"@storybook/addon-actions": "8.1.9",
"@storybook/addon-docs": "8.1.9",
"@storybook/addon-interactions": "8.1.9",
"@storybook/addon-links": "8.1.9",
"@storybook/addon-viewport": "8.1.9",
"@storybook/blocks": "8.1.9",
"@storybook/react": "8.1.9",
"@storybook/react-vite": "8.1.9",
"@storybook/theming": "8.1.9",
"@tabler/icons-react": "3.6.0",
"@nl-design-system-unstable/nlds-design-tokens": "1.0.0-alpha.290",
"@nl-design-system-unstable/voorbeeld-design-tokens": "1.0.0-alpha.151",
"@storybook/addon-a11y": "8.1.11",
"@storybook/addon-actions": "8.1.11",
"@storybook/addon-docs": "8.1.11",
"@storybook/addon-interactions": "8.1.11",
"@storybook/addon-links": "8.1.11",
"@storybook/addon-viewport": "8.1.11",
"@storybook/blocks": "8.1.11",
"@storybook/react": "8.1.11",
"@storybook/react-vite": "8.1.11",
"@storybook/theming": "8.1.11",
"@tabler/icons-react": "3.8.0",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@utrecht/component-library-react": "3.1.0",
"@utrecht/web-component-library-react": "1.1.0",
"@utrecht/component-library-react": "4.0.0",
"@utrecht/web-component-library-react": "1.1.1",
"@whitespace/storybook-addon-html": "6.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-syntax-highlighter": "15.5.0",
"require-from-string": "2.0.2",
"rimraf": "5.0.7",
"storybook": "8.1.9",
"typescript": "5.4.5",
"vite": "5.3.1"
"storybook": "8.1.11",
"typescript": "5.5.3",
"vite": "5.3.3"
}
}
4 changes: 2 additions & 2 deletions packages/web-components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
},
"devDependencies": {
"@kernteam/web-components-stencil": "workspace:*",
"@types/node": "20.14.2",
"@types/node": "20.14.9",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"rimraf": "5.0.7",
"typescript": "5.4.5"
"typescript": "5.5.3"
}
}
4 changes: 2 additions & 2 deletions packages/web-components-stencil/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"npm-run-all": "4.1.5",
"rimraf": "5.0.7",
"tslib": "2.6.3",
"typescript": "5.4.5"
"typescript": "5.5.3"
},
"dependencies": {
"@stencil/core": "4.18.3"
"@stencil/core": "4.19.2"
}
}
Loading

0 comments on commit f161f5c

Please sign in to comment.