diff --git a/apps/i15-1/index.html b/apps/i15-1/index.html index 1a2add8d..252ca40a 100644 --- a/apps/i15-1/index.html +++ b/apps/i15-1/index.html @@ -7,6 +7,14 @@ I15-1 +
diff --git a/apps/i15-1/package.json b/apps/i15-1/package.json index bee45f7f..5850a1a4 100644 --- a/apps/i15-1/package.json +++ b/apps/i15-1/package.json @@ -21,7 +21,7 @@ "@atlas/blueapi-ui": "workspace:*", "@atlas/pvws-config": "workspace:*", "@diamondlightsource/cs-web-lib": "0.10.15", - "@diamondlightsource/sci-react-ui": "^0.4.0", + "@diamondlightsource/sci-react-ui": "0.6.2-alpha.1", "@mui/icons-material": "^6.5.0", "@mui/material": "<7.0.0", "@tanstack/react-query": "^5.90.21", diff --git a/apps/i15-1/src/main.tsx b/apps/i15-1/src/main.tsx index 256c3f7d..20db3bab 100644 --- a/apps/i15-1/src/main.tsx +++ b/apps/i15-1/src/main.tsx @@ -1,4 +1,4 @@ -import { DiamondTheme } from "@diamondlightsource/sci-react-ui"; +import { DiamondDSTheme } from "@diamondlightsource/sci-react-ui"; import { RouterProvider } from "react-router-dom"; import { createRoot } from "react-dom/client"; import { StrictMode } from "react"; @@ -20,7 +20,7 @@ const api = createApi("/api/blueapi"); enableMocking().then(() => { createRoot(document.getElementById("root")!).render( - + , diff --git a/packages/vitest-conf/src/vitest.config.js b/packages/vitest-conf/src/vitest.config.js index 2860f130..84461638 100644 --- a/packages/vitest-conf/src/vitest.config.js +++ b/packages/vitest-conf/src/vitest.config.js @@ -13,6 +13,8 @@ export default defineConfig({ include: ["**/*.test.{ts,tsx}"], css: false, reporters: ["verbose"], + maxWorkers: 1, + minWorkers: 1, coverage: { reporter: ["lcov", "json-summary", "text"], include: ["src/**/*.{ts,tsx}"], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62702b06..5eae420c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,8 +73,8 @@ importers: specifier: 0.10.15 version: 0.10.15(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(graphql@16.14.2)(plotly.js@2.35.3(mapbox-gl@1.13.3)(webpack@5.106.2(postcss@8.5.15)))(react-dom@18.3.1(react@18.3.1))(react-gauge-component@2.0.29(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@7.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@diamondlightsource/sci-react-ui': - specifier: ^0.4.0 - version: 0.4.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@jsonforms/core@3.6.0)(@jsonforms/material-renderers@3.6.0(a2958437c922d885fd4a4f8b5e701907))(@jsonforms/react@3.6.0(@jsonforms/core@3.6.0)(react@18.3.1))(@mui/icons-material@6.5.0(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + specifier: 0.6.2-alpha.1 + version: 0.6.2-alpha.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@jsonforms/core@3.6.0)(@jsonforms/material-renderers@3.6.0(a2958437c922d885fd4a4f8b5e701907))(@jsonforms/react@3.6.0(@jsonforms/core@3.6.0)(react@18.3.1))(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1) '@mui/icons-material': specifier: ^6.5.0 version: 6.5.0(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1) @@ -693,6 +693,17 @@ packages: '@mui/material': ^6.1.7 react: ^18.3.1 + '@diamondlightsource/sci-react-ui@0.6.2-alpha.1': + resolution: {integrity: sha512-IMm3akmSJd3dQKoKRYsbOF/kcUWImTCpJuY/bPzeovxhpLDdcP6RaC6T7ED9IFazR0dPyEDOpp+cweWKS1km6Q==} + peerDependencies: + '@emotion/react': ^11.13.3 + '@emotion/styled': ^11.13.0 + '@jsonforms/core': ^3.7.0 + '@jsonforms/material-renderers': ^3.7.0 + '@jsonforms/react': ^3.7.0 + '@mui/material': ^7.0.0 + react: ^18.3.1 + '@emotion/babel-plugin@11.13.5': resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==} @@ -977,6 +988,9 @@ packages: '@floating-ui/utils@0.2.11': resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==} + '@fontsource-variable/inter@5.2.8': + resolution: {integrity: sha512-kOfP2D+ykbcX/P3IFnokOhVRNoTozo5/JxhAIVYLpea/UBmCQ/YWPBfWIDuBImXX/15KH+eKh4xpEUyS2sQQGQ==} + '@graphql-codegen/add@7.0.1': resolution: {integrity: sha512-kWw6RMu9ysBw1wcgcgf9mOnswc5M3ekOApDTiaJC/UZNTEYins01srZHYTP7z3P/WlGGC844BRtjwh3U2kNd/A==} engines: {node: '>=16'} @@ -6457,24 +6471,28 @@ snapshots: react-icons: 5.6.0(react@18.3.1) utif: 3.1.0 - '@diamondlightsource/sci-react-ui@0.4.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@jsonforms/core@3.6.0)(@jsonforms/material-renderers@3.6.0(a2958437c922d885fd4a4f8b5e701907))(@jsonforms/react@3.6.0(@jsonforms/core@3.6.0)(react@18.3.1))(@mui/icons-material@6.5.0(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@diamondlightsource/sci-react-ui@0.6.2-alpha.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@jsonforms/core@3.6.0)(@jsonforms/material-renderers@3.6.0(a2958437c922d885fd4a4f8b5e701907))(@jsonforms/react@3.6.0(@jsonforms/core@3.6.0)(react@18.3.1))(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1)': dependencies: '@emotion/react': 11.14.0(@types/react@18.3.28)(react@18.3.1) '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1) + '@fontsource-variable/inter': 5.2.8 '@jsonforms/core': 3.6.0 '@jsonforms/material-renderers': 3.6.0(a2958437c922d885fd4a4f8b5e701907) '@jsonforms/react': 3.6.0(@jsonforms/core@3.6.0)(react@18.3.1) - '@mui/icons-material': 6.5.0(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1) + '@mui/icons-material': 7.3.11(@mui/material@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.28)(react@18.3.1) '@mui/material': 6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - keycloak-js: 26.2.4 react: 18.3.1 react-icons: 5.6.0(react@18.3.1) utif: 3.1.0 + optionalDependencies: + keycloak-js: 26.2.4 + transitivePeerDependencies: + - '@types/react' '@emotion/babel-plugin@11.13.5': dependencies: '@babel/helper-module-imports': 7.28.6 - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@emotion/hash': 0.9.2 '@emotion/memoize': 0.9.0 '@emotion/serialize': 1.3.3 @@ -6722,6 +6740,8 @@ snapshots: '@floating-ui/utils@0.2.11': {} + '@fontsource-variable/inter@5.2.8': {} + '@graphql-codegen/add@7.0.1(graphql@16.14.2)': dependencies: '@graphql-codegen/plugin-helpers': 7.0.1(graphql@16.14.2) @@ -7465,7 +7485,7 @@ snapshots: '@mui/base@5.0.0-beta.68(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@floating-ui/react-dom': 2.1.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': 7.4.11(@types/react@18.3.28) '@mui/utils': 6.4.9(@types/react@18.3.28)(react@18.3.1) @@ -7535,7 +7555,7 @@ snapshots: '@mui/private-theming@6.4.9(@types/react@18.3.28)(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@mui/utils': 6.4.9(@types/react@18.3.28)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 @@ -7544,7 +7564,7 @@ snapshots: '@mui/styled-engine@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 '@emotion/sheet': 1.4.0 @@ -7557,7 +7577,7 @@ snapshots: '@mui/system@6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@mui/private-theming': 6.4.9(@types/react@18.3.28)(react@18.3.1) '@mui/styled-engine': 6.5.0(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@18.3.28)(react@18.3.1))(@types/react@18.3.28)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.24(@types/react@18.3.28) @@ -7577,13 +7597,13 @@ snapshots: '@mui/types@7.4.11(@types/react@18.3.28)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 optionalDependencies: '@types/react': 18.3.28 '@mui/utils@6.4.9(@types/react@18.3.28)(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@mui/types': 7.2.24(@types/react@18.3.28) '@types/prop-types': 15.7.15 clsx: 2.1.1 @@ -7595,7 +7615,7 @@ snapshots: '@mui/utils@7.3.8(@types/react@18.3.28)(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@mui/types': 7.4.11(@types/react@18.3.28) '@types/prop-types': 15.7.15 clsx: 2.1.1 @@ -7627,7 +7647,7 @@ snapshots: '@mui/x-internals@7.29.0(@types/react@18.3.28)(react@18.3.1)': dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@mui/utils': 7.3.8(@types/react@18.3.28)(react@18.3.1) react: 18.3.1 transitivePeerDependencies: @@ -8787,13 +8807,13 @@ snapshots: babel-plugin-macros@2.8.0: dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 cosmiconfig: 6.0.0 resolve: 1.22.11 babel-plugin-macros@3.1.0: dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 cosmiconfig: 7.1.0 resolve: 1.22.11 @@ -9463,7 +9483,7 @@ snapshots: dom-helpers@5.2.1: dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 csstype: 3.2.3 draco3d@1.5.7: {} @@ -11310,7 +11330,7 @@ snapshots: react-select@5.10.2(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 '@emotion/cache': 11.14.0 '@emotion/react': 11.14.0(@types/react@18.3.28)(react@18.3.1) '@floating-ui/dom': 1.7.6 @@ -11338,7 +11358,7 @@ snapshots: react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -11409,7 +11429,7 @@ snapshots: redux@4.2.1: dependencies: - '@babel/runtime': 7.28.6 + '@babel/runtime': 7.29.7 redux@5.0.1: {}