From 6d3bed2db60d7cb5979be46b6148e5b411ef3eee Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 21 Feb 2024 13:34:31 +0100 Subject: [PATCH 1/6] refs #6797 fix(jenkins) momentarily --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1906dc9202..b601875f6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] From 4ac9dc3148cd3122a845a3699269d23692b91cde Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 21 Feb 2024 13:35:33 +0100 Subject: [PATCH 2/6] refs #6797 fix(jenkins) momentarily --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index d985c72683..3708007f21 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@quasar/cli": "^2.3.0", "@quasar/extras": "^1.16.9", "axios": "^1.4.0", + "chromium": "^3.0.3", "croppie": "^2.6.5", "pinia": "^2.1.3", "quasar": "^2.14.5", From ed17fa067035f115e4c52da3962801a2351466d5 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 21 Feb 2024 13:36:47 +0100 Subject: [PATCH 3/6] refs #6797 fix(jenkins) momentarily use npm --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0027e1cbe4..be20b10214 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 { From 4059f168f6462da11b0740f2959b8ccc0b131cca Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 21 Feb 2024 13:37:33 +0100 Subject: [PATCH 4/6] refs #6797 fix(jenkins) momentarily use bun --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index be20b10214..5ed1cab811 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,7 +62,7 @@ pipeline { NODE_ENV = "" } steps { - sh 'npm install --prefer-offline' + sh 'bun install --prefer-offline' } } stage('Test') { @@ -73,7 +73,7 @@ pipeline { NODE_ENV = "" } steps { - sh 'npm run test:unit:ci' + sh 'bun run test:unit:ci' } post { always { From d1e1a8e1fa18b95755a21f6256ff28f4c2daf55e Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 21 Feb 2024 13:41:41 +0100 Subject: [PATCH 5/6] refs #6797 fix(jenkins) momentarily old package.json --- package.json | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3708007f21..148fbe369e 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,11 @@ }, "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", @@ -30,9 +29,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", @@ -41,17 +40,16 @@ "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", "npm": ">= 8.1.2", - "yarn": ">= 1.21.1", - "bun": ">= 1.0.25" + "yarn": ">= 1.21.1" }, "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" } } From cda05112470aa235b1e0f1d3b29313d7b2d8c779 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 21 Feb 2024 13:43:33 +0100 Subject: [PATCH 6/6] refs #6797 fix(jenkins) momentarily old package.json --- Jenkinsfile | 4 ++-- package.json | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5ed1cab811..be20b10214 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,7 +62,7 @@ pipeline { NODE_ENV = "" } steps { - sh 'bun install --prefer-offline' + sh 'npm install --prefer-offline' } } stage('Test') { @@ -73,7 +73,7 @@ pipeline { NODE_ENV = "" } steps { - sh 'bun run test:unit:ci' + sh 'npm run test:unit:ci' } post { always { diff --git a/package.json b/package.json index 148fbe369e..7beb22e552 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@quasar/extras": "^1.16.4", "axios": "^1.4.0", "chromium": "^3.0.3", + "croppie": "^2.6.5", "pinia": "^2.1.3", "quasar": "^2.12.0", "validator": "^13.9.0", @@ -45,7 +46,8 @@ "engines": { "node": "^20 || ^18 || ^16", "npm": ">= 8.1.2", - "yarn": ">= 1.21.1" + "yarn": ">= 1.21.1", + "bun": ">= 1.0.25" }, "overrides": { "@vitejs/plugin-vue": "^4.0.0",