Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-storybook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ["22.12.0"]
node-version: ["22.20.0"]

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: '22.12.0'
node-version: '22.20.0'
registry-url: https://registry.npmjs.org/
scope: '@diamondlightsource'
cache: pnpm
Expand All @@ -34,10 +34,10 @@ jobs:
run: pnpm install --frozen-lockfile

- name: Build
run: pnpm build
run: pnpm run build

- name: Test
run: pnpm jest
run: pnpm run test

- name: Publish
run: pnpm publish -r --no-git-checks --access public
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ["22.12.0"]
node-version: ["22.20.0"]

steps:
- uses: actions/checkout@v4
Expand All @@ -35,6 +35,6 @@ jobs:
- name: Audit packages, run Typescript tests and lint client code
run: |
pnpm audit --prod --audit-level high
pnpm lint
pnpm jest
pnpm run lint
pnpm run test
pnpm build
6 changes: 2 additions & 4 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ export default [
"**/*.html",
"**/*.svg",
"**/*.md",
"babel.config.js",
"eslint.config.js",
"jest.config.js",
"jest.setup.js",
"*.config.js",
"rollup.config.mjs",
"vitest.setup.ts"
]},
js.configs.recommended,
...compat.extends("plugin:@typescript-eslint/recommended"),
Expand Down
13 changes: 0 additions & 13 deletions jest.config.js

This file was deleted.

4 changes: 0 additions & 4 deletions jest.setup.js

This file was deleted.

15 changes: 5 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"scripts": {
"build": "tsc -b && rollup --config rollup.config.mjs",
"docs:build": "typedoc src",
"jest": "jest --config jest.config.js",
"jest:coverage": "jest --coverage",
"test": "vitest",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"lint:tsc": "pnpm tsc --noEmit",
Expand All @@ -28,7 +27,6 @@
"storybook:publish": "gh-pages -b storybook/publish -d storybook-static"
},
"dependencies": {
"@types/utif": "^3.0.5",
"react-icons": "^5.3.0",
"utif": "^3.1.0"
},
Expand Down Expand Up @@ -68,23 +66,19 @@
"@storybook/test": "^8.4.4",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.1.0",
"@types/jest": "^29.5.14",
"@types/node": "^20.17.6",
"@types/node": "^20.19.21",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/utif": "^3.0.5",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"babel-jest": "^29.7.0",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.1.0",
"file-loader": "^6.2.0",
"gh-pages": "^6.2.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-transform-stub": "^2.0.0",
"react-dom": "^18.3.1",
"react-router-dom": "^7.5.3",
"rollup": "^4.27.3",
Expand All @@ -96,7 +90,8 @@
"tslib": "^2.8.1",
"typedoc": "^0.28.5",
"typescript": "^5.6.3",
"typescript-eslint": "^8.15.0"
"typescript-eslint": "^8.15.0",
"vitest": "^3.2.4"
},
"packageManager": "pnpm@9.12.3+sha256.24235772cc4ac82a62627cd47f834c72667a2ce87799a846ec4e8e555e2d4b8b"
}
Loading