cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: automatically version tsc-wrapped just like other packages (#19270)

Browse Source 
This removes manual steps from the release list.

I had to modify a few integration tests not to install compiler-cli dirrectly
because it depends on tsc-wrapped which yarn was eager to fetch from npm rather
than from the local build.

PR Close #19270
This commit is contained in:
Igor Minar 2017-09-19 09:30:23 -07:00
parent 49d122e560
commit 0a54713f8a
9 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -347,6 +347,10 @@ if [[ ${BUILD_TOOLS} == true ]]; then
$(npm bin)/tsc -p ${TSCONFIG}
cp ./tools/@angular/tsc-wrapped/package.json ./dist/tools/@angular/tsc-wrapped
echo "====== VERSION: Updating version references"
echo "====== EXECUTE: perl -p -i -e \"s/0\.0\.0\-PLACEHOLDER/${VERSION}/g\" $""(grep -ril 0\.0\.0\-PLACEHOLDER ./dist/tools/@angular/tsc-wrapped/package.json)"
perl -p -i -e "s/0\.0\.0\-PLACEHOLDER/${VERSION}/g" $(grep -ril 0\.0\.0\-PLACEHOLDER ./dist/tools/@angular/tsc-wrapped/package.json) < /dev/null 2> /dev/null
travisFoldEnd "build tools"
fi

4
integration/hello_world__closure/package.json
View File

@ -6,12 +6,12 @@
"@angular/animations": "file:../../dist/packages-dist/animations",
"@angular/common": "file:../../dist/packages-dist/common",
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
"google-closure-compiler": "20170409.0.0",
"reflect-metadata": "^0.1.2",
"rxjs": "5.3.1",
"typescript": "2.1.6",
"zone.js": "0.8.6"
@ -29,4 +29,4 @@
"preprotractor": "tsc -p e2e",
"protractor": "protractor e2e/protractor.config.js"
}
}
}

1
integration/language_service_plugin/package.json
View File

@ -7,7 +7,6 @@
"@angular/animations": "file:../../dist/packages-dist/animations",
"@angular/common": "file:../../dist/packages-dist/common",
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/language-service": "file:../../dist/packages-dist/language-service",
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",

9
integration/run_tests.sh
View File

@ -24,6 +24,15 @@ for testDir in $(ls | grep -v node_modules) ; do
# Workaround for https://github.com/yarnpkg/yarn/issues/2256
rm -f yarn.lock
yarn install --cache-folder ../$cache
# this is a workaround for resolving tsc-wrapped as the local version not available on npm
# tsc-wrapped is installed as a transitive dependency of compiler-cli
if [[ $testDir == "hello_world__closure" || $$testDir == "language_service_plugin" ]]; then
# compiler-cli needs to be installed while offline so that it doesn't try to look up tsc-wrapped version on npm
# it should instead use the version that is already installed in the project via package.json
yarn add --offline ../../dist/packages-dist/compiler-cli --cache-folder ../$cache
fi
yarn test || exit 1
)
done

1
integration/typings_test_ts21/package.json
View File

@ -7,7 +7,6 @@
"@angular/animations": "file:../../dist/packages-dist/animations",
"@angular/common": "file:../../dist/packages-dist/common",
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/forms": "file:../../dist/packages-dist/forms",
"@angular/http": "file:../../dist/packages-dist/http",

1
integration/typings_test_ts22/package.json
View File

@ -7,7 +7,6 @@
"@angular/animations": "file:../../dist/packages-dist/animations",
"@angular/common": "file:../../dist/packages-dist/common",
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/forms": "file:../../dist/packages-dist/forms",
"@angular/http": "file:../../dist/packages-dist/http",

1
integration/typings_test_ts23/package.json
View File

@ -7,7 +7,6 @@
"@angular/animations": "file:../../dist/packages-dist/animations",
"@angular/common": "file:../../dist/packages-dist/common",
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/forms": "file:../../dist/packages-dist/forms",
"@angular/http": "file:../../dist/packages-dist/http",

1
packages/platform-server/integrationtest/package.json
View File

@ -16,6 +16,7 @@
"@angular/http": "file:../../../dist/packages-dist/http",
"@angular/platform-browser": "file:../../../dist/packages-dist/platform-browser",
"@angular/platform-server": "file:../../../dist/packages-dist/platform-server",
"@angular/tsc-wrapped": "file:../../../dist/tools/@angular/tsc-wrapped",
"express": "^4.14.1",
"rxjs": "file:../../../node_modules/rxjs",
"typescript": "2.1.6",

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

@ -1,6 +1,6 @@
{
"name": "@angular/tsc-wrapped",
"version": "4.4.2",
"version": "0.0.0-PLACEHOLDER",
"description": "Wraps the tsc CLI, allowing extensions.",
"homepage": "https://github.com/angular/angular/blob/master/tools/@angular/tsc-wrapped",
"bugs": "https://github.com/angular/angular/issues",