revert ui5 bump, bump vitest, add awaits

kyma-project · Oct 11, 2024 · 2be1eb9 · 2be1eb9
1 parent dcd5af0
commit 2be1eb9
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 192 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,12 +62,12 @@
     "@types/jsonpath": "^0.2.0",
     "@types/pluralize": "^0.0.29",
     "@ui-schema/ui-schema": "^0.4.5",
-    "@ui5/webcomponents": "^1.24.1",
-    "@ui5/webcomponents-base": "^1.24.1",
-    "@ui5/webcomponents-fiori": "^1.24.1",
-    "@ui5/webcomponents-icons": "^1.24.1",
-    "@ui5/webcomponents-icons-tnt": "^1.24.1",
-    "@ui5/webcomponents-react": "^1.28.2",
+    "@ui5/webcomponents": "^1.24.0",
+    "@ui5/webcomponents-base": "^1.24.0",
+    "@ui5/webcomponents-fiori": "^1.24.0",
+    "@ui5/webcomponents-icons": "^1.24.0",
+    "@ui5/webcomponents-icons-tnt": "^1.24.0",
+    "@ui5/webcomponents-react": "~1.28.1",
     "@ui5/webcomponents-react-base": "^1.28.1",
     "@ui5/webcomponents-react-charts": "^1.28.1",
     "classnames": "^2.2.6",
@@ -139,7 +139,7 @@
     "vite-plugin-static-copy": "^1.0.6",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^5.0.1",
-    "vitest": "^2.1.1"
+    "vitest": "^2.1.2"
   },
   "lint-staged": {
     "src/i18n/*.yaml": "yaml-sort --lineWidth=-1 -i ",

diff --git a/src/components/Extensibility/components/tests/ResourceLink.test.js b/src/components/Extensibility/components/tests/ResourceLink.test.js
@@ -1,8 +1,8 @@
 import { render } from 'testing/reactTestingUtils';
 import { ResourceLink } from '../ResourceLink';
 
-vi.mock('react-router', () => ({
-  ...vi.importActual('react-router'),
+vi.mock('react-router', async () => ({
+  ...(await vi.importActual('react-router')),
   useMatch: () => {
     return {
       params: {

diff --git a/src/components/Extensibility/tests/useGetCRDByPath.test.js b/src/components/Extensibility/tests/useGetCRDByPath.test.js
@@ -6,8 +6,8 @@ import { RecoilRoot } from 'recoil';
 let mockNamespaceId = 'namespaceId';
 let mockCrds = [];
 
-vi.mock('react-router-dom', () => ({
-  ...vi.importActual('react-router-dom'),
+vi.mock('react-router-dom', async () => ({
+  ...(await vi.importActual('react-router-dom')),
   useParams: () => ({
     namespaceId: mockNamespaceId,
   }),

diff --git a/src/components/HelmReleases/tests/HelmReleaseData.test.js b/src/components/HelmReleases/tests/HelmReleaseData.test.js
@@ -7,7 +7,7 @@ vi.mock('components/HelmReleases/decodeHelmRelease', () => ({
   decodeHelmRelease: release => mockDecodeHelmRelease(release),
 }));
 
-const originalDecodeHelmRelease = vi.importActual(
+const originalDecodeHelmRelease = await vi.importActual(
   'components/HelmReleases/decodeHelmRelease',
 );
 

diff --git a/src/shared/components/ControlledBy/test/ControlledBy.test.js b/src/shared/components/ControlledBy/test/ControlledBy.test.js
@@ -1,8 +1,8 @@
 import { render } from 'testing/reactTestingUtils';
 import { ControlledBy } from '../ControlledBy';
 
-vi.mock('react-router', () => ({
-  ...vi.importActual('react-router'),
+vi.mock('react-router', async () => ({
+  ...(await vi.importActual('react-router')),
   useMatch: () => ({
     params: {
       cluster: 'test-cluster',

diff --git a/src/shared/components/__mocks__/popper.js.js b/src/shared/components/__mocks__/popper.js.js
@@ -1,4 +1,4 @@
-const PopperJS = vi.importActual('popper.js');
+const PopperJS = await vi.importActual('popper.js');
 
 /* eslint-disable import/no-anonymous-default-export */
 export default class {

diff --git a/vitest.config.js b/vitest.config.js
@@ -10,6 +10,7 @@ export default mergeConfig(
       plugins: [viteTsconfigPaths()],
       globals: true, // Enable globals for Vitest
       setupFiles: ['./src/setupTests.js'],
+      fileParallelism: false,
     },
   }),
 );