honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build(aio): upgrade to @angular/cli@1.5.0-rc.2 (#19702) 

-rw-r--r--  1 iminar  eng   84219 Oct 19 21:37 dist/0.0f327734d18211139822.chunk.js
-rw-r--r--  1 iminar  eng   14942 Oct 19 21:37 dist/4.c719ac5645940382cdce.chunk.js
-rw-r--r--  1 iminar  eng    1560 Oct 19 21:37 dist/inline.887757679ff553e20b54.bundle.js
-rw-r--r--  1 iminar  eng  492354 Oct 19 21:37 dist/main.5e5dc9ed980c9f5dc2bd.bundle.js
-rw-r--r--  1 iminar  eng   37402 Oct 19 21:37 dist/polyfills.f8409a9eb69060ac1aa6.bundle.js

PR Close #19702
This commit is contained in:
Igor Minar 2017-10-19 21:39:53 -07:00 committed by Matias Niemelä
parent e18bfd1f3d
commit 10c1c2ba5a
4 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aio/package.json
View File

@ -88,7 +88,7 @@
"zone.js": "^0.8.16"
},
"devDependencies": {
"@angular/cli": "1.5.0-rc.1",
"@angular/cli": "1.5.0-rc.2",
"@angular/compiler-cli": "^5.0.0-beta.3",
"@types/jasmine": "^2.5.52",
"@types/node": "~6.0.60",

7
aio/tools/cli-patches/patch.js
View File

@ -3,8 +3,7 @@ const sh = require('shelljs');
const PATCH_LOCK = 'node_modules/@angular/cli/models/webpack-configs/.patched';
if (!fs.existsSync(PATCH_LOCK)) {
sh.exec('patch -p0 -i tools/cli-patches/rxjs-esm-aliases.patch');
sh.touch(PATCH_LOCK);
}
// if (!fs.existsSync(PATCH_LOCK)) {
// sh.touch(PATCH_LOCK);
// }

11
aio/tools/cli-patches/rxjs-esm-aliases.patch
View File

@ -1,11 +0,0 @@
--- node_modules/@angular/cli/models/webpack-configs/common.js 2017-10-13 14:21:57.000000000 -0700
+++ node_modules/@angular/cli/models/webpack-configs/common.js 2017-10-13 14:31:30.000000000 -0700
@@ -135,6 +135,7 @@
extensions: ['.ts', '.js'],
modules: ['node_modules', nodeModules],
symlinks: !buildOptions.preserveSymlinks
+ ,alias: require('rxjs/_esm5/path-mapping')(path.resolve(__dirname, '..', '..', '..', '..', '..', 'node_modules'))
},
resolveLoader: {
modules: [nodeModules, 'node_modules']

24
aio/yarn.lock
View File

@ -38,15 +38,15 @@
dependencies:
tslib "^1.7.1"
"@angular/cli@1.5.0-rc.1":
version "1.5.0-rc.1"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.5.0-rc.1.tgz#6aa9b69a65a63b2a11d2c83eb93103a078fe7b24"
"@angular/cli@1.5.0-rc.2":
version "1.5.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.5.0-rc.2.tgz#8f060dd4d958495398f6a9d747da3566e0a0bad9"
dependencies:
"@angular-devkit/build-optimizer" "~0.0.28"
"@angular-devkit/schematics" "~0.0.34"
"@ngtools/json-schema" "1.1.0"
"@ngtools/webpack" "1.8.0-rc.1"
"@schematics/angular" "~0.0.46"
"@ngtools/webpack" "1.8.0-rc.2"
"@schematics/angular" "~0.0.48"
autoprefixer "^6.5.3"
chalk "^2.0.1"
circular-dependency-plugin "^3.0.0"
@ -184,9 +184,9 @@
version "1.1.0"
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
"@ngtools/webpack@1.8.0-rc.1":
version "1.8.0-rc.1"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.8.0-rc.1.tgz#5936cc5465c77837081d47b5de8abee0ef783a6c"
"@ngtools/webpack@1.8.0-rc.2":
version "1.8.0-rc.2"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.8.0-rc.2.tgz#b49498837d6d4abd5602b874a3d67be4e97857c5"
dependencies:
chalk "^2.0.1"
enhanced-resolve "^3.1.0"
@ -196,9 +196,11 @@
source-map "^0.5.6"
tree-kill "^1.0.0"
"@schematics/angular@~0.0.46":
version "0.0.46"
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.0.46.tgz#a177dbed008860d455f586eccc82dbc34685b407"
"@schematics/angular@~0.0.48":
version "0.0.48"
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.0.48.tgz#6fa1bfb2676ba34c243811d2083173821d3cf07c"
dependencies:
"@angular-devkit/core" "0.0.20"
"@types/jasmine@^2.5.52":
version "2.5.52"