Merge branch 'develop' for release v2.0v2.0

1 files changed, 32 insertions, 14 deletions

diff --git a/viewer/vue.config.js b/viewer/vue.config.js
index f481e4f..8649b6d 100644
--- a/viewer/vue.config.js
+++ b/viewer/vue.config.js
@@ -17,6 +17,33 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+/*
+-- Create a file .env.development.local in the project to customize your DevServer
+-- VUE_APP_DEVSERVER_CONFIG_PATH=<http_url> will use the dev_proxyconfig
+-- VUE_APP_DEVSERVER_CONFIG_PATH=<fs_path> will use the dev_fsconfig
+*/
+const dev_ready = Boolean(process.env.VUE_APP_DEVSERVER_CONFIG_PATH);
+const dev_isproxy = dev_ready && Boolean(process.env.VUE_APP_DEVSERVER_CONFIG_PATH.match(/^https?:\/\//i));
+const dev_localpath = `^/${process.env.VUE_APP_DATA_URL}`;
+const dev_proxyconfig = {
+  [dev_localpath]: {
+    target: process.env.VUE_APP_DEVSERVER_CONFIG_PATH,
+    pathRewrite: { [dev_localpath]: "" },
+  },
+};
+const dev_fsconfig = (app, server, compiler) => {
+  app.get(`${dev_localpath}*`, (req, res) => {
+    const fs = require("fs");
+    const url = req.url.slice(process.env.VUE_APP_DATA_URL.length);
+    const paramIdx = url.indexOf("?");
+    const filepath = paramIdx < 0 ? url : url.substring(0, paramIdx);
+    const fullpath = `${process.env.VUE_APP_DEVSERVER_CONFIG_PATH}${decodeURIComponent(filepath)}`;
+    const file = fs.readFileSync(fullpath);
+    res.end(file);
+  });
+};
+// =================
+
 module.exports = {
   publicPath: "./",
   pluginOptions: {
@@ -27,26 +54,17 @@ module.exports = {
       enableInSFC: false,
     },
   },
-  chainWebpack: (config) => {
+  chainWebpack: config => {
     config.plugins.delete("prefetch");
   },
   configureWebpack: {
-    devtool: "source-map"
+    devtool: "source-map",
   },
   productionSourceMap: false,
   devServer: {
     port: process.env.VUE_APP_DEVSERVER_PORT,
     serveIndex: true,
-    before: (app, server, compiler) => {
-      app.get(`/${process.env.VUE_APP_DATA_URL}*`, (req, res) => {
-        const fs = require("fs");
-        const url = req.url.slice(process.env.VUE_APP_DATA_URL.length);
-        const paramIdx = url.indexOf("?");
-        const filepath = paramIdx < 0 ? url : url.substring(0, paramIdx);
-        const fullpath = `${process.env.VUE_APP_DEVSERVER_CONFIG_PATH}${decodeURIComponent(filepath)}`;
-        const file = fs.readFileSync(fullpath);
-        res.end(file);
-      });
-    }
-  }
+    proxy: dev_ready && dev_isproxy ? dev_proxyconfig : undefined,
+    before: dev_ready && !dev_isproxy ? dev_fsconfig : undefined,
+  },
 };