refactor: move legacyAppLoader files and configurations

equinor · Oct 14, 2024 · b28ec81 · b28ec81
1 parent 3eb5cd4
commit b28ec81
Show file tree

Hide file tree

Showing 42 changed files with 13 additions and 3 deletions.
diff --git a/legacyAppLoader/.gitignore → client/apps/legacyAppLoader/.gitignore b/legacyAppLoader/.gitignore → client/apps/legacyAppLoader/.gitignore
diff --git a/legacyAppLoader/README.md → client/apps/legacyAppLoader/README.md b/legacyAppLoader/README.md → client/apps/legacyAppLoader/README.md
diff --git a/legacyAppLoader/app.config.ts → client/apps/legacyAppLoader/app.config.ts b/legacyAppLoader/app.config.ts → client/apps/legacyAppLoader/app.config.ts
diff --git a/legacyAppLoader/app.manifest.config.ts → ...ps/legacyAppLoader/app.manifest.config.ts b/legacyAppLoader/app.manifest.config.ts → ...ps/legacyAppLoader/app.manifest.config.ts
diff --git a/legacyAppLoader/package.json → client/apps/legacyAppLoader/package.json b/legacyAppLoader/package.json → client/apps/legacyAppLoader/package.json
@@ -5,8 +5,8 @@
   "type": "module",
   "main": "src/index.ts",
   "scripts": {
-    "prebuild": "rm -f ../client/packages/portal-client/src/assets/appLegacyLoader.js",
-    "build:appLoader": "fusion-framework-cli app build && mv ./dist/app-bundle.js ../client/packages/portal-client/src/assets/appLegacyLoader.js",
+    "prebuild": "rm -f ../../packages/portal-client/src/assets/appLegacyLoader.js",
+    "build:appLoader": "fusion-framework-cli app build && mv ./dist/app-bundle.js ../../packages/portal-client/src/assets/appLegacyLoader.js",
     "build:resources": "tsc && vite build",
     "dev:appLoader": "fusion-framework-cli app dev -c vite.config.js",
     "docker": "cd .. && sh docker-script.sh app-react",
@@ -45,4 +45,4 @@
     "@types/react-router-dom": "^5.3.3",
     "vite-plugin-static-copy": "^0.17.0"
   }
-}
+}
diff --git a/legacyAppLoader/src/App.tsx → client/apps/legacyAppLoader/src/App.tsx b/legacyAppLoader/src/App.tsx → client/apps/legacyAppLoader/src/App.tsx
diff --git a/...pLoader/src/app-loader/components/App.tsx → ...pLoader/src/app-loader/components/App.tsx b/...pLoader/src/app-loader/components/App.tsx → ...pLoader/src/app-loader/components/App.tsx
diff --git a/...app-loader/components/AppModuleLoader.tsx → ...app-loader/components/AppModuleLoader.tsx b/...app-loader/components/AppModuleLoader.tsx → ...app-loader/components/AppModuleLoader.tsx
diff --git a/...app-loader/components/LegacyAppLoader.tsx → ...app-loader/components/LegacyAppLoader.tsx b/...app-loader/components/LegacyAppLoader.tsx → ...app-loader/components/LegacyAppLoader.tsx
diff --git a/...pp-loader/components/LegacyAppWrapper.tsx → ...pp-loader/components/LegacyAppWrapper.tsx b/...pp-loader/components/LegacyAppWrapper.tsx → ...pp-loader/components/LegacyAppWrapper.tsx
diff --git a/...c/app-loader/components/LegacyWrapper.tsx → ...c/app-loader/components/LegacyWrapper.tsx b/...c/app-loader/components/LegacyWrapper.tsx → ...c/app-loader/components/LegacyWrapper.tsx
diff --git a/...src/app-loader/components/MessagePage.tsx → ...src/app-loader/components/MessagePage.tsx b/...src/app-loader/components/MessagePage.tsx → ...src/app-loader/components/MessagePage.tsx
diff --git a/.../app-loader/components/ProgressLoader.tsx → .../app-loader/components/ProgressLoader.tsx b/.../app-loader/components/ProgressLoader.tsx → .../app-loader/components/ProgressLoader.tsx
diff --git a/...Loader/src/app-loader/components/index.ts → ...Loader/src/app-loader/components/index.ts b/...Loader/src/app-loader/components/index.ts → ...Loader/src/app-loader/components/index.ts
diff --git a/legacyAppLoader/src/app-loader/index.ts → ...s/legacyAppLoader/src/app-loader/index.ts b/legacyAppLoader/src/app-loader/index.ts → ...s/legacyAppLoader/src/app-loader/index.ts
diff --git a/...der/legacy-interopt/LegacyAppContainer.ts → ...der/legacy-interopt/LegacyAppContainer.ts b/...der/legacy-interopt/LegacyAppContainer.ts → ...der/legacy-interopt/LegacyAppContainer.ts
diff --git a/...er/legacy-interopt/LegacyAuthContainer.ts → ...er/legacy-interopt/LegacyAuthContainer.ts b/...er/legacy-interopt/LegacyAuthContainer.ts → ...er/legacy-interopt/LegacyAuthContainer.ts
diff --git a/...-loader/legacy-interopt/LegacyAuthUser.ts → ...-loader/legacy-interopt/LegacyAuthUser.ts b/...-loader/legacy-interopt/LegacyAuthUser.ts → ...-loader/legacy-interopt/LegacyAuthUser.ts
diff --git a/...r/legacy-interopt/LegacyContextManager.ts → ...r/legacy-interopt/LegacyContextManager.ts b/...r/legacy-interopt/LegacyContextManager.ts → ...r/legacy-interopt/LegacyContextManager.ts
diff --git a/...teropt/components/LegacyFusionWrapper.tsx → ...teropt/components/LegacyFusionWrapper.tsx b/...teropt/components/LegacyFusionWrapper.tsx → ...teropt/components/LegacyFusionWrapper.tsx
diff --git a/...nents/create-legacy-context-component.tsx → ...nents/create-legacy-context-component.tsx b/...nents/create-legacy-context-component.tsx → ...nents/create-legacy-context-component.tsx
diff --git a/...oader/legacy-interopt/components/index.ts → ...oader/legacy-interopt/components/index.ts b/...oader/legacy-interopt/components/index.ts → ...oader/legacy-interopt/components/index.ts
diff --git a/.../legacy-interopt/create-fusion-context.ts → .../legacy-interopt/create-fusion-context.ts b/.../legacy-interopt/create-fusion-context.ts → .../legacy-interopt/create-fusion-context.ts
diff --git a/.../legacy-interopt/create-legacy-render.tsx → .../legacy-interopt/create-legacy-render.tsx b/.../legacy-interopt/create-legacy-render.tsx → .../legacy-interopt/create-legacy-render.tsx
diff --git a/...egacy-interopt/create-service-resolver.ts → ...egacy-interopt/create-service-resolver.ts b/...egacy-interopt/create-service-resolver.ts → ...egacy-interopt/create-service-resolver.ts
diff --git a/...r/src/app-loader/legacy-interopt/index.ts → ...r/src/app-loader/legacy-interopt/index.ts b/...r/src/app-loader/legacy-interopt/index.ts → ...r/src/app-loader/legacy-interopt/index.ts
diff --git a/...ader/legacy-interopt/legacy-api-signin.ts → ...ader/legacy-interopt/legacy-api-signin.ts b/...ader/legacy-interopt/legacy-api-signin.ts → ...ader/legacy-interopt/legacy-api-signin.ts
diff --git a/.../src/app-loader/legacy-interopt/static.ts → .../src/app-loader/legacy-interopt/static.ts b/.../src/app-loader/legacy-interopt/static.ts → .../src/app-loader/legacy-interopt/static.ts
diff --git a/...r/src/app-loader/legacy-interopt/types.ts → ...r/src/app-loader/legacy-interopt/types.ts b/...r/src/app-loader/legacy-interopt/types.ts → ...r/src/app-loader/legacy-interopt/types.ts
diff --git a/legacyAppLoader/src/app-loader/styles.ts → .../legacyAppLoader/src/app-loader/styles.ts b/legacyAppLoader/src/app-loader/styles.ts → .../legacyAppLoader/src/app-loader/styles.ts
diff --git a/...ppLoader/src/app-loader/uss-app-module.ts → ...ppLoader/src/app-loader/uss-app-module.ts b/...ppLoader/src/app-loader/uss-app-module.ts → ...ppLoader/src/app-loader/uss-app-module.ts
diff --git a/legacyAppLoader/src/config.ts → client/apps/legacyAppLoader/src/config.ts b/legacyAppLoader/src/config.ts → client/apps/legacyAppLoader/src/config.ts
diff --git a/...app-loader/components/LegacyAppLoader.tsx → ...app-loader/components/LegacyAppLoader.tsx b/...app-loader/components/LegacyAppLoader.tsx → ...app-loader/components/LegacyAppLoader.tsx
diff --git a/...pp-loader/components/LegacyAppWrapper.tsx → ...pp-loader/components/LegacyAppWrapper.tsx b/...pp-loader/components/LegacyAppWrapper.tsx → ...pp-loader/components/LegacyAppWrapper.tsx
diff --git a/...n-app-loader/components/LegacyWrapper.tsx → ...n-app-loader/components/LegacyWrapper.tsx b/...n-app-loader/components/LegacyWrapper.tsx → ...n-app-loader/components/LegacyWrapper.tsx
diff --git a/legacyAppLoader/src/globalResources.ts → ...ps/legacyAppLoader/src/globalResources.ts b/legacyAppLoader/src/globalResources.ts → ...ps/legacyAppLoader/src/globalResources.ts
diff --git a/legacyAppLoader/src/index.ts → client/apps/legacyAppLoader/src/index.ts b/legacyAppLoader/src/index.ts → client/apps/legacyAppLoader/src/index.ts
diff --git a/legacyAppLoader/tsconfig.json → client/apps/legacyAppLoader/tsconfig.json b/legacyAppLoader/tsconfig.json → client/apps/legacyAppLoader/tsconfig.json
diff --git a/legacyAppLoader/vite.config.js → client/apps/legacyAppLoader/vite.config.js b/legacyAppLoader/vite.config.js → client/apps/legacyAppLoader/vite.config.js
diff --git a/legacyAppLoader/yarn.lock → client/apps/legacyAppLoader/yarn.lock b/legacyAppLoader/yarn.lock → client/apps/legacyAppLoader/yarn.lock
diff --git a/client/package.json b/client/package.json
@@ -7,6 +7,7 @@
     "start": "npx lerna run serve",
     "build": "npx lerna run build",
     "build:apps": "npx lerna run build:apps",
+    "build:appLoader": "npx lerna run build:appLoader",
     "test:all": "test:coverage && build:coverage",
     "test": "lerna  run test",
     "test:coverage": "lerna run test:coverage",

diff --git a/clientBackend.Dockerfile b/clientBackend.Dockerfile
@@ -9,13 +9,22 @@ WORKDIR /app-client
 
 COPY ["/client", "."]
 
+WORKDIR  /app-client/apps/legacyAppLoader
+
+RUN yarn install --frozen-lockfile
+RUN yarn run build:appLoader
+
+WORKDIR /app-client
+
 RUN yarn install --frozen-lockfile
 
 # Build the leagasy app laoder
 RUN cd apps/fusion-app-loader && yarn install --frozen-lockfile && yarn build:appLoader
 
 RUN npx yarn run build
 
+
+
 # 2: Build & run web server
 # ----------------------------------------------------