From 72768935b3ab3fe038750995ae1112cc2b97bc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Tue, 1 Mar 2022 21:38:52 +0800 Subject: [PATCH] chore: load env file (#6323) --- docs/vite.config.ts | 13 +++++++------ play/vite.config.ts | 7 ++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/vite.config.ts b/docs/vite.config.ts index 7d4ad8bd65..df5c6624e2 100644 --- a/docs/vite.config.ts +++ b/docs/vite.config.ts @@ -1,6 +1,6 @@ import path from 'path' import Inspect from 'vite-plugin-inspect' -import { defineConfig } from 'vite' +import { defineConfig, loadEnv } from 'vite' import DefineOptions from 'unplugin-vue-define-options/vite' import WindiCSS from 'vite-plugin-windicss' import mkcert from 'vite-plugin-mkcert' @@ -30,7 +30,8 @@ if (process.env.DOC_ENV !== 'production') { ) } -export default async () => { +export default defineConfig(async ({ mode }) => { + const env = loadEnv(mode, process.cwd(), '') const { dependencies } = getPackageDependencies(epPackage) const optimizeDeps = [ 'vue', @@ -50,10 +51,10 @@ export default async () => { ).map((file) => file.replace(/\.js$/, '')) ) - return defineConfig({ + return { server: { host: true, - https: !!process.env.HTTPS, + https: !!env.HTTPS, fs: { allow: [projRoot], }, @@ -95,5 +96,5 @@ export default async () => { optimizeDeps: { include: optimizeDeps, }, - }) -} + } +}) diff --git a/play/vite.config.ts b/play/vite.config.ts index 992224c131..f12fede53d 100644 --- a/play/vite.config.ts +++ b/play/vite.config.ts @@ -1,5 +1,5 @@ import path from 'path' -import { defineConfig } from 'vite' +import { defineConfig, loadEnv } from 'vite' import vue from '@vitejs/plugin-vue' import vueJsx from '@vitejs/plugin-vue-jsx' import Components from 'unplugin-vue-components/vite' @@ -24,7 +24,8 @@ const esbuildPlugin = () => ({ enforce: 'post', }) -export default defineConfig(async () => { +export default defineConfig(async ({ mode }) => { + const env = loadEnv(mode, process.cwd(), '') const { dependencies } = getPackageDependencies(epPackage) const optimizeDeps = ( @@ -48,7 +49,7 @@ export default defineConfig(async () => { }, server: { host: true, - https: !!process.env.HTTPS, + https: !!env.HTTPS, }, plugins: [ vue(),