upgrade to angular6

This commit is contained in:
lotte
2018-08-24 13:26:43 +02:00
parent 9fbbf53661
commit 2cbe6a6d91
180 changed files with 2987 additions and 2450 deletions

View File

@@ -8,9 +8,8 @@ const {
getAotPlugin
} = require('./webpack/webpack.aot');
module.exports = function(options, webpackOptions) {
module.exports = function(options) {
options = options || {};
if (options.aot) {
console.log(`Running build for ${options.client ? 'client' : 'server'} with AoT Compilation`)
}
@@ -29,7 +28,7 @@ module.exports = function(options, webpackOptions) {
]
});
if (webpackOptions.p) {
if (options.mode === 'production') {
serverConfig = webpackMerge({}, serverConfig, prodPartial);
clientConfig = webpackMerge({}, clientConfig, prodPartial);
}