Migrate from CRA to Vite #1379

.eslintrc.js → .eslintrc.cjs

@@ -1,23 +1,39 @@
 module.exports = {
   parser: '@typescript-eslint/parser',
+  parserOptions: {
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
   env: {
     browser: true,
-    jest: true,
     es6: true,
     node: true,
   },
+  settings: {
+    react: {
+      version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
+    },
+  },
+  plugins: [
+    'react',
+    'react-hooks',
+    '@typescript-eslint',
+    'cypress',
+    'prettier',
+  ],
   extends: [
-    'react-app',
+    'eslint:recommended',
     'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:@typescript-eslint/stylistic',
-    'prettier',
     'plugin:cypress/recommended',
+    'prettier',
   ],
-  plugins: ['prettier', 'cypress'],
   rules: {
-    'react/jsx-filename-extension': 'off',
-    'jsx-a11y/click-events-have-key-events': 'off',
+    'react/react-in-jsx-scope': 'off',
     'prettier/prettier': [
       'error',
       {
@@ -26,34 +42,25 @@ module.exports = {
         endOfLine: 'auto',
       },
     ],
-    // disable for all files - this means we can have plain JS files not causing errors
-    '@typescript-eslint/explicit-function-return-type': 'off',
+    // Emulate typescript style for unused variables, see
+    // https://typescript-eslint.io/rules/no-unused-vars/
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {
+        args: 'all',
+        argsIgnorePattern: '^_',
+        caughtErrors: 'all',
+        caughtErrorsIgnorePattern: '^_',
+        destructuredArrayIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+        ignoreRestSiblings: true,
+      },
+    ],
   },
   overrides: [
     {
-      // and enable again specifically for TS files
-      files: ['*.ts', '*.tsx'],
-      rules: {
-        '@typescript-eslint/explicit-function-return-type': [
-          'error',
-          {
-            allowExpressions: true,
-            allowTypedFunctionExpressions: true,
-          },
-        ],
-      },
+      files: ['**/?*test.*'],
+      extends: ['plugin:testing-library/react'],
     },
   ],
-  parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-    },
-    allowImportExportEverywhere: true,
-    sourceType: 'module',
-  },
-  settings: {
-    react: {
-      version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
-    },
-  },
 };

.github/workflows/ci-build.yml

@@ -25,7 +25,7 @@ jobs:
           sudo apt-get install libgconf-2-4
           yarn --immutable
       - name: Run linting
-        run: yarn lint:js
+        run: yarn lint
       - name: Run unit tests
         run: yarn test
       - name: Upload unit test coverage

.gitignore

@@ -18,7 +18,7 @@
 /coverage
 
 # production
-/build
+dist
 
 # misc
 .DS_Store

Dockerfile

@@ -29,7 +29,7 @@ FROM httpd:2.4.62-alpine3.20@sha256:66c49302c02430619abb84240a438bcfc08301566100
 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; \
     \

README.md

@@ -8,47 +8,38 @@ The SciGateway application offers features such as authentication and authorisat
 
 ## Code details
 
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+This project uses [Vite](https://vitejs.dev/).
 
 #### Available Scripts
 
 In the project directory, you can run:
 
-#### `yarn start`
+### `yarn dev`
 
-Runs the app in the development mode.<br>
+Runs the `dev` script, which runs the app in development mode.
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 
-The page will reload if you make edits.<br>
-You will also see any lint errors in the console.
+### `yarn test`
 
-#### `yarn test`
+Runs unit tests
 
-Launches the test runner in the interactive watch mode.<br>
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+### `yarn e2e`
 
-#### `yarn build`
+Runs e2e tests
 
-Builds the app for production to the `build` folder.<br>
-It correctly bundles React in production mode and optimizes the build for the best performance.
+### `yarn lint`
 
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-#### `yarn eject`
+Lints all code under /src
 
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+### `yarn build`
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+Builds the app for production to the `dist` folder.
 
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+The build is minified and the filenames include the hashes.
+Your app is ready to be deployed!
 
-### Learn More
+See the section about [building for production](https://vitejs.dev/guide/build.html) for more information.
 
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+### `yarn preview`
 
-To learn React, check out the [React documentation](https://reactjs.org/).
+Deploys a static version of the build from the `dist` directory to port 5001. Use `yarn preview:build` to build and preview it in SciGateway.

__mocks__/axios.ts

@@ -0,0 +1,21 @@
+const requests = {
+  get: vi.fn((path) => {
+    if (path === '/settings.json') {
+      return Promise.resolve({
+        data: {
+          'auth-provider': 'jwt',
+          'ui-strings': '/res/default.json',
+          plugins: [],
+          'help-tour-steps': [],
+        },
+      });
+    } else {
+      return Promise.resolve({
+        data: {},
+      });
+    }
+  }),
+  post: vi.fn(() => Promise.resolve({ data: {} })),
+};
+
+export default requests;

cypress.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from 'cypress'
+import { defineConfig } from 'cypress';
 
 export default defineConfig({
   chromeWebSecurity: false,
@@ -8,11 +8,6 @@ export default defineConfig({
     openMode: 0,
   },
   e2e: {
-    setupNodeEvents(on, config) {
-      on('task', {
-        failed: require('cypress-failed-log/src/failed')(),
-      })
-    },
     baseUrl: 'http://127.0.0.1:3000',
   },
-})
+});

cypress/support/e2e.js

@@ -18,5 +18,3 @@ import './commands';
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
-
-require('cypress-failed-log');

index.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="shortcut icon" href="/favicon.ico?v=2" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+  <meta name="theme-color" content="#000000" />
+  <!--
+        manifest.json provides metadata used when your web app is installed on a
+        user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+      -->
+  <link rel="manifest" href="/manifest.json" />
+  <title>SciGateway</title>
+</head>
+
+<body>
+  <script crossorigin src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
+  <script>
+    window.React ||
+      document.write('<script src="/react.production.min.js">\x3C/script>');
+  </script>
+  <script crossorigin src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
+  <script>
+    window.ReactDOM ||
+      document.write(
+        '<script src="/react-dom.production.min.js">\x3C/script>'
+      );
+  </script>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="scigateway"></div>
+  <script type="module" src="/src/main.tsx"></script>
+</body>
+
+</html>

micro-frontend-tools/serve-plugins.js

@@ -1,8 +1,13 @@
-var fs = require('fs');
-const path = require('path');
-var exec = require('child_process').exec;
+import fs from 'fs';
+import path from 'path';
+import child_process from 'child_process';
 
-const settingsFilePath = path.join(__dirname, '/dev-plugin-settings.json');
+var exec = child_process.exec;
+
+const settingsFilePath = path.join(
+  import.meta.dirname,
+  '/dev-plugin-settings.json'
+);
 
 function checkForSettingsFile() {
   if (!fs.existsSync(settingsFilePath)) {