diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 18c19dbcb..000000000 --- a/.babelrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "plugins": ["@babel/plugin-syntax-dynamic-import"], - "env": { - "test": { - "plugins": ["dynamic-import-node"], - "presets": [ - [ - "@babel/preset-env", - { - "modules": "commonjs", - "targets": { - "node": "current" - } - } - ] - ] - } - } -} diff --git a/.eslintignore b/.eslintignore index f5bb4168b..263e5eb89 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,8 +1,6 @@ /dist -/src-bex/www /src-capacitor /src-cordova /.quasar /node_modules .eslintrc.js -babel.config.js diff --git a/.eslintrc.js b/.eslintrc.js index 086c9023e..d2fe165a5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -5,13 +5,13 @@ module.exports = { root: true, parserOptions: { - parser: '@babel/eslint-parser', - ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features - sourceType: 'module', // Allows for the use of imports + ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features }, env: { + node: true, browser: true, + 'vue/setup-compiler-macros': true, }, // Rules order is important, please avoid shuffling them @@ -22,7 +22,7 @@ module.exports = { // Uncomment any of the lines below to choose desired strictness, // but leave only one uncommented! // See https://eslint.vuejs.org/rules/#available-rules - //'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention) + // 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention) 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability) // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead) @@ -52,9 +52,6 @@ module.exports = { process: 'readonly', Capacitor: 'readonly', chrome: 'readonly', - defineProps: 'readonly', // Vue SFC setup compiler macro - defineEmits: 'readonly', // Vue SFC setup compiler macro - defineExpose: 'readonly', // Vue SFC setup compiler macro }, // add your custom rules here @@ -64,10 +61,9 @@ module.exports = { // allow debugger during development only 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', }, - overrides: [ { - files: ['**/*.spec.{js,ts}'], + files: ['test/cypress/**/*.spec.{js,ts}'], extends: [ // Add Cypress-specific lint rules, globals and Cypress plugin // See https://github.com/cypress-io/eslint-plugin-cypress#rules diff --git a/.gitignore b/.gitignore index 889ff5b2c..213384ef5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store .thumbs.db node_modules -junit.xml # Quasar core related directories .quasar @@ -17,10 +16,6 @@ junit.xml /src-capacitor/www /src-capacitor/node_modules -# BEX related directories and files -/src-bex/www -/src-bex/js/core - # Log files npm-debug.log* yarn-debug.log* @@ -32,3 +27,7 @@ yarn-error.log* *.ntvs* *.njsproj *.sln + +# Cypress directories and files +/tests/cypress/videos +/tests/cypress/screenshots \ No newline at end of file diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..32bd84d2a --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +# pnpm-related options +shamefully-hoist=true +strict-peer-dependencies=false diff --git a/.postcssrc.js b/.postcssrc.js deleted file mode 100644 index 3ef7b950b..000000000 --- a/.postcssrc.js +++ /dev/null @@ -1,9 +0,0 @@ -/* eslint-disable */ -// https://github.com/michael-ciniawsky/postcss-load-config - -module.exports = { - plugins: [ - // to edit target browsers: use "browserslist" field in package.json - require('autoprefixer'), - ], -}; diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 5c8908497..269fd2c00 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,7 +3,7 @@ "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "editorconfig.editorconfig", - "Vue.volar", + "vue.volar", "wayou.vscode-todo-highlight" ], "unwantedRecommendations": [ diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..8fffb1b53 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [2253.01] - 2023-01-05 + +### Added + +- Added... + +### Changed + +- Changed... diff --git a/README.md b/README.md index b8fb6f87f..da3c7d356 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ -# Salix (salix-front) +# Lilium (lilium-front) -Salix front-end +Lilium frontend ## Install the dependencies ```bash -yarn -# or npm install ``` @@ -22,20 +20,16 @@ sudo npm install -g @quasar/cli quasar dev ``` -### Lint the files +### Run unit tests ```bash -yarn lint -# or -npm run lint +npm run test:unit ``` -### Format the files +### Run e2e tests ```bash -yarn format -# or -npm run format +npm run test:e2e ``` ### Build the app for production @@ -43,7 +37,3 @@ npm run format ```bash quasar build ``` - -### Customize the configuration - -See [Configuring quasar.config.js](https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js). diff --git a/babel.config.js b/babel.config.js deleted file mode 100644 index c984c8e78..000000000 --- a/babel.config.js +++ /dev/null @@ -1,18 +0,0 @@ -/* eslint-env node */ -// eslint-disable-next-line @typescript-eslint/no-var-requires -const fs = require('fs-extra'); -let extend = undefined; - -/** - * The .babelrc file has been created to assist Jest for transpiling. - * You should keep your application's babel rules in this file. - */ - -if (fs.existsSync('./.babelrc')) { - extend = './.babelrc'; -} - -module.exports = { - presets: ['@quasar/babel-preset-app'], - extends: extend, -}; diff --git a/cypress.config.js b/cypress.config.js new file mode 100644 index 000000000..59276f815 --- /dev/null +++ b/cypress.config.js @@ -0,0 +1,22 @@ +const { defineConfig } = require('cypress'); + +module.exports = defineConfig({ + e2e: { + baseUrl: 'http://localhost:8080/', + fixturesFolder: 'test/cypress/fixtures', + screenshotsFolder: 'test/cypress/screenshots', + supportFile: 'test/cypress/support/index.js', + videosFolder: 'test/cypress/videos', + video: true, + specPattern: 'test/cypress/integration/*.spec.js', + experimentalRunAllSpecs: true, + component: { + componentFolder: 'src', + testFiles: '**/*.spec.js', + supportFile: 'test/cypress/support/unit.js', + }, + setupNodeEvents(on, config) { + // implement node event listeners here + }, + }, +}); diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 59e0ef6cc..000000000 --- a/cypress.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "baseUrl": "http://localhost:8080/", - "fixturesFolder": "tests/cypress/fixtures", - "integrationFolder": "tests/cypress/integration", - "pluginsFile": "tests/cypress/plugins/index.js", - "screenshotsFolder": "tests/cypress/screenshots", - "supportFile": "tests/cypress/support/index.js", - "videosFolder": "tests/cypress/videos", - "video": true, - "component": { - "componentFolder": "src", - "testFiles": "**/*.spec.js", - "supportFile": "tests/cypress/support/unit.js" - } -} diff --git a/src/index.template.html b/index.html similarity index 92% rename from src/index.template.html rename to index.html index cca5ceeb4..c1bd4681b 100644 --- a/src/index.template.html +++ b/index.html @@ -19,7 +19,6 @@
- - +