Merge pull request #42 from qiuyuntao/master

feat:keep webpack alias and plugins instead of create new
ant-tool · Apr 18, 2017 · cca344d · cca344d
2 parents dbc3775 + bf50890
commit cca344d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "atool-doc",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Static demo site generator based on atool-build & dora.",
   "keywords": [
     "atool",

diff --git a/src/getWebpackConfig.js b/src/getWebpackConfig.js
@@ -51,10 +51,10 @@ export default function (source, asset, dest, cwd, tpl, config) {
   webpackConfig.demoSource = source;
 
   webpackConfig.resolve.root = cwd;
-  webpackConfig.resolve.alias = {
+  webpackConfig.resolve.alias = Object.assign({}, webpackConfig.resolve.alias, {
     [`${pkg.name}$`]: join(cwd, 'index.js'),
     [pkg.name]: cwd,
-  };
+  });
 
   webpackConfig.resolve.modulesDirectories.push(join(root, 'node_modules'));
   webpackConfig.resolveLoader.modulesDirectories.push(join(root, 'node_modules'));