Skip to content

Commit 88804b6

Browse files
alan-agius4alexeagle
authored andcommitted
build: update repo to use typescript 3.0.x
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`.
1 parent 58977a1 commit 88804b6

File tree

5 files changed

+66
-58
lines changed

5 files changed

+66
-58
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"glob": "^7.0.3",
6262
"temp": "^0.8.3",
6363
"tslint": "^5.11.0",
64-
"typescript": "~2.9.2"
64+
"typescript": "~3.0.1"
6565
},
6666
"devDependencies": {
6767
"@bazel/typescript": "0.16.1",

packages/angular_devkit/build_angular/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@
5959
"node-sass": "^4.9.3"
6060
},
6161
"devDependencies": {
62-
"@angular/animations": "^6.1.0",
62+
"@angular/animations": "^7.0.0-beta.4",
6363
"@angular/cdk": "^6.1.0",
64-
"@angular/common": "^6.1.0",
65-
"@angular/compiler": "^6.1.0",
66-
"@angular/compiler-cli": "^6.1.0",
67-
"@angular/core": "^6.1.0",
68-
"@angular/http": "^6.1.0",
64+
"@angular/common": "^7.0.0-beta.4",
65+
"@angular/compiler": "^7.0.0-beta.4",
66+
"@angular/compiler-cli": "^7.0.0-beta.4",
67+
"@angular/core": "^7.0.0-beta.4",
68+
"@angular/http": "^7.0.0-beta.4",
6969
"@angular/material": "^6.1.0",
70-
"@angular/platform-browser": "^6.1.0",
71-
"@angular/platform-browser-dynamic": "^6.1.0",
72-
"@angular/platform-server": "^6.1.0",
73-
"@angular/router": "^6.1.0",
74-
"@angular/service-worker": "^6.1.0",
70+
"@angular/platform-browser": "^7.0.0-beta.4",
71+
"@angular/platform-browser-dynamic": "^7.0.0-beta.4",
72+
"@angular/platform-server": "^7.0.0-beta.4",
73+
"@angular/router": "^7.0.0-beta.4",
74+
"@angular/service-worker": "^7.0.0-beta.4",
7575
"codelyzer": "^4.2.1",
7676
"core-js": "^2.4.1",
7777
"bootstrap": "^4.0.0",

packages/angular_devkit/build_ng_packagr/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
1616
},
1717
"devDependencies": {
18-
"@angular/compiler": "^6.1.0",
19-
"@angular/compiler-cli": "^6.1.0",
18+
"@angular/compiler": "^7.0.0-beta.4",
19+
"@angular/compiler-cli": "^7.0.0-beta.4",
2020
"ng-packagr": "^4.1.0",
2121
"tsickle": ">=0.27.3",
2222
"tslib": "^1.9.0"

packages/schematics/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"dependencies": {
1212
"@angular-devkit/core": "0.0.0",
1313
"@angular-devkit/schematics": "0.0.0",
14-
"typescript": ">=2.6.2 <2.10"
14+
"typescript": ">=2.6.2 <3.1"
1515
}
1616
}

yarn.lock

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# yarn lockfile v1
33

44

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

@@ -14,36 +14,38 @@
1414
dependencies:
1515
tslib "^1.7.1"
1616

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

23-
"@angular/compiler-cli@^6.1.0":
24-
version "6.1.2"
25-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.1.2.tgz#00829df848210a8a06c3641428f36525fdf41e53"
23+
"@angular/compiler-cli@^7.0.0-beta.4":
24+
version "7.0.0-beta.4"
25+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.4.tgz#43ca2c585c903f5c219b7903b2ceabd3d4fb3d48"
2626
dependencies:
2727
chokidar "^1.4.2"
28+
convert-source-map "^1.5.1"
29+
magic-string "^0.25.0"
2830
minimist "^1.2.0"
2931
reflect-metadata "^0.1.2"
30-
tsickle "^0.32.1"
32+
source-map "^0.6.1"
3133

32-
"@angular/compiler@^6.1.0":
33-
version "6.1.2"
34-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.1.2.tgz#56fada04cb7dc77a5d3f0b786be713130293d468"
34+
"@angular/compiler@^7.0.0-beta.4":
35+
version "7.0.0-beta.4"
36+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-beta.4.tgz#f61a1e15db3e895ea6e8be98a01b261924b87bd7"
3537
dependencies:
3638
tslib "^1.9.0"
3739

38-
"@angular/core@^6.1.0":
39-
version "6.1.2"
40-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.1.2.tgz#412dd32a91ec1d5d6db508babbb36e9799235d8d"
40+
"@angular/core@^7.0.0-beta.4":
41+
version "7.0.0-beta.4"
42+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-beta.4.tgz#797edfc2c59bca443eac0a277cde328f3c704b91"
4143
dependencies:
4244
tslib "^1.9.0"
4345

44-
"@angular/http@^6.1.0":
45-
version "6.1.2"
46-
resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.1.2.tgz#2e0e376686f4bf51ef043856b26679e88d7a92b9"
46+
"@angular/http@^7.0.0-beta.4":
47+
version "7.0.0-beta.4"
48+
resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-beta.4.tgz#72230abac0b97c32cb9d3e98a0855d26f332ee79"
4749
dependencies:
4850
tslib "^1.9.0"
4951

@@ -55,35 +57,35 @@
5557
optionalDependencies:
5658
parse5 "^5.0.0"
5759

58-
"@angular/platform-browser-dynamic@^6.1.0":
59-
version "6.1.2"
60-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.2.tgz#76d813e6ab577ce1ffdb31e88d37df9a5177f55c"
60+
"@angular/platform-browser-dynamic@^7.0.0-beta.4":
61+
version "7.0.0-beta.4"
62+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.4.tgz#2d930f01aca9bd12fccb20754952df1af3acb02f"
6163
dependencies:
6264
tslib "^1.9.0"
6365

64-
"@angular/platform-browser@^6.1.0":
65-
version "6.1.2"
66-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.1.2.tgz#9a2a498e27e2bcd0fc8d6c696340c258f8b3e322"
66+
"@angular/platform-browser@^7.0.0-beta.4":
67+
version "7.0.0-beta.4"
68+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-beta.4.tgz#bea6218c7d2b549a2d29bf5ba59df7d398f116bb"
6769
dependencies:
6870
tslib "^1.9.0"
6971

70-
"@angular/platform-server@^6.1.0":
71-
version "6.1.2"
72-
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.1.2.tgz#f8954c5720169c4a2433cb73678c8a8709b12271"
72+
"@angular/platform-server@^7.0.0-beta.4":
73+
version "7.0.0-beta.4"
74+
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-beta.4.tgz#71702fd37182a5638ea13e9eb2c7312f54762ad1"
7375
dependencies:
7476
domino "^2.0.1"
7577
tslib "^1.9.0"
7678
xhr2 "^0.1.4"
7779

78-
"@angular/router@^6.1.0":
79-
version "6.1.2"
80-
resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.1.2.tgz#5e9e12225b41940fe346675caf1ed15033738abc"
80+
"@angular/router@^7.0.0-beta.4":
81+
version "7.0.0-beta.4"
82+
resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-beta.4.tgz#becbdf90fae1be20da598cdb2ad69179d9e66901"
8183
dependencies:
8284
tslib "^1.9.0"
8385

84-
"@angular/service-worker@^6.1.0":
85-
version "6.1.2"
86-
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-6.1.2.tgz#11b1b93a040ae20218feb3ea45b2aca792c6e1c1"
86+
"@angular/service-worker@^7.0.0-beta.4":
87+
version "7.0.0-beta.4"
88+
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-beta.4.tgz#c4c37f211a325c32c0d59031b63ca64822a46a9f"
8789
dependencies:
8890
tslib "^1.9.0"
8991

@@ -1914,7 +1916,7 @@ conventional-commits-parser@^3.0.0:
19141916
through2 "^2.0.0"
19151917
trim-off-newlines "^1.0.0"
19161918

1917-
convert-source-map@^1.5.0:
1919+
convert-source-map@^1.5.0, convert-source-map@^1.5.1:
19181920
version "1.5.1"
19191921
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
19201922

@@ -4663,6 +4665,12 @@ magic-string@^0.22.4:
46634665
dependencies:
46644666
vlq "^0.2.2"
46654667

4668+
magic-string@^0.25.0:
4669+
version "0.25.0"
4670+
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
4671+
dependencies:
4672+
sourcemap-codec "^1.4.1"
4673+
46664674
make-dir@^1.0.0:
46674675
version "1.3.0"
46684676
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -6795,6 +6803,10 @@ source-map@~0.2.0:
67956803
dependencies:
67966804
amdefine ">=0.0.4"
67976805

6806+
sourcemap-codec@^1.4.1:
6807+
version "1.4.1"
6808+
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
6809+
67986810
spdx-compare@^1.0.0:
67996811
version "1.0.0"
68006812
resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
@@ -7311,7 +7323,7 @@ ts-node@^5.0.0:
73117323
source-map-support "^0.5.3"
73127324
yn "^2.0.0"
73137325

7314-
[email protected], tsickle@>=0.27.3, tsickle@^0.32.1:
7326+
[email protected], tsickle@>=0.27.3:
73157327
version "0.32.1"
73167328
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
73177329
dependencies:
@@ -7395,13 +7407,9 @@ typedarray@^0.0.6:
73957407
version "0.0.6"
73967408
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
73977409

7398-
"typescript@>=2.6.2 <2.10", typescript@~2.9.2:
7399-
version "2.9.2"
7400-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
7401-
7402-
typescript@~2.6.2:
7403-
version "2.6.2"
7404-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
7410+
"typescript@>=2.6.2 <3.1", typescript@~3.0.1:
7411+
version "3.0.3"
7412+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
74057413

74067414
uglify-es@^3.3.4:
74077415
version "3.3.9"

0 commit comments

Comments
 (0)