diff --git a/packages/angular-cli/blueprints/ng2/files/package.json b/packages/angular-cli/blueprints/ng2/files/package.json index 1bbbb1f52530..a39e327733d7 100644 --- a/packages/angular-cli/blueprints/ng2/files/package.json +++ b/packages/angular-cli/blueprints/ng2/files/package.json @@ -20,7 +20,7 @@ "@angular/http": "~2.3.1", "@angular/platform-browser": "~2.3.1", "@angular/platform-browser-dynamic": "~2.3.1", - "@angular/router": "3.2.3", + "@angular/router": "~3.3.1", "core-js": "^2.4.1", "rxjs": "5.0.0-rc.4", "ts-helpers": "^1.1.1", diff --git a/packages/angular-cli/models/webpack-build-production.ts b/packages/angular-cli/models/webpack-build-production.ts index 12bc762e4130..1ec187c372b8 100644 --- a/packages/angular-cli/models/webpack-build-production.ts +++ b/packages/angular-cli/models/webpack-build-production.ts @@ -1,6 +1,5 @@ import * as path from 'path'; import * as webpack from 'webpack'; -const WebpackMd5Hash = require('webpack-md5-hash'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); import {CompressionPlugin} from '../lib/webpack/compression-plugin'; const autoprefixer = require('autoprefixer'); @@ -30,7 +29,6 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, }, plugins: [ new ExtractTextPlugin('[name].[chunkhash].bundle.css'), - new WebpackMd5Hash(), new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }), diff --git a/tests/e2e/assets/webpack/test-app-weird/package.json b/tests/e2e/assets/webpack/test-app-weird/package.json index 8e70c25f017b..94e310fd05b0 100644 --- a/tests/e2e/assets/webpack/test-app-weird/package.json +++ b/tests/e2e/assets/webpack/test-app-weird/package.json @@ -10,7 +10,7 @@ "@angular/platform-browser": "~2.3.1", "@angular/platform-browser-dynamic": "~2.3.1", "@angular/platform-server": "~2.3.1", - "@angular/router": "~3.2.3", + "@angular/router": "~3.3.1", "@ngtools/webpack": "0.0.0", "core-js": "^2.4.1", "rxjs": "5.0.0-rc.4", diff --git a/tests/e2e/assets/webpack/test-app/package.json b/tests/e2e/assets/webpack/test-app/package.json index 97e03f5e8f6a..b0bda39cf79a 100644 --- a/tests/e2e/assets/webpack/test-app/package.json +++ b/tests/e2e/assets/webpack/test-app/package.json @@ -10,7 +10,7 @@ "@angular/platform-browser": "~2.3.1", "@angular/platform-browser-dynamic": "~2.3.1", "@angular/platform-server": "~2.3.1", - "@angular/router": "~3.2.3", + "@angular/router": "~3.3.1", "@ngtools/webpack": "0.0.0", "core-js": "^2.4.1", "rxjs": "5.0.0-rc.4", diff --git a/tests/e2e/tests/build/chunk-hash.ts b/tests/e2e/tests/build/chunk-hash.ts new file mode 100644 index 000000000000..2b141cfc8509 --- /dev/null +++ b/tests/e2e/tests/build/chunk-hash.ts @@ -0,0 +1,48 @@ +import * as fs from 'fs'; + +import {ng} from '../../utils/process'; +import {writeFile} from '../../utils/fs'; + + +export default function() { + const oldHashes: {[module: string]: string} = {}; + const newHashes: {[module: string]: string} = {}; + // First, collect the hashes. + return ng('build', '--prod') + .then(() => { + fs.readdirSync('./dist') + .forEach(name => { + if (!name.match(/(main|inline|vendor)\.[a-z0-9]+\.bundle\.js/)) { + return; + } + + const [module, hash] = name.split('.'); + oldHashes[module] = hash; + }); + }) + .then(() => writeFile('src/app/app.component.css', 'body { background: red; }')) + .then(() => ng('build', '--prod')) + .then(() => { + fs.readdirSync('./dist') + .forEach(name => { + if (!name.match(/(main|inline|vendor)\.[a-z0-9]+\.bundle\.js/)) { + return; + } + + const [module, hash] = name.split('.'); + newHashes[module] = hash; + }); + }) + .then(() => { + console.log(' Validating hashes...'); + console.log(` Old hashes: ${JSON.stringify(oldHashes)}`); + console.log(` New hashes: ${JSON.stringify(newHashes)}`); + + Object.keys(oldHashes) + .forEach(module => { + if (oldHashes[module] == newHashes[module]) { + throw new Error(`Module "${module}" did not change hash (${oldHashes[module]})...`); + } + }); + }); +}