diff --git a/packages/frontend/certs/.gitignore b/packages/frontend/certs/.gitignore index 1b911e5c..b16c86f3 100644 --- a/packages/frontend/certs/.gitignore +++ b/packages/frontend/certs/.gitignore @@ -1,2 +1,2 @@ # this folder is for ssl certs for dev only -!.gitignore \ No newline at end of file +* \ No newline at end of file diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 5cd64c1d..139734c7 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -6,7 +6,7 @@ "scripts": { "prepare": "export VITE_COMMIT=$(git rev-parse --short HEAD)", "dev": "pwa-assets-generator && VITE_COMMIT=$(git rev-parse --short HEAD) vite", - "dev:ssl": "yarn dev --host --port 443", + "dev:ssl": "USE_SSL=true yarn dev --host --port 443", "build": "pwa-assets-generator && VITE_COMMIT=$(git rev-parse --short HEAD) vite build", "build:apk": "ionic capacitor build android", "platform:add": "ionic capacitor add", @@ -95,4 +95,4 @@ "vite-plugin-pwa": "0.19.2", "vite-plugin-svgr": "3.2.0" } -} +} \ No newline at end of file diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts index e6f3d459..3264225f 100644 --- a/packages/frontend/vite.config.ts +++ b/packages/frontend/vite.config.ts @@ -2,7 +2,7 @@ import * as path from "path"; import basicSsl from "@vitejs/plugin-basic-ssl"; import react from "@vitejs/plugin-react"; -import { defineConfig } from "vite"; +import { defineConfig, loadEnv } from "vite"; import { ViteImageOptimizer } from "vite-plugin-image-optimizer"; import { optimizeCssModules } from "vite-plugin-optimize-css-modules"; import { VitePWA } from "vite-plugin-pwa"; @@ -10,13 +10,9 @@ import svgr from "vite-plugin-svgr"; import tsconfigPaths from "vite-tsconfig-paths"; // https://vitejs.dev/config/ -export default defineConfig({ - plugins: [ - basicSsl({ - name: "Alphaday", - domains: ["app.localday.com"], - certDir: process.env.CERT_DIR || path.resolve(__dirname, "certs"), - }), +export default defineConfig(({ mode }) => { + const env = loadEnv(mode, process.cwd(), ""); + const plugins = [ tsconfigPaths(), VitePWA({ registerType: "autoUpdate", @@ -64,40 +60,53 @@ export default defineConfig({ svgr(), ViteImageOptimizer(), // optimize images, svgs and gifs optimizeCssModules(), // optimize css modules - ], - css: { - modules: { - localsConvention: "camelCase", + ]; + if (env.USE_SSL === "true") { + plugins.push( + basicSsl({ + name: "Alphaday", + domains: ["app.localday.com"], + certDir: + process.env.CERT_DIR || path.resolve(__dirname, "certs"), + }) + ); + } + return { + plugins, + css: { + modules: { + localsConvention: "camelCase", + }, + }, + server: { + port: 3001, }, - }, - server: { - port: 3001, - }, - test: { - globals: true, - environment: "happy-dom", - }, - build: { - commonjsOptions: { - transformMixedEsModules: true, + test: { + globals: true, + environment: "happy-dom", + }, + build: { + commonjsOptions: { + transformMixedEsModules: true, + }, + }, + resolve: { + alias: { + // hack to prevent uniswap widgets error on vite (see https://github.com/Uniswap/sdk-core/issues/20) + jsbi: path.resolve( + __dirname, + "../..", + "node_modules", + "jsbi", + "dist", + "jsbi-cjs.js" + ), + }, }, - }, - resolve: { - alias: { - // hack to prevent uniswap widgets error on vite (see https://github.com/Uniswap/sdk-core/issues/20) - jsbi: path.resolve( - __dirname, - "../..", - "node_modules", - "jsbi", - "dist", - "jsbi-cjs.js" + define: { + "import.meta.env.VITE_VERSION": JSON.stringify( + process.env.npm_package_version ), }, - }, - define: { - "import.meta.env.VITE_VERSION": JSON.stringify( - process.env.npm_package_version - ), - }, + }; });