Skip to content

Commit

Permalink
misc: improve cjs
Browse files Browse the repository at this point in the history
  • Loading branch information
evenstensberg committed Jun 7, 2019
1 parent d154d0e commit 60ecc02
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
34 changes: 17 additions & 17 deletions packages/generators/init-generator.ts
Expand Up @@ -76,20 +76,6 @@ export default class InitGenerator extends Generator {
tooltip.splitChunks()
);

if (!this.usingDefaults) {
this.dependencies.push("terser-webpack-plugin");
this.configuration.config.topScope.push(
tooltip.terser(),
"const TerserPlugin = require('terser-webpack-plugin');",
"\n"
);
} else {
this.dependencies.push("webpack-dev-server");
this.configuration.config.webpackOptions.devServer = {
open: true
};
}

(this.configuration.config.webpackOptions.plugins as string[]).push("new webpack.ProgressPlugin()");
}

Expand Down Expand Up @@ -151,7 +137,8 @@ export default class InitGenerator extends Generator {
};
} else {
this.configuration.config.webpackOptions.output = {
filename: "'bundle.js'"
filename: "'bundle.js'",
path: `path.resolve(__dirname, '${outputDir}')`
};
}

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

let optimizationConfig = getDefaultOptimization(!this.usingDefaults);
this.configuration.config.webpackOptions.optimization = optimizationConfig;
if (!this.usingDefaults) {
this.dependencies.push("webpack-dev-server");
this.configuration.config.webpackOptions.devServer = {
open: true
};
} else {
this.dependencies.push("terser-webpack-plugin");
this.configuration.config.topScope.push(
tooltip.terser(),
"const TerserPlugin = require('terser-webpack-plugin');",
"\n"
);
}
this.configuration.config.webpackOptions.optimization = getDefaultOptimization(this.usingDefaults);
this.configuration.config.webpackOptions.mode = this.usingDefaults ? "'development'" : "'production'";

done();
}
Expand Down
14 changes: 7 additions & 7 deletions packages/generators/utils/webpackConfig.ts
Expand Up @@ -3,13 +3,6 @@ import { WebpackOptions } from "../types";
export function getDefaultOptimization(usingDefaults: boolean): WebpackOptions["optimization"] {
let optimizationOptions;
if (usingDefaults) {
optimizationOptions = {
minimizer: ["new TerserPlugin()"],
splitChunks: {
chunks: "'all'"
}
};
} else {
optimizationOptions = {
splitChunks: {
cacheGroups: {
Expand All @@ -24,6 +17,13 @@ export function getDefaultOptimization(usingDefaults: boolean): WebpackOptions["
name: !this.isProd
}
};
} else {
optimizationOptions = {
minimizer: ["new TerserPlugin()"],
splitChunks: {
chunks: "'all'"
}
};
}
return optimizationOptions;
}

0 comments on commit 60ecc02

Please sign in to comment.