0
0
Fork 0

Merge branch 'dev' into 6907_fix_input_clearable_hover

This commit is contained in:
Javier Segarra 2024-02-21 13:15:36 +00:00
commit c9cdb721d6
3 changed files with 13 additions and 13 deletions

View File

@ -1,6 +1,5 @@
FROM node:stretch-slim
RUN corepack enable pnpm
RUN pnpm install -g @quasar/cli
RUN npm install -g @quasar/cli
WORKDIR /app
COPY dist/spa ./
CMD ["quasar", "serve", "./", "--history", "--hostname", "0.0.0.0"]

4
Jenkinsfile vendored
View File

@ -62,7 +62,7 @@ pipeline {
NODE_ENV = ""
}
steps {
sh 'pnpm install --prefer-offline'
sh 'npm install --prefer-offline'
}
}
stage('Test') {
@ -73,7 +73,7 @@ pipeline {
NODE_ENV = ""
}
steps {
sh 'pnpm run test:unit:ci'
sh 'npm run test:unit:ci'
}
post {
always {

View File

@ -16,11 +16,12 @@
},
"dependencies": {
"@quasar/cli": "^2.3.0",
"@quasar/extras": "^1.16.9",
"@quasar/extras": "^1.16.4",
"axios": "^1.4.0",
"chromium": "^3.0.3",
"croppie": "^2.6.5",
"pinia": "^2.1.3",
"quasar": "^2.14.5",
"quasar": "^2.12.0",
"validator": "^13.9.0",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2",
@ -29,9 +30,9 @@
"devDependencies": {
"@intlify/unplugin-vue-i18n": "^0.8.1",
"@pinia/testing": "^0.1.2",
"@quasar/app-vite": "^1.7.3",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vue/test-utils": "^2.4.4",
"@quasar/app-vite": "^1.4.3",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.3.0",
"@vue/test-utils": "^2.3.2",
"autoprefixer": "^10.4.14",
"cypress": "^12.13.0",
"eslint": "^8.41.0",
@ -40,7 +41,7 @@
"eslint-plugin-vue": "^9.14.1",
"postcss": "^8.4.23",
"prettier": "^2.8.8",
"vitest": "^1.3.1"
"vitest": "^0.31.1"
},
"engines": {
"node": "^20 || ^18 || ^16",
@ -49,8 +50,8 @@
"bun": ">= 1.0.25"
},
"overrides": {
"@vitejs/plugin-vue": "^5.0.4",
"vite": "^5.1.4",
"vitest": "^1.3.1"
"@vitejs/plugin-vue": "^4.0.0",
"vite": "^4.3.5",
"vitest": "^0.31.1"
}
}