test(ui): fix tests setup

yusufkandemir · Mar 14, 2024 · 7ff22ea · 7ff22ea
1 parent 53c2364
commit 7ff22ea
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 27 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ui/dev/cypress.config.cjs b/ui/dev/cypress.config.cjs
@@ -4,14 +4,8 @@ const { defineConfig } = require('cypress')
 const viteVuePlugin = require('@vitejs/plugin-vue')
 const { quasar, transformAssetUrls } = require('@quasar/vite-plugin')
 
-const moduleAlias = require('module-alias')
 const { join } = require('path')
 
-const uiFolder = join(__dirname, '..')
-
-// Quasar dependency should point to the current UI project, which we build right before running tests
-moduleAlias.addAlias('quasar', uiFolder)
-
 module.exports = defineConfig({
   projectId: '5zr217',
   fixturesFolder: '../test/cypress/fixtures',
@@ -44,9 +38,16 @@ module.exports = defineConfig({
       framework: 'vue',
       bundler: 'vite',
       viteConfig: {
+        resolve: {
+          alias: {
+            quasar: join(__dirname, '../')
+          }
+        },
         plugins: [
           viteVuePlugin({ template: { transformAssetUrls } }),
-          quasar()
+          quasar({
+            devTreeshaking: true
+          })
         ]
       }
     }

diff --git a/ui/dev/package.json b/ui/dev/package.json
@@ -10,9 +10,12 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "///": "Some dependencies are needed for tests to work properly. Also, if a dependency is needed only for the dev app, add them here.",
+  "dependencies": {
+    "quasar": "workspace:*"
+  },
   "devDependencies": {
-    "@quasar/app-vite": "^2.0.0-beta.5",
-    "@quasar/vite-plugin": "^1.6.0",
+    "@quasar/app-vite": "workspace:*",
+    "@quasar/vite-plugin": "workspace:*",
     "vite-plugin-checker": "^0.6.4"
   },
   "engines": {

diff --git a/ui/dev/script.build.js b/ui/dev/script.build.js
@@ -1,14 +1,11 @@
-const { join, resolve } = require('node:path')
-const moduleAlias = require('module-alias')
+const { resolve } = require('node:path')
 const fse = require('fs-extra')
 
 if (!fse.existsSync(resolve(__dirname, '../dist'))) {
   console.error('\nERROR: please run "pnpm build" in the /ui folder first\n')
   process.exit(0)
 }
 
-moduleAlias.addAlias('quasar', join(__dirname, '..'))
-
 // Ensure cwd is set to ui/dev
 process.chdir(__dirname)
 

diff --git a/ui/dev/script.dev.js b/ui/dev/script.dev.js
@@ -1,14 +1,11 @@
-const { join, resolve } = require('node:path')
-const moduleAlias = require('module-alias')
+const { resolve } = require('node:path')
 const fse = require('fs-extra')
 
 if (!fse.existsSync(resolve(__dirname, '../dist'))) {
   console.error('\nERROR: please run "pnpm build" in the /ui folder first\n')
   process.exit(0)
 }
 
-moduleAlias.addAlias('quasar', join(__dirname, '..'))
-
 // Ensure cwd is set to ui/dev
 process.chdir(__dirname)
 

diff --git a/ui/package.json b/ui/package.json
@@ -87,7 +87,6 @@
     "eslint-plugin-no-only-tests": "^3.1.0",
     "fast-glob": "^3.3.0",
     "fs-extra": "^11.2.0",
-    "module-alias": "^2.2.2",
     "open": "^10.0.4",
     "postcss-rtlcss": "^5.1.0",
     "prettier": "^3.0.0",