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

build: upgrade to TypeScript 2.1 (#13294)

This commit is contained in:
Alex Eagle 2017-01-24 09:00:29 -08:00 committed by Miško Hevery
parent c33fda2607
commit 2ada3187a6
5 changed files with 28 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
npm-shrinkwrap.clean.json
View File

@ -6146,45 +6146,21 @@
"dev": true
},
"ts-api-guardian": {
"version": "0.1.4",
"version": "0.2.0",
"dev": true,
"dependencies": {
"ansi-regex": {
"version": "2.0.0",
"dev": true
},
"ansi-styles": {
"version": "2.2.1",
"dev": true
},
"chalk": {
"version": "1.1.3",
"dev": true
},
"diff": {
"version": "2.2.3",
"dev": true
},
"has-ansi": {
"version": "2.0.0",
"dev": true
},
"strip-ansi": {
"version": "3.0.1",
"dev": true
},
"supports-color": {
"version": "2.0.0",
"dev": true
},
"typescript": {
"version": "1.7.3",
"version": "2.0.10",
"dev": true
}
}
},
"tsickle": {
"version": "0.2.6",
"version": "0.21.1",
"dev": true,
"dependencies": {
"source-map": {
@ -6265,7 +6241,7 @@
"dev": true
},
"typescript": {
"version": "2.0.2",
"version": "2.1.5",
"dev": true
},
"ua-parser-js": {

68
npm-shrinkwrap.json generated
View File

@ -4631,7 +4631,7 @@
},
"mkdirp": {
"version": "0.5.1",
"from": "mkdirp@>=0.5.0 <0.6.0",
"from": "mkdirp@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
},
"ms": {
@ -4648,7 +4648,7 @@
},
"nopt": {
"version": "3.0.6",
"from": "nopt@>=3.0.1 <3.1.0",
"from": "nopt@>=3.0.6 <3.1.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"optional": true
},
@ -4716,7 +4716,7 @@
},
"rc": {
"version": "1.1.6",
"from": "rc@>=1.1.0 <1.2.0",
"from": "rc@>=1.1.6 <1.2.0",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
"optional": true,
"dependencies": {
@ -4818,7 +4818,7 @@
},
"tar": {
"version": "2.2.1",
"from": "tar@>=2.2.0 <2.3.0",
"from": "tar@>=2.2.1 <2.3.0",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
},
"tar-pack": {
@ -8988,65 +8988,29 @@
"dev": true
},
"ts-api-guardian": {
"version": "0.1.4",
"from": "ts-api-guardian@0.1.4",
"resolved": "https://registry.npmjs.org/ts-api-guardian/-/ts-api-guardian-0.1.4.tgz",
"version": "0.2.0",
"from": "ts-api-guardian@0.2.0",
"resolved": "https://registry.npmjs.org/ts-api-guardian/-/ts-api-guardian-0.2.0.tgz",
"dev": true,
"dependencies": {
"ansi-regex": {
"version": "2.0.0",
"from": "ansi-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
"dev": true
},
"ansi-styles": {
"version": "2.2.1",
"from": "ansi-styles@>=2.2.1 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"dev": true
},
"chalk": {
"version": "1.1.3",
"from": "chalk@>=1.1.3 <2.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"dev": true
},
"diff": {
"version": "2.2.3",
"from": "diff@>=2.2.3 <3.0.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz",
"dev": true
},
"has-ansi": {
"version": "2.0.0",
"from": "has-ansi@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"dev": true
},
"strip-ansi": {
"version": "3.0.1",
"from": "strip-ansi@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"dev": true
},
"supports-color": {
"version": "2.0.0",
"from": "supports-color@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"dev": true
},
"typescript": {
"version": "1.7.3",
"from": "typescript@1.7.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.tgz",
"version": "2.0.10",
"from": "typescript@2.0.10",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz",
"dev": true
}
}
},
"tsickle": {
"version": "0.2.6",
"from": "tsickle@0.2.6",
"resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.2.6.tgz",
"version": "0.21.1",
"from": "tsickle@0.21.1",
"resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.1.tgz",
"dev": true,
"dependencies": {
"source-map": {
@ -9161,9 +9125,9 @@
"dev": true
},
"typescript": {
"version": "2.0.2",
"from": "typescript@rc",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.2.tgz",
"version": "2.1.5",
"from": "typescript@>=2.1.0 <2.2.0",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz",
"dev": true
},
"ua-parser-js": {

6
package.json
View File

@ -85,11 +85,11 @@
"source-map": "^0.3.0",
"source-map-support": "^0.4.2",
"systemjs": "0.18.10",
"ts-api-guardian": "0.1.4",
"tsickle": "^0.2.6",
"ts-api-guardian": "^0.2.0",
"tsickle": "^0.21.1",
"tslint": "^4.1.1",
"tslint-eslint-rules": "^3.1.0",
"typescript": "^2.0.2",
"typescript": "^2.1.5",
"universal-analytics": "^0.3.9",
"vrsource-tslint-rules": "^4.0.0",
"webpack": "^1.12.6",

24
scripts/ci-lite/offline_compiler_test.sh
View File

@ -6,8 +6,8 @@ LINKABLE_PKGS=(
$(pwd)/dist/packages-dist/{common,forms,core,compiler,compiler-cli,platform-{browser,server},platform-browser-dynamic,router}
$(pwd)/dist/tools/@angular/tsc-wrapped
)
TYPESCRIPT_2_0=typescript@2.0.2
TYPESCRIPT_2_1=typescript@2.1.4
TYPESCRIPT_2_1=typescript@2.1.5
PKGS=(
reflect-metadata@0.1.8
zone.js@0.6.25
@ -31,7 +31,7 @@ cp -v package.json $TMP
(
cd $TMP
set -ex -o pipefail
npm install ${PKGS[*]} $TYPESCRIPT_2_0
npm install ${PKGS[*]} $TYPESCRIPT_2_1
# TODO(alexeagle): allow this to be npm link instead
npm install ${LINKABLE_PKGS[*]}
@ -63,21 +63,3 @@ cp -v package.json $TMP
mv tsconfig-build.json othername.json
./node_modules/.bin/ngc -p othername.json
)
# Repeat selected parts of the above with TypeScript 2.1
readonly TMP_2_1=$TMPDIR/e2e_test.$(date +%s)
mkdir -p $TMP_2_1
cp -R -v modules/@angular/compiler-cli/integrationtest/* $TMP_2_1
cp -R -v modules/benchmarks $TMP_2_1
cp -v package.json $TMP_2_1
(
cd $TMP_2_1
set -ex -o pipefail
npm install ${PKGS[*]} $TYPESCRIPT_2_1
npm install ${LINKABLE_PKGS[*]}
./node_modules/.bin/tsc --version
node ./node_modules/@angular/tsc-wrapped/src/main -p third_party_src/tsconfig-build.json
./node_modules/.bin/ngc -p tsconfig-build.json --i18nFile=src/messages.fi.xlf --locale=fi --i18nFormat=xlf
)

4
tools/@angular/tsc-wrapped/package.json
View File

@ -11,9 +11,9 @@
"license": "MIT",
"repository": {"type":"git","url":"https://github.com/angular/angular.git"},
"dependencies": {
"tsickle": "^0.2"
"tsickle": "^0.21.0"
},
"peerDependencies": {
"typescript": "^2.0.2"
"typescript": "^2.1.5"
}
}