Skip to content

Commit cca344d

Browse files
authored
Merge pull request #42 from qiuyuntao/master
feat:keep webpack alias and plugins instead of create new
2 parents dbc3775 + bf50890 commit cca344d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "atool-doc",
3-
"version": "0.7.4",
3+
"version": "0.7.5",
44
"description": "Static demo site generator based on atool-build & dora.",
55
"keywords": [
66
"atool",

src/getWebpackConfig.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ export default function (source, asset, dest, cwd, tpl, config) {
5151
webpackConfig.demoSource = source;
5252

5353
webpackConfig.resolve.root = cwd;
54-
webpackConfig.resolve.alias = {
54+
webpackConfig.resolve.alias = Object.assign({}, webpackConfig.resolve.alias, {
5555
[`${pkg.name}$`]: join(cwd, 'index.js'),
5656
[pkg.name]: cwd,
57-
};
57+
});
5858

5959
webpackConfig.resolve.modulesDirectories.push(join(root, 'node_modules'));
6060
webpackConfig.resolveLoader.modulesDirectories.push(join(root, 'node_modules'));

0 commit comments

Comments
 (0)