Skip to content

Commit 3624534

Browse files
committed
fix: downgrade @angular/cli due to not working testing sourcemaps
See angular/angular-cli#6583
1 parent dd4b588 commit 3624534

File tree

3 files changed

+73
-61
lines changed

3 files changed

+73
-61
lines changed

karma.conf.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,25 @@ module.exports = function (config) {
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
18+
files: [
19+
{ pattern: './src/test.ts', watched: false }
20+
],
21+
preprocessors: {
22+
'./src/test.ts': ['@angular/cli']
23+
},
24+
mime: {
25+
'text/x-typescript': ['ts','tsx']
26+
},
1827
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
28+
reports: [ 'html', 'lcovonly', 'text-summary' ],
2029
fixWebpackSourcePaths: true
2130
},
2231
angularCli: {
2332
environment: 'dev'
2433
},
25-
reporters: ['progress', 'kjhtml'],
34+
reporters: config.angularCli && config.angularCli.codeCoverage
35+
? ['progress', 'coverage-istanbul']
36+
: ['progress', 'kjhtml'],
2637
port: 9876,
2738
colors: true,
2839
logLevel: config.LOG_INFO,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"zone.js": "^0.8.12"
2828
},
2929
"devDependencies": {
30-
"@angular/cli": "^1.1.2",
30+
"@angular/cli": "1.0.6",
3131
"@angular/compiler-cli": "^4.2.3",
3232
"@angular/language-service": "^4.2.3",
3333
"@types/jasmine": "^2.5.52",

yarn.lock

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

11-
"@angular/cli@^1.1.2":
12-
version "1.1.2"
13-
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.1.2.tgz#03855777cdab1ba8dc3f6cdc55eac8fcb0fcf831"
11+
"@angular/cli@1.0.6":
12+
version "1.0.6"
13+
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.0.6.tgz#a2e861f202131a8139882c78f1859cbefcbea77e"
1414
dependencies:
15-
"@ngtools/json-schema" "1.1.0"
16-
"@ngtools/webpack" "1.4.1"
15+
"@ngtools/json-schema" "1.0.10"
16+
"@ngtools/webpack" "1.3.3"
1717
autoprefixer "^6.5.3"
1818
chalk "^1.1.3"
1919
common-tags "^1.3.1"
@@ -36,6 +36,8 @@
3636
isbinaryfile "^3.0.0"
3737
istanbul-instrumenter-loader "^2.0.0"
3838
json-loader "^0.5.4"
39+
karma-sourcemap-loader "^0.3.7"
40+
karma-webpack "^2.0.0"
3941
less "^2.7.2"
4042
less-loader "^4.0.2"
4143
lodash "^4.11.1"
@@ -56,17 +58,16 @@
5658
script-loader "^0.7.0"
5759
semver "^5.1.0"
5860
silent-error "^1.0.0"
59-
source-map-loader "^0.2.0"
61+
source-map-loader "^0.1.5"
6062
style-loader "^0.13.1"
6163
stylus "^0.54.5"
6264
stylus-loader "^3.0.1"
6365
temp "0.8.3"
64-
typescript ">=2.0.0 <2.4.0"
66+
typescript ">=2.0.0 <2.3.0"
6567
url-loader "^0.5.7"
6668
walk-sync "^0.3.1"
67-
webpack "~2.4.0"
68-
webpack-dev-middleware "^1.10.2"
69-
webpack-dev-server "~2.4.5"
69+
webpack "~2.2.0"
70+
webpack-dev-server "~2.4.2"
7071
webpack-merge "^2.4.0"
7172
zone.js "^0.8.4"
7273
optionalDependencies:
@@ -140,13 +141,13 @@
140141
dependencies:
141142
tsickle "^0.21.0"
142143

143-
"@ngtools/json-schema@1.1.0":
144-
version "1.1.0"
145-
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
144+
"@ngtools/json-schema@1.0.10":
145+
version "1.0.10"
146+
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.0.10.tgz#2d1222f84ecb53deb2d619d0db8bd5edccb00b61"
146147

147-
"@ngtools/webpack@1.4.1":
148-
version "1.4.1"
149-
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.4.1.tgz#6d498f21cd1afc027b8b746d8524a7f4e91e1dab"
148+
"@ngtools/webpack@1.3.3":
149+
version "1.3.3"
150+
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.3.3.tgz#f7941eb4fe9c77ef28fe7aec15f58a64a7be1457"
150151
dependencies:
151152
enhanced-resolve "^3.1.0"
152153
loader-utils "^1.0.2"
@@ -190,14 +191,10 @@ acorn-dynamic-import@^2.0.0:
190191
dependencies:
191192
acorn "^4.0.3"
192193

193-
acorn@^4.0.3:
194+
acorn@^4.0.3, acorn@^4.0.4:
194195
version "4.0.13"
195196
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
196197

197-
acorn@^5.0.0:
198-
version "5.0.3"
199-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
200-
201198
202199
version "0.4.4"
203200
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
@@ -376,7 +373,7 @@ async-foreach@^0.1.3:
376373
version "0.1.3"
377374
resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
378375

379-
async@^0.9.0:
376+
async@^0.9.0, async@~0.9.0:
380377
version "0.9.2"
381378
resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
382379

@@ -2446,14 +2443,10 @@ istanbul-reports@^1.1.1:
24462443
dependencies:
24472444
handlebars "^4.0.3"
24482445

2449-
jasmine-core@^2.6.4:
2446+
jasmine-core@^2.6.4, jasmine-core@~2.6.0:
24502447
version "2.6.4"
24512448
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.4.tgz#dec926cd0a9fa287fb6db5c755fa487e74cecac5"
24522449

2453-
jasmine-core@~2.6.0:
2454-
version "2.6.2"
2455-
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.2.tgz#74ea1f7cf428691af201107d631234027a09daab"
2456-
24572450
jasmine-spec-reporter@~4.1.0:
24582451
version "4.1.0"
24592452
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.0.tgz#b8aa7584df58e4dab61acdbefb76d096aa38663f"
@@ -2538,7 +2531,7 @@ [email protected], json3@^3.3.2:
25382531
version "3.3.2"
25392532
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
25402533

2541-
json5@^0.5.0, json5@^0.5.1:
2534+
json5@^0.5.0:
25422535
version "0.5.1"
25432536
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
25442537

@@ -2591,6 +2584,22 @@ karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
25912584
version "1.1.0"
25922585
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
25932586

2587+
karma-sourcemap-loader@^0.3.7:
2588+
version "0.3.7"
2589+
resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
2590+
dependencies:
2591+
graceful-fs "^4.1.2"
2592+
2593+
karma-webpack@^2.0.0:
2594+
version "2.0.3"
2595+
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6"
2596+
dependencies:
2597+
async "~0.9.0"
2598+
loader-utils "^0.2.5"
2599+
lodash "^3.8.0"
2600+
source-map "^0.1.41"
2601+
webpack-dev-middleware "^1.0.11"
2602+
25942603
karma@~1.7.0:
25952604
version "1.7.0"
25962605
resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269"
@@ -2684,7 +2693,7 @@ loader-runner@^2.3.0:
26842693
version "2.3.0"
26852694
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
26862695

2687-
loader-utils@^0.2.16, loader-utils@~0.2.2:
2696+
loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@~0.2.2:
26882697
version "0.2.17"
26892698
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
26902699
dependencies:
@@ -4284,13 +4293,9 @@ source-list-map@^0.1.7, source-list-map@~0.1.7:
42844293
version "0.1.8"
42854294
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
42864295

4287-
source-list-map@^1.1.1:
4288-
version "1.1.2"
4289-
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
4290-
4291-
source-map-loader@^0.2.0:
4292-
version "0.2.1"
4293-
resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.1.tgz#48126be9230bd47fad05e46a8c3c2e3d2dabe507"
4296+
source-map-loader@^0.1.5:
4297+
version "0.1.6"
4298+
resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.1.6.tgz#c09903da6d73b9e53b7ed8ee5245597051e98e91"
42944299
dependencies:
42954300
async "^0.9.0"
42964301
loader-utils "~0.2.2"
@@ -4302,7 +4307,7 @@ source-map-support@^0.4.0, source-map-support@^0.4.2, source-map-support@~0.4.0:
43024307
dependencies:
43034308
source-map "^0.5.6"
43044309

4305-
[email protected], source-map@~0.1.33, source-map@~0.1.7:
4310+
[email protected], source-map@^0.1.41, source-map@~0.1.33, source-map@~0.1.7:
43064311
version "0.1.43"
43074312
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
43084313
dependencies:
@@ -4678,7 +4683,11 @@ type-is@~1.6.15:
46784683
media-typer "0.3.0"
46794684
mime-types "~2.1.15"
46804685

4681-
"typescript@>=2.0.0 <2.4.0", typescript@~2.3.3:
4686+
"typescript@>=2.0.0 <2.3.0":
4687+
version "2.2.2"
4688+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
4689+
4690+
typescript@~2.3.3:
46824691
version "2.3.4"
46834692
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"
46844693

@@ -4689,7 +4698,7 @@ [email protected]:
46894698
commander "~2.9.0"
46904699
source-map "~0.5.1"
46914700

4692-
uglify-js@^2.6, uglify-js@^2.8.5:
4701+
uglify-js@^2.6, uglify-js@^2.7.5:
46934702
version "2.8.27"
46944703
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c"
46954704
dependencies:
@@ -4857,7 +4866,7 @@ walk-sync@^0.3.1:
48574866
ensure-posix-path "^1.0.0"
48584867
matcher-collection "^1.0.0"
48594868

4860-
watchpack@^1.3.1:
4869+
watchpack@^1.2.0:
48614870
version "1.3.1"
48624871
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
48634872
dependencies:
@@ -4894,7 +4903,7 @@ webdriver-manager@^12.0.6:
48944903
semver "^5.3.0"
48954904
xml2js "^0.4.17"
48964905

4897-
webpack-dev-middleware@^1.10.2:
4906+
webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.10.2:
48984907
version "1.10.2"
48994908
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
49004909
dependencies:
@@ -4903,7 +4912,7 @@ webpack-dev-middleware@^1.10.2:
49034912
path-is-absolute "^1.0.0"
49044913
range-parser "^1.0.3"
49054914

4906-
webpack-dev-server@~2.4.5:
4915+
webpack-dev-server@~2.4.2:
49074916
version "2.4.5"
49084917
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf"
49094918
dependencies:
@@ -4931,33 +4940,25 @@ webpack-merge@^2.4.0:
49314940
dependencies:
49324941
lodash "^4.17.4"
49334942

4934-
webpack-sources@^0.1.0:
4943+
webpack-sources@^0.1.0, webpack-sources@^0.1.4:
49354944
version "0.1.5"
49364945
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
49374946
dependencies:
49384947
source-list-map "~0.1.7"
49394948
source-map "~0.5.3"
49404949

4941-
webpack-sources@^0.2.3:
4942-
version "0.2.3"
4943-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
4944-
dependencies:
4945-
source-list-map "^1.1.1"
4946-
source-map "~0.5.3"
4947-
4948-
webpack@~2.4.0:
4949-
version "2.4.1"
4950-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"
4950+
webpack@~2.2.0:
4951+
version "2.2.1"
4952+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
49514953
dependencies:
4952-
acorn "^5.0.0"
4954+
acorn "^4.0.4"
49534955
acorn-dynamic-import "^2.0.0"
49544956
ajv "^4.7.0"
49554957
ajv-keywords "^1.1.1"
49564958
async "^2.1.2"
49574959
enhanced-resolve "^3.0.0"
49584960
interpret "^1.0.0"
49594961
json-loader "^0.5.4"
4960-
json5 "^0.5.1"
49614962
loader-runner "^2.3.0"
49624963
loader-utils "^0.2.16"
49634964
memory-fs "~0.4.1"
@@ -4966,9 +4967,9 @@ webpack@~2.4.0:
49664967
source-map "^0.5.3"
49674968
supports-color "^3.1.0"
49684969
tapable "~0.2.5"
4969-
uglify-js "^2.8.5"
4970-
watchpack "^1.3.1"
4971-
webpack-sources "^0.2.3"
4970+
uglify-js "^2.7.5"
4971+
watchpack "^1.2.0"
4972+
webpack-sources "^0.1.4"
49724973
yargs "^6.0.0"
49734974

49744975
websocket-driver@>=0.5.1:

0 commit comments

Comments
 (0)