From 0f0f087390bd1e2ab0606bd3113f8c094eeda14a Mon Sep 17 00:00:00 2001 From: Brice Schaffner Date: Fri, 9 Aug 2024 09:51:32 +0200 Subject: [PATCH] Made the ssl optional --- package-lock.json | 13 +++++++++++++ package.json | 6 ++++++ vite.config.mts | 18 ++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d4c217d9e..7d9599dee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,6 +66,7 @@ "@rushstack/eslint-patch": "^1.10.4", "@types/jsdom": "^21.1.7", "@types/node": "^18.19.43", + "@vitejs/plugin-basic-ssl": "^1.1.0", "@vitejs/plugin-vue": "^5.1.2", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^13.0.0", @@ -2239,6 +2240,18 @@ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", + "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==", + "dev": true, + "engines": { + "node": ">=14.6.0" + }, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" + } + }, "node_modules/@vitejs/plugin-vue": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.2.tgz", diff --git a/package.json b/package.json index b12177416..8f3b465ce 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,12 @@ "preview:dev": "npm run build:dev && vite preview --port 8080 --host --outDir dist/development", "preview:int": "npm run build:int && vite preview --mode integration --port 8080 --host --outDir dist/integration", "preview:prod": "npm run build:prod && vite preview --mode production --port 8080 --host --outDir dist/production", + "dev:https": "USE_HTTPS=1 npm run dev", + "int:https": "USE_HTTPS=1 npm run int", + "prod:https": "USE_HTTPS=1 npm run prod", + "preview:dev:https": "USE_HTTPS=1 npm run preview:dev", + "preview:int:https": "USE_HTTPS=1 npm run preview:int", + "preview:prod:https": "USE_HTTPS=1 npm run preview:prod", "lint": "eslint . --fix --ignore-path .gitignore --ext .js,.vue", "lint:no-fix": "eslint . --ignore-path .gitignore --ext .js,.vue", "test:unit": "npm run delete:reports:unit && vitest --run --mode development --environment jsdom", diff --git a/vite.config.mts b/vite.config.mts index 791279c80..d2a1b53e9 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -52,14 +52,16 @@ export default defineConfig(({ mode }) => { }, plugins: [ { - ...basicSsl({ - /** Name of certification */ - name: 'localhost', - /** Custom trust domains */ - domains: ['localhost', '192.168.*.*'], - /** Custom certification directory */ - certDir: './devServer/cert', - }), + ...(process.env.USE_HTTPS + ? basicSsl({ + /** Name of certification */ + name: 'localhost', + /** Custom trust domains */ + domains: ['localhost', '192.168.*.*'], + /** Custom certification directory */ + certDir: './devServer/cert', + }) + : {}), apply: 'serve', }, vue({