🚚 Moving TutorialProvider to ACL since EDS dependency here was causin…

…g issues
equinor · Jul 17, 2024 · 973fd7e · 973fd7e
1 parent f701c29
commit 973fd7e
Show file tree

Hide file tree

Showing 19 changed files with 181 additions and 1,848 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "test:coverage": "vitest run --coverage",
     "setup-husky": "husky install",
     "precommit": "npx lint-staged",
-    "build": "rollup -c && tsc --project tsconfig.build.json && resolve-tspaths --project tsconfig.build.json",
+    "build": "rollup -c --bundleConfigAsCjs && tsc --project tsconfig.build.json && resolve-tspaths --project tsconfig.build.json",
     "build:ci": "rm -rf lib dist && npm run build-components",
     "build-and-use": "node tooling/build-and-use.mjs",
     "brute-coverage": "node tooling/brute-coverage.mjs"
@@ -51,7 +51,9 @@
     "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
+    "@equinor/eds-core-react": "^0.40.1",
     "@equinor/eds-icons": "^0.21.0",
+    "@equinor/eds-tokens": "^0.9.2",
     "@faker-js/faker": "^8.4.1",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -113,8 +115,6 @@
     "vitest": "^1.2.2"
   },
   "peerDependencies": {
-    "@equinor/eds-core-react": "*",
-    "@equinor/eds-icons": "*",
     "@tanstack/react-query": "*",
     "framer-motion": "*",
     "react": "^18.2.0",

diff --git a/src/api/core/OpenAPI.ts b/src/api/core/OpenAPI.ts
@@ -14,7 +14,7 @@ type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 type Headers = Record<string, string>;
 
 const environmentName = getEnvironmentName(
-  import.meta.env.VITE_ENVIRONMENT_NAME
+  import.meta.env?.VITE_ENVIRONMENT_NAME
 );
 const noLocalhostEnvironmentName =
   environmentName === 'localhost' ? 'development' : environmentName;
@@ -98,7 +98,7 @@ const getPortalProdToken = async () => {
 };
 
 export const OpenAPI_SAM: OpenAPIConfig = {
-  BASE: getApiUrl(import.meta.env.VITE_API_URL),
+  BASE: getApiUrl(import.meta.env?.VITE_API_URL),
   VERSION: '1.0',
   WITH_CREDENTIALS: false,
   CREDENTIALS: 'include',

diff --git a/src/hooks/useReleaseNotesQuery.ts b/src/hooks/useReleaseNotesQuery.ts
@@ -13,7 +13,7 @@ interface ReleaseNotesQueryProps {
 
 export function useReleaseNotesQuery(options?: ReleaseNotesQueryProps) {
   const applicationName =
-    options?.overrideAppName ?? getAppName(import.meta.env.VITE_NAME);
+    options?.overrideAppName ?? getAppName(import.meta.env?.VITE_NAME);
 
   return useQuery<ReleaseNote[]>({
     queryKey: ['get-all-release-notes'],

diff --git a/src/providers/FeatureToggleProvider.tsx b/src/providers/FeatureToggleProvider.tsx
@@ -55,10 +55,10 @@ export const FeatureToggleProvider: FC<FeatureToggleProviderProps> = ({
   overrideEnvironment,
 }) => {
   const applicationName =
-    overrideAppName ?? getAppName(import.meta.env.VITE_NAME);
+    overrideAppName ?? getAppName(import.meta.env?.VITE_NAME);
   const environmentName =
     overrideEnvironment ??
-    getEnvironmentName(import.meta.env.VITE_ENVIRONMENT_NAME);
+    getEnvironmentName(import.meta.env?.VITE_ENVIRONMENT_NAME);
 
   const {
     data: featureToggle,

diff --git a/src/providers/TutorialProvider/TutorialDialog.tsx b/src/providers/TutorialProvider/TutorialDialog.tsx
diff --git a/src/providers/TutorialProvider/TutorialProvider.const.ts b/src/providers/TutorialProvider/TutorialProvider.const.ts
diff --git a/src/providers/TutorialProvider/TutorialProvider.hooks.ts b/src/providers/TutorialProvider/TutorialProvider.hooks.ts