Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto version tsc-wrapped #19270

Closed
wants to merge 2 commits into from
Closed

Auto version tsc-wrapped #19270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b7453c
build: automatically version tsc-wrapped just like other packages
IgorMinar Sep 19, 2017
ad2d603
ci: update yarn to 1.0.2
IgorMinar Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion aio/package.json
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@
},
"engines": {
"node": ">=6.9.5 <7.0.0",
"yarn": ">=0.21.3 <1.0.0"
"yarn": ">=1.0.2 <2.0.0"
},
"private": true,
"dependencies": {
Expand Down
4 changes: 4 additions & 0 deletions build.sh
View file
Open in desktop
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions integration/hello_world__closure/package.json
View file
Open in desktop
Expand Up @@ -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"
Expand All @@ -29,4 +29,4 @@
"preprotractor": "tsc -p e2e",
"protractor": "protractor e2e/protractor.config.js"
}
}
}
1 change: 0 additions & 1 deletion integration/language_service_plugin/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions integration/run_tests.sh
View file
Open in desktop
Expand Up @@ -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 change: 0 additions & 1 deletion integration/typings_test_ts21/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion integration/typings_test_ts22/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion integration/typings_test_ts23/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
"engines": {
"node": ">=6.9.5 <7.0.0",
"npm": ">=3.10.7 <4.0.0",
"yarn": ">=0.21.3 <1.0.0"
"yarn": ">=1.0.2 <2.0.0"
},
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/platform-server/integrationtest/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/env.sh
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ fi

setEnvVar NODE_VERSION 6.9.5
setEnvVar NPM_VERSION 3.10.7 # do not upgrade to >3.10.8 unless https://github.com/npm/npm/issues/14042 is resolved
setEnvVar YARN_VERSION 0.24.6
setEnvVar YARN_VERSION 1.0.2
setEnvVar SAUCE_CONNECT_VERSION 4.3.11
setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)

Expand Down
2 changes: 1 addition & 1 deletion tools/@angular/tsc-wrapped/package.json
View file
Open in desktop
@@ -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",
Expand Down