fix: set host, proxy false

easy-team · Jun 9, 2018 · 4e09a2c · 4e09a2c
1 parent e9ff6e8
commit 4e09a2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/builder.js b/lib/builder.js
@@ -40,6 +40,7 @@ exports.getDllWebpackConfig = (config, option = {}) => {
     const resolveLoader = config.resolveLoader;
     const cdn = config.cdn;
     const cache = config.cache;
+    const host = config.host;
     const configLoaders = config.loaders || {};
     const configPlugins = config.plugins || {};
     const loaders = {};
@@ -57,7 +58,7 @@ exports.getDllWebpackConfig = (config, option = {}) => {
       }
     }
     dllArray.forEach(item => {
-      const builderConfig = Object.assign({}, dllConfig, { cache, prefix, entry: {}, dll: item, publicPath, buildPath, alias, externals, resolveLoader, install, cdn, loaders, plugins }, item.webpackConfig);
+      const builderConfig = Object.assign({}, dllConfig, { host, cache, prefix, entry: {}, dll: item, publicPath, buildPath, alias, externals, resolveLoader, install, cdn, loaders, plugins }, item.webpackConfig);
       if (option.onlyView || utils.checkDllUpdate(config, item)) {
         dllWebpackConfig.push(new WebpackDllBuilder(builderConfig).create());
       }

diff --git a/lib/config.js b/lib/config.js
@@ -98,7 +98,7 @@ class Config {
 
   get proxy() {
     const config = this.config;
-    return this.dev && this.utils.isTrue(config.proxy);
+    return this.dev && !config.host && this.utils.isTrue(config.proxy);
   }
 
   get prefix() {