Merge pull request #280 from sanger/develop

DPL-890-2 Replace webpack with vite(to merge develop into master)
sanger · Dec 5, 2023 · 1ef8f57 · 1ef8f57
2 parents c3bf0b8 + 344d4b4
commit 1ef8f57
Show file tree

Hide file tree

Showing 44 changed files with 11,515 additions and 21,157 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_SEQUENCESCAPE_BASE_URL=http://localhost:3000/api/v2
-VUE_APP_SEQUENCESCAPE_API_KEY=development
-VUE_APP_PRINT_MY_BARCODE_BASE_URL=http://localhost:3000
-VUE_APP_LABEL_TEMPLATE_ID=33
+VITE_SEQUENCESCAPE_BASE_URL=http://localhost:3000/api/v2
+VITE_SEQUENCESCAPE_API_KEY=development
+VITE_PRINT_MY_BARCODE_BASE_URL=http://localhost:3000
+VITE_LABEL_TEMPLATE_ID=33
diff --git a/.env.production b/.env.production
@@ -1,4 +1,4 @@
-VUE_APP_SEQUENCESCAPE_BASE_URL=REPLACE_VUE_APP_SEQUENCESCAPE_BASE_URL
-VUE_APP_SEQUENCESCAPE_API_KEY=REPLACE_VUE_APP_SEQUENCESCAPE_API_KEY
-VUE_APP_PRINT_MY_BARCODE_BASE_URL=REPLACE_VUE_APP_PRINT_MY_BARCODE_BASE_URL
-VUE_APP_LABEL_TEMPLATE_ID=REPLACE_VUE_APP_LABEL_TEMPLATE_ID
+VITE_SEQUENCESCAPE_BASE_URL=REPLACE_VITE_SEQUENCESCAPE_BASE_URL
+VITE_SEQUENCESCAPE_API_KEY=REPLACE_VITE_SEQUENCESCAPE_API_KEY
+VITE_PRINT_MY_BARCODE_BASE_URL=REPLACE_VITE_PRINT_MY_BARCODE_BASE_URL
+VITE_LABEL_TEMPLATE_ID=REPLACE_VITE_LABEL_TEMPLATE_ID
diff --git a/.env.uat b/.env.uat
@@ -1,4 +1,4 @@
-VUE_APP_SEQUENCESCAPE_BASE_URL=REPLACE_VUE_APP_SEQUENCESCAPE_BASE_URL
-VUE_APP_SEQUENCESCAPE_API_KEY=REPLACE_VUE_APP_SEQUENCESCAPE_API_KEY
-VUE_APP_PRINT_MY_BARCODE_BASE_URL=REPLACE_VUE_APP_PRINT_MY_BARCODE_BASE_URL
-VUE_APP_LABEL_TEMPLATE_ID=REPLACE_VUE_APP_LABEL_TEMPLATE_ID
+VITE_SEQUENCESCAPE_BASE_URL=REPLACE_VITE_SEQUENCESCAPE_BASE_URL
+VITE_SEQUENCESCAPE_API_KEY=REPLACE_VITE_SEQUENCESCAPE_API_KEY
+VITE_PRINT_MY_BARCODE_BASE_URL=REPLACE_VITE_PRINT_MY_BARCODE_BASE_URL
+VITE_LABEL_TEMPLATE_ID=REPLACE_VITE_LABEL_TEMPLATE_ID
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
@@ -3,14 +3,17 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['plugin:vue/essential', 'eslint:recommended', 'prettier'],
+  extends: [
+    'plugin:vue/essential',
+    'plugin:vue/recommended',
+    'eslint:recommended',
+    'prettier', // make sure this plugin is last since it turns conflicting rules off
+  ],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'prefer-const': 'error',
     'vue/multi-word-component-names': 'off',
-  },
-  parserOptions: {
-    parser: 'babel-eslint',
+    'vue/require-prop-types': 0,
   },
 }
diff --git a/.github/workflows/js_test.yml b/.github/workflows/js_test.yml
@@ -45,10 +45,10 @@ jobs:
       - name: Cypress run
         uses: cypress-io/github-action@v5
         with:
-          start: npm run serve --legacy-peer-deps
-          wait-on: http://localhost:8080/
+          start: npm run serve
+          wait-on: http://localhost:3000/
           spec: 'tests/e2e/**/*'
-          config-file: cypress.config.js
+          config-file: cypress.config.cjs
           config: video=false
           install: false
           timeout-minutes: 5

diff --git a/babel.config.cjs b/babel.config.cjs
@@ -0,0 +1,11 @@
+module.exports = {
+  presets: ['@babel/preset-env'],
+  plugins: [
+    [
+      'babel-plugin-transform-vite-meta-env',
+      {
+        include: ['VITE_LABEL_TEMPLATE_ID'],
+      },
+    ],
+  ],
+}
diff --git a/babel.config.js b/babel.config.js
diff --git a/compile-build.sh b/compile-build.sh
@@ -8,7 +8,7 @@
 set -ev
 
 # Building assets
-npm run build -- --dest $2/public --report
+npm run build
 
 # Storing revision hash
 git rev-parse HEAD > $2/REVISION

diff --git a/cypress.config.js → cypress.config.cjs b/cypress.config.js → cypress.config.cjs
@@ -9,7 +9,7 @@ module.exports = defineConfig({
     setupNodeEvents(on, config) {},
     specPattern: 'tests/e2e/specs/**/*.{js,jsx,ts,tsx}',
     supportFile: 'tests/e2e/support/index.js',
-    baseUrl: 'http://localhost:8080/',
+    baseUrl: 'http://localhost:3000/',
     experimentalRunAllSpecs: true,
   },
 })
diff --git a/public/favicon.ico → favicon.ico b/public/favicon.ico → favicon.ico
diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <title>quanthub</title>
   </head>
   <body>
@@ -15,6 +15,6 @@
       >
     </noscript>
     <div id="app"></div>
-    <!-- built files will be auto injected -->
+    <script type="module" src="/src/main.js"></script>
   </body>
 </html>
diff --git a/jest.config.cjs b/jest.config.cjs
@@ -0,0 +1,18 @@
+module.exports = {
+  roots: ['src/', 'tests/'],
+  moduleFileExtensions: ['js', 'json', 'vue'],
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1',
+    '^@tests/(.*)$': '<rootDir>/tests/$1',
+  },
+  modulePaths: ['<rootDir>/tests/support/'],
+  transform: {
+    '\\.[jt]sx?$': 'babel-jest',
+    '^.+\\.(vue)$': '@vue/vue2-jest',
+  },
+  transformIgnorePatterns: ['/!node_modules\\/lodash-es/'],
+  testEnvironmentOptions: {
+    url: 'http://localhost/',
+  },
+  testEnvironment: 'jsdom',
+}
diff --git a/jest.config.js b/jest.config.js