Merge branch 'main' into feature/static-waves

equinor · Jan 15, 2025 · 830d7d3 · 830d7d3
2 parents ed4984f + d8575c7
commit 830d7d3
Show file tree

Hide file tree

Showing 108 changed files with 354 additions and 5,773 deletions.
diff --git a/.github/workflows/npm_publish.yaml b/.github/workflows/npm_publish.yaml
@@ -7,7 +7,16 @@ on:
 permissions:
   id-token: write
 jobs:
+  browser_tests:
+    name: Run browser tests
+    uses: ./.github/workflows/browser_tests.yaml
+
+  jsdom_tests:
+    name: Run JSDOM tests
+    uses: ./.github/workflows/jsdom_tests.yaml
+
   publish:
+    needs: [browser_tests, jsdom_tests]
     runs-on: ubuntu-latest
 
     steps:
@@ -19,12 +28,6 @@ jobs:
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
-      - name: Install playwright with dependencies
-        run: bunx playwright install --with-deps
-
-      - name: Run Tests
-        run: bun run test:ci
-
       - name: Build Components
         run: bun run build-components
 

diff --git a/bun.lockb b/bun.lockb
diff --git a/config/config_files/setupLocalhost.mjs b/config/config_files/setupLocalhost.mjs
@@ -129,6 +129,7 @@ async function startLocalHost() {
   await runTask({
     command: execShell('bun run generate'),
     name: chalk.hex('#CCE0E8')('Running bun run generate'),
+    ignoreStdErr: true
   });
 
   console.log(

diff --git a/eslint.config.js b/eslint.config.js
@@ -38,6 +38,13 @@ export default [
         'error',
         { checksVoidReturn: false },
       ],
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          varsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+        },
+      ],
       'simple-import-sort/imports': [
         'error',
         {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/amplify-component-lib",
-  "version": "8.19.0",
+  "version": "9.0.0",
   "description": "Frontend Typescript components for the Amplify team",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,60 +48,60 @@
     ]
   },
   "dependencies": {
-    "@azure/msal-browser": "3.27.0",
+    "@azure/msal-browser": "3.28.0",
     "@azure/msal-react": "2.2.0",
-    "@equinor/eds-core-react": "0.42.3",
-    "@equinor/eds-data-grid-react": "^0.7.3",
+    "@equinor/eds-core-react": "0.42.5",
+    "@equinor/eds-data-grid-react": "^0.7.4",
     "@microsoft/signalr": "^8.0.7",
-    "@tiptap/core": "^2.9.1",
-    "@tiptap/extension-bold": "^2.9.1",
-    "@tiptap/extension-bullet-list": "^2.9.1",
-    "@tiptap/extension-code-block": "^2.9.1",
-    "@tiptap/extension-code-block-lowlight": "^2.9.1",
-    "@tiptap/extension-color": "^2.9.1",
-    "@tiptap/extension-document": "^2.9.1",
-    "@tiptap/extension-dropcursor": "^2.9.1",
-    "@tiptap/extension-gapcursor": "^2.9.1",
-    "@tiptap/extension-hard-break": "^2.9.1",
-    "@tiptap/extension-heading": "^2.9.1",
-    "@tiptap/extension-highlight": "^2.9.1",
-    "@tiptap/extension-history": "^2.9.1",
-    "@tiptap/extension-image": "^2.9.1",
-    "@tiptap/extension-italic": "^2.9.1",
-    "@tiptap/extension-link": "^2.9.1",
-    "@tiptap/extension-list-item": "^2.9.1",
-    "@tiptap/extension-ordered-list": "^2.9.1",
-    "@tiptap/extension-paragraph": "^2.9.1",
-    "@tiptap/extension-placeholder": "^2.9.1",
-    "@tiptap/extension-table": "^2.9.1",
-    "@tiptap/extension-table-cell": "^2.9.1",
-    "@tiptap/extension-table-header": "^2.9.1",
-    "@tiptap/extension-table-row": "^2.9.1",
-    "@tiptap/extension-text": "^2.9.1",
-    "@tiptap/extension-text-align": "^2.9.1",
-    "@tiptap/extension-text-style": "^2.9.1",
-    "@tiptap/extension-typography": "^2.9.1",
-    "@tiptap/pm": "^2.9.1",
-    "@tiptap/react": "^2.9.1",
-    "framer-motion": "^11.11.15",
+    "@tiptap/core": "^2.11.2",
+    "@tiptap/extension-bold": "^2.11.2",
+    "@tiptap/extension-bullet-list": "^2.11.2",
+    "@tiptap/extension-code-block": "^2.11.2",
+    "@tiptap/extension-code-block-lowlight": "^2.11.2",
+    "@tiptap/extension-color": "^2.11.2",
+    "@tiptap/extension-document": "^2.11.2",
+    "@tiptap/extension-dropcursor": "^2.11.2",
+    "@tiptap/extension-gapcursor": "^2.11.2",
+    "@tiptap/extension-hard-break": "^2.11.2",
+    "@tiptap/extension-heading": "^2.11.2",
+    "@tiptap/extension-highlight": "^2.11.2",
+    "@tiptap/extension-history": "^2.11.2",
+    "@tiptap/extension-image": "^2.11.2",
+    "@tiptap/extension-italic": "^2.11.2",
+    "@tiptap/extension-link": "^2.11.2",
+    "@tiptap/extension-list-item": "^2.11.2",
+    "@tiptap/extension-ordered-list": "^2.11.2",
+    "@tiptap/extension-paragraph": "^2.11.2",
+    "@tiptap/extension-placeholder": "^2.11.2",
+    "@tiptap/extension-table": "^2.11.2",
+    "@tiptap/extension-table-cell": "^2.11.2",
+    "@tiptap/extension-table-header": "^2.11.2",
+    "@tiptap/extension-table-row": "^2.11.2",
+    "@tiptap/extension-text": "^2.11.2",
+    "@tiptap/extension-text-align": "^2.11.2",
+    "@tiptap/extension-text-style": "^2.11.2",
+    "@tiptap/extension-typography": "^2.11.2",
+    "@tiptap/pm": "^2.11.2",
+    "@tiptap/react": "^2.11.2",
+    "framer-motion": "^11.17.0",
     "html2canvas": "^1.4.1",
     "jwt-decode": "^4.0.0",
-    "lowlight": "^3.1.0",
-    "proj4": "^2.14.0",
+    "lowlight": "^3.3.0",
+    "proj4": "^2.15.0",
     "react-dropzone": "^14.3.5",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "^9.0.3",
     "rehype-raw": "^7.0.0",
-    "styled-components": "^6.1.13"
+    "styled-components": "^6.1.14"
   },
   "devDependencies": {
-    "@equinor/eds-icons": "^0.21.0",
-    "@equinor/subsurface-app-management": "^1.1.20",
-    "@eslint/js": "^9.14.0",
-    "@faker-js/faker": "^9.2.0",
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@equinor/eds-icons": "^0.22.0",
+    "@equinor/subsurface-app-management": "^2.2.0",
+    "@eslint/js": "^9.18.0",
+    "@faker-js/faker": "^9.3.0",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.1",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@storybook/addon-actions": "^8.4.7",
     "@storybook/addon-designs": "^8.0.4",
     "@storybook/addon-docs": "^8.4.7",
@@ -114,15 +114,15 @@
     "@storybook/preview-api": "^8.4.7",
     "@storybook/react": "^8.4.7",
     "@storybook/react-vite": "^8.4.7",
-    "@tanstack/react-query": "^5.59.15",
+    "@tanstack/react-query": "^5.64.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.0.1",
+    "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/mocha": "^10.0.9",
-    "@types/node": "^22.9.0",
-    "@types/proj4": "^2.5.5",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.10.6",
+    "@types/proj4": "^2.5.6",
     "@types/random-seed": "^0.3.5",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
@@ -133,36 +133,35 @@
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/browser": "^2.1.8",
     "@vitest/coverage-v8": "^2.1.8",
-    "eslint": "^9.14.0",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint": "^9.18.0",
+    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-storybook": "^0.11.0",
+    "eslint-plugin-storybook": "^0.11.2",
     "jest-environment-jsdom": "^29.7.0",
     "jest-styled-components": "^7.2.0",
-    "msw": "^2.6.8",
+    "msw": "^2.7.0",
     "msw-storybook-addon": "^2.0.4",
-    "ora": "^8.1.0",
+    "ora": "^8.1.1",
     "playwright": "^1.49.1",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router": "^6.28.0",
     "react-router-dom": "^6.28.0",
     "resize-observer-polyfill": "^1.5.1",
-    "resolve-tspaths": "^0.8.22",
-    "rollup": "^4.26.0",
+    "resolve-tspaths": "^0.8.23",
+    "rollup": "^4.30.1",
     "rollup-plugin-delete": "^2.1.0",
-    "rollup-plugin-import-css": "^3.5.6",
+    "rollup-plugin-import-css": "^3.5.8",
     "storybook": "^8.4.7",
-    "storybook-addon-data-theme-switcher": "^0.4.2",
-    "storybook-addon-remix-react-router": "^3.0.2",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.14.0",
-    "uuid": "^11.0.3",
-    "vite": "^5.4.11",
+    "storybook-addon-data-theme-switcher": "^1.0.0",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0",
+    "uuid": "^11.0.5",
+    "vite": "^6.0.7",
     "vite-plugin-svgr": "^4.3.0",
-    "vite-tsconfig-paths": "^5.1.2",
+    "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^2.1.8"
   },
   "resolutions": {
@@ -171,12 +170,12 @@
   },
   "peerDependencies": {
     "@equinor/eds-icons": "*",
-    "@equinor/subsurface-app-management": "^1.1.8",
+    "@equinor/subsurface-app-management": "^2.2.0",
     "@tanstack/react-query": "*",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router": "^6.11.1",
-    "react-router-dom": "^6.11.1"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router": "^6.28.0",
+    "react-router-dom": "^6.28.0"
   },
   "msw": {
     "workerDirectory": [

diff --git a/src/atoms/types/SideBar.ts b/src/atoms/types/SideBar.ts
@@ -6,4 +6,5 @@ export interface SideBarMenuItem {
   link: string;
   onClick?: () => void;
   replace?: boolean;
+  featureUuid?: string;
 }
diff --git a/src/atoms/utils/errors.stories.tsx b/src/atoms/utils/errors.stories.tsx
diff --git a/src/atoms/utils/errors.test.tsx b/src/atoms/utils/errors.test.tsx