Skip to content

Commit 1247a29

Browse files
chore(package): Switch angular semver to v5-v6, use v5 for building
1 parent cdf0273 commit 1247a29

File tree

2 files changed

+53
-48
lines changed

2 files changed

+53
-48
lines changed

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"build": "run-s compile bundle fixmaps:*",
1212
"release": "release --deps @uirouter/core",
1313
"test": "karma start",
14-
"test:downstream": "npm run build && test_downstream_projects --workspace",
14+
"test:downstream": "test_downstream_projects --workspace",
1515
"debug": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1 --browsers=Chrome",
1616
"package": "npm run build",
1717
"docs": "generate_docs",
@@ -53,20 +53,20 @@
5353
"@uirouter/rx": "0.5.0-alpha.1"
5454
},
5555
"peerDependencies": {
56-
"@angular/common": "^6.0.0",
57-
"@angular/core": "^6.0.0",
58-
"@angular/router": "^6.0.0"
56+
"@angular/common": "^5.0.0 || ^6.0.0",
57+
"@angular/core": "^5.0.0 || ^6.0.0",
58+
"@angular/router": "^5.0.0 || ^6.0.0"
5959
},
6060
"devDependencies": {
6161
"@angular/animations": "^6.0.0",
62-
"@angular/common": "^6.0.0",
63-
"@angular/compiler": "^6.0.0",
64-
"@angular/compiler-cli": "^6.0.0",
65-
"@angular/core": "^6.0.0",
66-
"@angular/platform-browser": "^6.0.0",
67-
"@angular/platform-browser-dynamic": "^6.0.0",
68-
"@angular/platform-server": "^6.0.0",
69-
"@angular/router": "^6.0.0",
62+
"@angular/common": "^5.0.0",
63+
"@angular/compiler": "^5.0.0",
64+
"@angular/compiler-cli": "^5.0.0",
65+
"@angular/core": "^5.0.0",
66+
"@angular/platform-browser": "^5.0.0",
67+
"@angular/platform-browser-dynamic": "^5.0.0",
68+
"@angular/platform-server": "^5.0.0",
69+
"@angular/router": "^5.0.0",
7070
"@types/jasmine": "^2.8.6",
7171
"@types/jquery": "^3.3.1",
7272
"@uirouter/publish-scripts": "^2.3.4",
@@ -87,6 +87,7 @@
8787
"rollup-plugin-sourcemaps": "^0.4.2",
8888
"rollup-plugin-uglify": "^3.0.0",
8989
"rxjs": "^6.1.0",
90+
"rxjs-compat": "^6.1.0",
9091
"shelljs": "^0.8.1",
9192
"shx": "^0.2.2",
9293
"ts-loader": "^3.5.0",

yarn.lock

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,58 @@
88
dependencies:
99
tslib "^1.9.0"
1010

11-
"@angular/common@^6.0.0":
12-
version "6.0.0"
13-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0.tgz#ca3b6b6b96837fe048861da897c31991aa04954f"
11+
"@angular/common@^5.0.0":
12+
version "5.2.10"
13+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.10.tgz#828308df8505a31f219a6895ff91dbb178ebac98"
1414
dependencies:
15-
tslib "^1.9.0"
15+
tslib "^1.7.1"
1616

17-
"@angular/compiler-cli@^6.0.0":
18-
version "6.0.0"
19-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0.tgz#be50277faaa5ac08f3002c2c8cb8c39d220c76d5"
17+
"@angular/compiler-cli@^5.0.0":
18+
version "5.2.10"
19+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.10.tgz#7e9dead0730dc20f7658e110a558b557b60e7be2"
2020
dependencies:
2121
chokidar "^1.4.2"
2222
minimist "^1.2.0"
2323
reflect-metadata "^0.1.2"
2424
tsickle "^0.27.2"
2525

26-
"@angular/compiler@^6.0.0":
27-
version "6.0.0"
28-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0.tgz#9092a0f02f33dd1108276ab93cc48142e36a1e95"
26+
"@angular/compiler@^5.0.0":
27+
version "5.2.10"
28+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.10.tgz#1cd9914436f0707957823531c4418ce5b7e6a130"
2929
dependencies:
30-
tslib "^1.9.0"
30+
tslib "^1.7.1"
3131

32-
"@angular/core@^6.0.0":
33-
version "6.0.0"
34-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0.tgz#785cc8a37b7fb784a6b7dcbd0984abb4f10e5dfe"
32+
"@angular/core@^5.0.0":
33+
version "5.2.10"
34+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.10.tgz#a6eba06cae7267efbd2666e3fa5e42b84c2261de"
3535
dependencies:
36-
tslib "^1.9.0"
36+
tslib "^1.7.1"
3737

38-
"@angular/platform-browser-dynamic@^6.0.0":
39-
version "6.0.0"
40-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz#66a34b65136446cb3ec39362fd6d2dbb5482ba70"
38+
"@angular/platform-browser-dynamic@^5.0.0":
39+
version "5.2.10"
40+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.10.tgz#bec4c0ca9fb16c34adee851caa187989953216ca"
4141
dependencies:
42-
tslib "^1.9.0"
42+
tslib "^1.7.1"
4343

44-
"@angular/platform-browser@^6.0.0":
45-
version "6.0.0"
46-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0.tgz#848b687ea46786483fddcdbbbd17b29c7adcc768"
44+
"@angular/platform-browser@^5.0.0":
45+
version "5.2.10"
46+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.10.tgz#92883803de7362e635748a440dd5f6172fc2394a"
4747
dependencies:
48-
tslib "^1.9.0"
48+
tslib "^1.7.1"
4949

50-
"@angular/platform-server@^6.0.0":
51-
version "6.0.0"
52-
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0.tgz#482878cc538a80caa3962e9376e4225b20c2a4bd"
50+
"@angular/platform-server@^5.0.0":
51+
version "5.2.10"
52+
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.10.tgz#36185a8ce137c1b65d74186f4b21566bcdb791b3"
5353
dependencies:
54-
domino "^2.0.1"
55-
tslib "^1.9.0"
54+
domino "^1.0.29"
55+
tslib "^1.7.1"
5656
xhr2 "^0.1.4"
5757

58-
"@angular/router@^6.0.0":
59-
version "6.0.0"
60-
resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.0.tgz#09a5c6f6220084c3575df81e8b36cbe9fff10d1f"
58+
"@angular/router@^5.0.0":
59+
version "5.2.10"
60+
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.10.tgz#cb36c32de0a233a9b49789e11ca0f96c5304f25a"
6161
dependencies:
62-
tslib "^1.9.0"
62+
tslib "^1.7.1"
6363

6464
6565
version "0.0.38"
@@ -1548,9 +1548,9 @@ domain-browser@^1.1.1:
15481548
version "1.2.0"
15491549
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
15501550

1551-
domino@^2.0.1:
1552-
version "2.0.2"
1553-
resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.2.tgz#fa2da6ace8381cf64089079470ee33c53901010f"
1551+
domino@^1.0.29:
1552+
version "1.0.30"
1553+
resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4"
15541554

15551555
dot-prop@^3.0.0:
15561556
version "3.0.0"
@@ -4809,6 +4809,10 @@ rollup@^0.58.1:
48094809
"@types/estree" "0.0.38"
48104810
"@types/node" "*"
48114811

4812+
rxjs-compat@^6.1.0:
4813+
version "6.1.0"
4814+
resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.1.0.tgz#935059623ee4c167728c9dd03ee6e4468cc5b583"
4815+
48124816
rxjs@^6.1.0:
48134817
version "6.1.0"
48144818
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
@@ -5532,7 +5536,7 @@ tsickle@^0.27.2:
55325536
source-map "^0.6.0"
55335537
source-map-support "^0.5.0"
55345538

5535-
tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
5539+
tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
55365540
version "1.9.0"
55375541
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
55385542

0 commit comments

Comments
 (0)