diff --git a/.env b/.env index fe12a30..71285b9 100644 --- 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 index 6f16828..a27cfeb 100644 --- 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 index 6f16828..a27cfeb 100644 --- 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 b/.eslintrc.cjs similarity index 58% rename from .eslintrc.js rename to .eslintrc.cjs index 7838afd..0f1a91b 100644 --- a/.eslintrc.js +++ b/.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 index 7f3d61c..2758380 100644 --- 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 new file mode 100644 index 0000000..380b33d --- /dev/null +++ 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 deleted file mode 100644 index c1b783e..0000000 --- a/babel.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - presets: ['@vue/cli-plugin-babel/preset'], -} diff --git a/cypress.config.js b/cypress.config.cjs similarity index 91% rename from cypress.config.js rename to cypress.config.cjs index cbe84ce..b00b041 100644 --- a/cypress.config.js +++ b/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 b/favicon.ico similarity index 100% rename from public/favicon.ico rename to favicon.ico diff --git a/public/index.html b/index.html similarity index 82% rename from public/index.html rename to index.html index 56d5287..98272cd 100644 --- a/public/index.html +++ b/index.html @@ -4,7 +4,7 @@ - +