Skip to content

Commit

Permalink
build: update repo to use typescript 3.0.x
Browse files Browse the repository at this point in the history 
Updated `@angular/<packages>` to `^7.0.0-beta.4` since we need this to be able to run the tests. Due to the `@angular/compiler` in `v6` doesn't support `typescript` `3.0.x`.
  • Loading branch information
@alan-agius4 @alexeagle
alan-agius4 authored and alexeagle committed Sep 6, 2018
1 parent 58977a1 commit 88804b6
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 58 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"glob": "^7.0.3",
"temp": "^0.8.3",
"tslint": "^5.11.0",
"typescript": "~2.9.2"
"typescript": "~3.0.1"
},
"devDependencies": {
"@bazel/typescript": "0.16.1",
Expand Down
22 changes: 11 additions & 11 deletions packages/angular_devkit/build_angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@
"node-sass": "^4.9.3"
},
"devDependencies": {
"@angular/animations": "^6.1.0",
"@angular/animations": "^7.0.0-beta.4",
"@angular/cdk": "^6.1.0",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/compiler-cli": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/common": "^7.0.0-beta.4",
"@angular/compiler": "^7.0.0-beta.4",
"@angular/compiler-cli": "^7.0.0-beta.4",
"@angular/core": "^7.0.0-beta.4",
"@angular/http": "^7.0.0-beta.4",
"@angular/material": "^6.1.0",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/platform-server": "^6.1.0",
"@angular/router": "^6.1.0",
"@angular/service-worker": "^6.1.0",
"@angular/platform-browser": "^7.0.0-beta.4",
"@angular/platform-browser-dynamic": "^7.0.0-beta.4",
"@angular/platform-server": "^7.0.0-beta.4",
"@angular/router": "^7.0.0-beta.4",
"@angular/service-worker": "^7.0.0-beta.4",
"codelyzer": "^4.2.1",
"core-js": "^2.4.1",
"bootstrap": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_ng_packagr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
},
"devDependencies": {
"@angular/compiler": "^6.1.0",
"@angular/compiler-cli": "^6.1.0",
"@angular/compiler": "^7.0.0-beta.4",
"@angular/compiler-cli": "^7.0.0-beta.4",
"ng-packagr": "^4.1.0",
"tsickle": ">=0.27.3",
"tslib": "^1.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"dependencies": {
"@angular-devkit/core": "0.0.0",
"@angular-devkit/schematics": "0.0.0",
"typescript": ">=2.6.2 <2.10"
"typescript": ">=2.6.2 <3.1"
}
}
94 changes: 51 additions & 43 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# yarn lockfile v1


"@angular/animations@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.1.2.tgz#31070ac85bca47e3feab887fed8872c147fcf63e"
"@angular/animations@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-beta.4.tgz#98a8c709604f4023f888a33205e01790015953a0"
dependencies:
tslib "^1.9.0"

Expand All @@ -14,36 +14,38 @@
dependencies:
tslib "^1.7.1"

"@angular/common@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.1.2.tgz#6e3bd4b16975dbb4ba67e2fc7589d0a036e5df12"
"@angular/common@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-beta.4.tgz#e7d6526e1034fb7eb7926dcff0b8205284b40854"
dependencies:
tslib "^1.9.0"

"@angular/compiler-cli@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.1.2.tgz#00829df848210a8a06c3641428f36525fdf41e53"
"@angular/compiler-cli@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.4.tgz#43ca2c585c903f5c219b7903b2ceabd3d4fb3d48"
dependencies:
chokidar "^1.4.2"
convert-source-map "^1.5.1"
magic-string "^0.25.0"
minimist "^1.2.0"
reflect-metadata "^0.1.2"
tsickle "^0.32.1"
source-map "^0.6.1"

"@angular/compiler@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.1.2.tgz#56fada04cb7dc77a5d3f0b786be713130293d468"
"@angular/compiler@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-beta.4.tgz#f61a1e15db3e895ea6e8be98a01b261924b87bd7"
dependencies:
tslib "^1.9.0"

"@angular/core@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.1.2.tgz#412dd32a91ec1d5d6db508babbb36e9799235d8d"
"@angular/core@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-beta.4.tgz#797edfc2c59bca443eac0a277cde328f3c704b91"
dependencies:
tslib "^1.9.0"

"@angular/http@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.1.2.tgz#2e0e376686f4bf51ef043856b26679e88d7a92b9"
"@angular/http@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-beta.4.tgz#72230abac0b97c32cb9d3e98a0855d26f332ee79"
dependencies:
tslib "^1.9.0"

Expand All @@ -55,35 +57,35 @@
optionalDependencies:
parse5 "^5.0.0"

"@angular/platform-browser-dynamic@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.2.tgz#76d813e6ab577ce1ffdb31e88d37df9a5177f55c"
"@angular/platform-browser-dynamic@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.4.tgz#2d930f01aca9bd12fccb20754952df1af3acb02f"
dependencies:
tslib "^1.9.0"

"@angular/platform-browser@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.1.2.tgz#9a2a498e27e2bcd0fc8d6c696340c258f8b3e322"
"@angular/platform-browser@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-beta.4.tgz#bea6218c7d2b549a2d29bf5ba59df7d398f116bb"
dependencies:
tslib "^1.9.0"

"@angular/platform-server@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.1.2.tgz#f8954c5720169c4a2433cb73678c8a8709b12271"
"@angular/platform-server@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-beta.4.tgz#71702fd37182a5638ea13e9eb2c7312f54762ad1"
dependencies:
domino "^2.0.1"
tslib "^1.9.0"
xhr2 "^0.1.4"

"@angular/router@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.1.2.tgz#5e9e12225b41940fe346675caf1ed15033738abc"
"@angular/router@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-beta.4.tgz#becbdf90fae1be20da598cdb2ad69179d9e66901"
dependencies:
tslib "^1.9.0"

"@angular/service-worker@^6.1.0":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-6.1.2.tgz#11b1b93a040ae20218feb3ea45b2aca792c6e1c1"
"@angular/service-worker@^7.0.0-beta.4":
version "7.0.0-beta.4"
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-beta.4.tgz#c4c37f211a325c32c0d59031b63ca64822a46a9f"
dependencies:
tslib "^1.9.0"

Expand Down Expand Up @@ -1914,7 +1916,7 @@ conventional-commits-parser@^3.0.0:
through2 "^2.0.0"
trim-off-newlines "^1.0.0"

convert-source-map@^1.5.0:
convert-source-map@^1.5.0, convert-source-map@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"

Expand Down Expand Up @@ -4663,6 +4665,12 @@ magic-string@^0.22.4:
dependencies:
vlq "^0.2.2"

magic-string@^0.25.0:
version "0.25.0"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
dependencies:
sourcemap-codec "^1.4.1"

make-dir@^1.0.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
Expand Down Expand Up @@ -6795,6 +6803,10 @@ source-map@~0.2.0:
dependencies:
amdefine ">=0.0.4"

sourcemap-codec@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"

spdx-compare@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
Expand Down Expand Up @@ -7311,7 +7323,7 @@ ts-node@^5.0.0:
source-map-support "^0.5.3"
yn "^2.0.0"

tsickle@0.32.1, tsickle@>=0.27.3, tsickle@^0.32.1:
tsickle@0.32.1, tsickle@>=0.27.3:
version "0.32.1"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
dependencies:
Expand Down Expand Up @@ -7395,13 +7407,9 @@ typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

"typescript@>=2.6.2 <2.10", typescript@~2.9.2:
version "2.9.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"

typescript@~2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
"typescript@>=2.6.2 <3.1", typescript@~3.0.1:
version "3.0.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"

uglify-es@^3.3.4:
version "3.3.9"
Expand Down

0 comments on commit 88804b6

Please sign in to comment.