Merge branch 'feature_firebase' of github.com:fan9704/MQTT-Frontend i…

…nto feature_firebase
fan9704 · Jun 22, 2023 · 44d4137 · 44d4137
2 parents bb24190 + b77c2c4
commit 44d4137
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ dist-ssr
 *.sw?
 
 .env
+
diff --git a/package.json b/package.json
@@ -33,10 +33,10 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
     "@vuetify/vite-plugin": "^1.0.0-alpha.0",
+    "https-localhost": "^4.7.0",
     "vite": "^2.9.13",
     "vite-plugin-pwa": "^0.12.2",
     "vite-plugin-vuetify": "^1.0.2",
-    "vuetify-loader": "^1.9.2",
-    "https-localhost": "^4.7.0"
+    "vuetify-loader": "^1.9.2"
   }
 }
diff --git a/vite.config.js b/vite.config.js
@@ -1,17 +1,22 @@
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite';
 import vue from '@vitejs/plugin-vue'
 import vuetify from '@vuetify/vite-plugin'
 import { VitePWA } from 'vite-plugin-pwa'
 import path from 'path';
 
-export default defineConfig({
-  // base: process.env.NODE_ENV === 'production'
-  //     ? '/PetMonitoringSystem-Frontend/'
-  //     : '/',
-  build:{
-    chunkSizeWarningLimit:1500,
-  },
-  plugins: [
+
+export default ({ mode }) => {
+  process.env = {...process.env, ...loadEnv(mode, process.cwd())};
+
+
+  return defineConfig({
+    // base: process.env.NODE_ENV === 'production'
+    //     ? '/PetMonitoringSystem-Frontend/'
+    //     : '/',
+    build:{
+      chunkSizeWarningLimit:1500,
+    },
+    plugins: [
       vue(),
       vuetify({
         autoImport: true,
@@ -49,24 +54,27 @@ export default defineConfig({
           sourcemap: true
         }
       }),
-  ],
-  define: { 'process.env': {} },
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname, './src'),
-      'vue$': 'vue/dist/vue.esm.js',
-      'static': path.resolve(__dirname, '../static'),
-      '/images':'src/assets/images',
-    },
-  },
-  server: {
-    proxy: {
-      '/api': {
-        target: 'http://127.0.0.1:8000',
-        changeOrigin: true,
-        rewrite: (path) => path.replace('', '')
+    ],
+    define: { 'process.env': {} },
+    resolve: {
+      alias: {
+        '@': path.resolve(__dirname, './src'),
+        'vue$': 'vue/dist/vue.esm.js',
+        'static': path.resolve(__dirname, '../static'),
+        '/images':'src/assets/images',
       },
-    }
-  },
+    },
+    server: {
+      proxy: {
+        '/api': {
+          // target:  `http://${process.env.SERVER_IP}` || '127.0.0.1:8000',
+          target:  `http://140.125.207.230:8000`,
+          changeOrigin: true,
+          rewrite: (path) => path.replace('', '')
+        },
+      }
+    },
+
+  })
+}
 
-})
diff --git a/yarn.lock b/yarn.lock
@@ -2278,6 +2278,11 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+dotenv@^16.1.4:
+  version "16.1.4"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.1.4.tgz#67ac1a10cd9c25f5ba604e4e08bc77c0ebe0ca8c"
+  integrity sha512-m55RtE8AsPeJBpOIFKihEmqUcoVncQIwo7x9U8ZwLEZw9ZpXboz2c+rvog+jUaJvVrZ5kBOeYQBX5+8Aa/OZQw==
+
 duplexify@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"