Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton

cypress.config.js

@@ -1,6 +1,6 @@
-import { defineConfig } from 'cypress';
+const { defineConfig } = require('cypress');
 
-export default defineConfig({
+module.exports = defineConfig({
     e2e: {
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,

package.json

@@ -6,7 +6,6 @@
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
-    "type": "module",
     "scripts": {
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
@@ -23,7 +22,7 @@
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
         "pinia": "^2.1.3",
-        "quasar": "^2.16.4",
+        "quasar": "^2.14.5",
         "validator": "^13.9.0",
         "vue": "^3.3.4",
         "vue-i18n": "^9.2.2",
@@ -32,7 +31,7 @@
     "devDependencies": {
         "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^1.9.3",
+        "@quasar/app-vite": "^1.7.3",
         "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
@@ -44,8 +43,7 @@
         "eslint-plugin-vue": "^9.14.1",
         "postcss": "^8.4.23",
         "prettier": "^2.8.8",
-        "vite": "^2.5.10",
+        "vitest": "^0.31.1"
-        "vitest": "^0.34.0"
     },
     "engines": {
         "node": "^20 || ^18 || ^16",

quasar.config.cjs

@@ -1,104 +0,0 @@
-/* eslint-env node */
-
-/*
- * This file runs in a Node context (it's NOT transpiled by Babel), so use only
- * the ES6 features that are supported by your Node version. https://node.green/
- */
-
-const { configure } = require('quasar/wrappers');
-const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
-const path = require('path');
-
-module.exports = configure(function (/* ctx */) {
-    return {
-        eslint: {
-            warnings: true,
-            errors: true,
-        },
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
-        css: ['app.scss'],
-        extras: ['roboto-font', 'material-icons-outlined', 'material-symbols-outlined'],
-        build: {
-            target: {
-                browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
-                node: 'node18',
-            },
-            vueRouterMode: 'hash',
-            rawDefine: {
-                'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
-            },
-            extendViteConf(viteConf) {
-                delete viteConf.build.polyfillModulePreload;
-                viteConf.build.modulePreload = {
-                    polyfill: false,
-                };
-            },
-            alias: {
-                composables: path.join(__dirname, './src/composables'),
-                filters: path.join(__dirname, './src/filters'),
-            },
-            vitePlugins: [
-                [
-                    VueI18nPlugin({
-                        runtimeOnly: false,
-                        include: [
-                            path.resolve(__dirname, './src/i18n/locale/**'),
-                            path.resolve(__dirname, './src/pages/**/locale/**'),
-                        ],
-                    }),
-                ],
-            ],
-        },
-        devServer: {
-            server: {
-                type: 'http',
-            },
-            proxy: {
-                '/api': {
-                    target: 'http://0.0.0.0:3000',
-                    logLevel: 'debug',
-                    changeOrigin: true,
-                    secure: false,
-                },
-            },
-            open: false,
-        },
-        framework: {
-            config: {
-                dark: 'auto',
-            },
-            lang: 'en-GB',
-            plugins: ['Notify', 'Dialog'],
-            all: 'auto',
-            autoImportComponentCase: 'pascal',
-        },
-        animations: [],
-        ssr: {
-            pwa: false,
-            prodPort: 3000,
-            middlewares: ['render'],
-        },
-        pwa: {
-            workboxMode: 'generateSW',
-            injectPwaMetaTags: true,
-            swFilename: 'sw.js',
-            manifestFilename: 'manifest.json',
-            useCredentialsForManifestTag: false,
-        },
-        cordova: {},
-        capacitor: {
-            hideSplashscreen: true,
-        },
-        electron: {
-            inspectPort: 5858,
-            bundler: 'packager',
-            packager: {},
-            builder: {
-                appId: 'salix-frontend',
-            },
-        },
-        bex: {
-            contentScripts: ['my-content-script'],
-        },
-    };
-});

quasar.config.js

@@ -0,0 +1,242 @@
+/* eslint-env node */
+
+/*
+ * This file runs in a Node context (it's NOT transpiled by Babel), so use only
+ * the ES6 features that are supported by your Node version. https://node.green/
+ */
+
+// Configuration for your app
+// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
+
+const { configure } = require('quasar/wrappers');
+const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+const path = require('path');
+
+module.exports = configure(function (/* ctx */) {
+    return {
+        eslint: {
+            // fix: true,
+            // include = [],
+            // exclude = [],
+            // rawOptions = {},
+            warnings: true,
+            errors: true,
+        },
+
+        // https://v2.quasar.dev/quasar-cli/prefetch-feature
+        // preFetch: true,
+
+        // app boot file (/src/boot)
+        // --> boot files are part of "main.js"
+        // https://v2.quasar.dev/quasar-cli/boot-files
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
+
+        // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
+        css: ['app.scss'],
+
+        // https://github.com/quasarframework/quasar/tree/dev/extras
+        extras: [
+            // 'ionicons-v4',
+            // 'mdi-v5',
+            // 'fontawesome-v6',
+            // 'eva-icons',
+            // 'themify',
+            // 'line-awesome',
+            // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
+
+            'roboto-font',
+            'material-icons-outlined',
+            'material-symbols-outlined',
+        ],
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
+        build: {
+            target: {
+                browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
+                node: 'node18',
+            },
+
+            vueRouterMode: 'hash', // available values: 'hash', 'history'
+            // vueRouterBase,
+            // vueDevtools,
+            // vueOptionsAPI: false,
+
+            // rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
+
+            // publicPath: '/',
+            // analyze: true,
+            // env: {},
+            rawDefine: {
+                'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+            },
+            // ignorePublicFolder: true,
+            // minify: false,
+            // polyfillModulePreload: true,
+            // distDir
+
+            extendViteConf(viteConf) {
+                // FIXME: Delete deprecated property polyfillModulePreload
+                // that is set by Quasar by default
+                delete viteConf.build.polyfillModulePreload;
+                viteConf.build.modulePreload = {
+                    polyfill: false,
+                };
+            },
+            // viteVuePluginOptions: {},
+
+            alias: {
+                composables: path.join(__dirname, './src/composables'),
+                filters: path.join(__dirname, './src/filters'),
+            },
+
+            vitePlugins: [
+                [
+                    VueI18nPlugin({
+                        runtimeOnly: false,
+                        include: [
+                            path.resolve(__dirname, './src/i18n/locale/**'),
+                            path.resolve(__dirname, './src/pages/**/locale/**'),
+                        ],
+                    }),
+                ],
+            ],
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
+        devServer: {
+            server: {
+                type: 'http',
+            },
+            proxy: {
+                '/api': {
+                    target: 'http://0.0.0.0:3000',
+                    logLevel: 'debug',
+                    changeOrigin: true,
+                    secure: false,
+                },
+            },
+            open: false,
+        },
+
+        // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
+        framework: {
+            config: {
+                config: {
+                    dark: 'auto',
+                },
+            },
+            lang: 'en-GB',
+
+            // iconSet: 'material-icons', // Quasar icon set
+            // lang: 'en-US', // Quasar language pack
+
+            // For special cases outside of where the auto-import strategy can have an impact
+            // (like functional components as one of the examples),
+            // you can manually specify Quasar components/directives to be available everywhere:
+            //
+            // components: [],
+            // directives: [],
+
+            // Quasar plugins
+            plugins: ['Notify', 'Dialog'],
+            all: 'auto',
+            autoImportComponentCase: 'pascal',
+        },
+
+        // animations: 'all', // --- includes all animations
+        // https://v2.quasar.dev/options/animations
+        animations: [],
+
+        // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
+        // sourceFiles: {
+        //   rootComponent: 'src/App.vue',
+        //   router: 'src/router/index',
+        //   store: 'src/store/index',
+        //   registerServiceWorker: 'src-pwa/register-service-worker',
+        //   serviceWorker: 'src-pwa/custom-service-worker',
+        //   pwaManifestFile: 'src-pwa/manifest.json',
+        //   electronMain: 'src-electron/electron-main',
+        //   electronPreload: 'src-electron/electron-preload'
+        // },
+
+        // https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
+        ssr: {
+            // ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
+            // will mess up SSR
+
+            // extendSSRWebserverConf (esbuildConf) {},
+            // extendPackageJson (json) {},
+
+            pwa: false,
+
+            // manualStoreHydration: true,
+            // manualPostHydrationTrigger: true,
+
+            prodPort: 3000, // The default port that the production server should use
+            // (gets superseded if process.env.PORT is specified at runtime)
+
+            middlewares: [
+                'render', // keep this as last one
+            ],
+        },
+
+        // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
+        pwa: {
+            workboxMode: 'generateSW', // or 'injectManifest'
+            injectPwaMetaTags: true,
+            swFilename: 'sw.js',
+            manifestFilename: 'manifest.json',
+            useCredentialsForManifestTag: false,
+            // useFilenameHashes: true,
+            // extendGenerateSWOptions (cfg) {}
+            // extendInjectManifestOptions (cfg) {},
+            // extendManifestJson (json) {}
+            // extendPWACustomSWConf (esbuildConf) {}
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
+        cordova: {
+            // noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
+        capacitor: {
+            hideSplashscreen: true,
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
+        electron: {
+            // extendElectronMainConf (esbuildConf)
+            // extendElectronPreloadConf (esbuildConf)
+
+            inspectPort: 5858,
+
+            bundler: 'packager', // 'packager' or 'builder'
+
+            packager: {
+                // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
+                // OS X / Mac App Store
+                // appBundleId: '',
+                // appCategoryType: '',
+                // osxSign: '',
+                // protocol: 'myapp://path',
+                // Windows only
+                // win32metadata: { ... }
+            },
+
+            builder: {
+                // https://www.electron.build/configuration/configuration
+
+                appId: 'salix-frontend',
+            },
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
+        bex: {
+            contentScripts: ['my-content-script'],
+
+            // extendBexScriptsConf (esbuildConf) {}
+            // extendBexManifestJson (json) {}
+        },
+    };
+});

vitest.config.js

@@ -5,11 +5,14 @@ import jsconfigPaths from 'vite-jsconfig-paths';
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
 import path from 'path';
 
+// https://vitejs.dev/config/
 export default defineConfig({
     test: {
         environment: 'happy-dom',
         setupFiles: 'test/vitest/setup-file.js',
         include: [
+            // Matches vitest tests in any subfolder of 'src' or into 'test/vitest/__tests__'
+            // Matches all files with extension 'js', 'jsx', 'ts' and 'tsx'
             'test/vitest/__tests__/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
         ],
     },