Skip to content

Commit 60ecc02

Browse files
committedJun 7, 2019
misc: improve cjs
1 parent d154d0e commit 60ecc02

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed
 

‎packages/generators/init-generator.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,6 @@ export default class InitGenerator extends Generator {
7676
tooltip.splitChunks()
7777
);
7878

79-
if (!this.usingDefaults) {
80-
this.dependencies.push("terser-webpack-plugin");
81-
this.configuration.config.topScope.push(
82-
tooltip.terser(),
83-
"const TerserPlugin = require('terser-webpack-plugin');",
84-
"\n"
85-
);
86-
} else {
87-
this.dependencies.push("webpack-dev-server");
88-
this.configuration.config.webpackOptions.devServer = {
89-
open: true
90-
};
91-
}
92-
9379
(this.configuration.config.webpackOptions.plugins as string[]).push("new webpack.ProgressPlugin()");
9480
}
9581

@@ -151,7 +137,8 @@ export default class InitGenerator extends Generator {
151137
};
152138
} else {
153139
this.configuration.config.webpackOptions.output = {
154-
filename: "'bundle.js'"
140+
filename: "'bundle.js'",
141+
path: `path.resolve(__dirname, '${outputDir}')`
155142
};
156143
}
157144

@@ -231,8 +218,21 @@ export default class InitGenerator extends Generator {
231218
(this.configuration.config.webpackOptions.plugins as string[]).push(`new ${htmlwebpackPlugin}()`);
232219
}
233220

234-
let optimizationConfig = getDefaultOptimization(!this.usingDefaults);
235-
this.configuration.config.webpackOptions.optimization = optimizationConfig;
221+
if (!this.usingDefaults) {
222+
this.dependencies.push("webpack-dev-server");
223+
this.configuration.config.webpackOptions.devServer = {
224+
open: true
225+
};
226+
} else {
227+
this.dependencies.push("terser-webpack-plugin");
228+
this.configuration.config.topScope.push(
229+
tooltip.terser(),
230+
"const TerserPlugin = require('terser-webpack-plugin');",
231+
"\n"
232+
);
233+
}
234+
this.configuration.config.webpackOptions.optimization = getDefaultOptimization(this.usingDefaults);
235+
this.configuration.config.webpackOptions.mode = this.usingDefaults ? "'development'" : "'production'";
236236

237237
done();
238238
}

‎packages/generators/utils/webpackConfig.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ import { WebpackOptions } from "../types";
33
export function getDefaultOptimization(usingDefaults: boolean): WebpackOptions["optimization"] {
44
let optimizationOptions;
55
if (usingDefaults) {
6-
optimizationOptions = {
7-
minimizer: ["new TerserPlugin()"],
8-
splitChunks: {
9-
chunks: "'all'"
10-
}
11-
};
12-
} else {
136
optimizationOptions = {
147
splitChunks: {
158
cacheGroups: {
@@ -24,6 +17,13 @@ export function getDefaultOptimization(usingDefaults: boolean): WebpackOptions["
2417
name: !this.isProd
2518
}
2619
};
20+
} else {
21+
optimizationOptions = {
22+
minimizer: ["new TerserPlugin()"],
23+
splitChunks: {
24+
chunks: "'all'"
25+
}
26+
};
2727
}
2828
return optimizationOptions;
2929
}

0 commit comments

Comments
 (0)
Please sign in to comment.