Fix docker build and replace REACT_APP with VITE_APP #1379

Dockerfile

@@ -29,7 +29,7 @@ FROM httpd:2.4-alpine3.15
 WORKDIR /usr/local/apache2/htdocs
 
 # Put the output of the build into an apache server
-COPY --from=builder /scigateway-build/build/. .
+COPY --from=builder /scigateway-build/dist/. .
 
 RUN set -eux; \
     \

package.json

@@ -58,7 +58,6 @@
   },
   "scripts": {
     "dev": "cross-env concurrently \"yarn serve:plugins\" \"node server/auth-server.js\" \"vite --open\"",
-    "dev-without-open": "vite",
     "build": "tsc --project tsconfig.build.json && vite build",
     "preview": "vite preview",
     "preview:build": "yarn build && yarn preview",
@@ -137,4 +136,4 @@
     "wait-on": "7.2.0"
   },
   "packageManager": "[email protected]"
-}
+}

src/i18n.ts

@@ -3,8 +3,8 @@ import Backend from 'i18next-http-backend';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import { initReactI18next } from 'react-i18next';
 
-const loadPath = process.env.REACT_APP_SCIGATEWAY_BUILD_DIRECTORY
-  ? process.env.REACT_APP_SCIGATEWAY_BUILD_DIRECTORY + 'res/default.json'
+const loadPath = process.env.VITE_APP_SCIGATEWAY_BUILD_DIRECTORY
+  ? process.env.VITE_APP_SCIGATEWAY_BUILD_DIRECTORY + 'res/default.json'
   : '/res/default.json';
 
 i18n

vite.config.ts

@@ -21,7 +21,7 @@ function jsonHMR(): PluginOption {
 }
 
 // https://vitejs.dev/config/
-export default defineConfig(({ command, mode }) => {
+export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), '');
 
   const plugins: PluginOption[] = [react()];
@@ -45,9 +45,8 @@ export default defineConfig(({ command, mode }) => {
       'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV),
     },
     test: {
-      globals: 'true',
+      globals: true,
       environment: 'jsdom',
-      // globalSetup: './globalSetup.js',
       setupFiles: ['src/setupTests.ts'],
       coverage: {
         exclude: [
@@ -56,6 +55,7 @@ export default defineConfig(({ command, mode }) => {
           '__mocks__/axios.ts',
           'micro-frontend-tools/serve-plugins.js',
           '.eslintrc.cjs',
+          'src/vite-env.d.ts',
           'src/main.tsx',
         ],
       },