Skip to content

Commit 4d72758

Browse files
committed
upgrade istanbul-instrumenter-loader
1 parent b649a2b commit 4d72758

File tree

4 files changed

+138
-23
lines changed

4 files changed

+138
-23
lines changed

config/karma.conf.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ module.exports = function (config) {
99
],
1010
preprocessors: {
1111
'./config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'],
12-
// './config/spec-bundle.js': ['webpack', 'sourcemap'],
1312
},
1413
webpack: testWebpackConfig,
1514
coverageReporter: {
@@ -22,7 +21,6 @@ module.exports = function (config) {
2221
},
2322
webpackMiddleware: {stats: 'errors-only'},
2423
reporters: ['mocha', 'coverage', 'remap-coverage'],
25-
// reporters: ['mocha'],
2624
port: 9876,
2725
colors: true,
2826
logLevel: config.LOG_INFO,

config/webpack.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ module.exports = {
2222
enforce: 'pre',
2323
test: /\.ts$/,
2424
loader: 'tslint-loader',
25-
exclude: [helpers.root('node_modules')]
25+
exclude: [helpers.root('node_modules')],
2626
},
2727
{
2828
enforce: 'pre',
2929
test: /\.js$/,
3030
loader: 'source-map-loader',
3131
exclude: [
3232
helpers.root('node_modules/rxjs'),
33-
helpers.root('node_modules/@angular')
33+
helpers.root('node_modules/@angular'),
3434
]
3535
},
3636
{
@@ -56,8 +56,8 @@ module.exports = {
5656
helpers.root('src'),
5757
],
5858
exclude: [
59-
/\.(e2e|spec)\.ts$/,
60-
/node_modules/
59+
/\.spec\.ts$/,
60+
/node_modules/,
6161
]
6262
},
6363
]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"extract-text-webpack-plugin": "^2.0.0-beta.4",
6868
"html-webpack-plugin": "^2.24.1",
6969
"http-proxy": "^1.15.2",
70-
"istanbul-instrumenter-loader": "0.2.0",
70+
"istanbul-instrumenter-loader": "^1.2.0",
7171
"jasmine-core": "^2.5.2",
7272
"karma": "^1.3.0",
7373
"karma-chrome-launcher": "^2.0.0",

yarn.lock

Lines changed: 133 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,68 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.20.0:
361361
esutils "^2.0.2"
362362
js-tokens "^2.0.0"
363363

364+
babel-generator@^6.18.0:
365+
version "6.21.0"
366+
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.21.0.tgz#605f1269c489a1c75deeca7ea16d43d4656c8494"
367+
dependencies:
368+
babel-messages "^6.8.0"
369+
babel-runtime "^6.20.0"
370+
babel-types "^6.21.0"
371+
detect-indent "^4.0.0"
372+
jsesc "^1.3.0"
373+
lodash "^4.2.0"
374+
source-map "^0.5.0"
375+
376+
babel-messages@^6.8.0:
377+
version "6.8.0"
378+
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.8.0.tgz#bf504736ca967e6d65ef0adb5a2a5f947c8e0eb9"
379+
dependencies:
380+
babel-runtime "^6.0.0"
381+
382+
babel-runtime@^6.0.0, babel-runtime@^6.20.0, babel-runtime@^6.9.0:
383+
version "6.20.0"
384+
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.20.0.tgz#87300bdcf4cd770f09bf0048c64204e17806d16f"
385+
dependencies:
386+
core-js "^2.4.0"
387+
regenerator-runtime "^0.10.0"
388+
389+
babel-template@^6.16.0:
390+
version "6.16.0"
391+
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.16.0.tgz#e149dd1a9f03a35f817ddbc4d0481988e7ebc8ca"
392+
dependencies:
393+
babel-runtime "^6.9.0"
394+
babel-traverse "^6.16.0"
395+
babel-types "^6.16.0"
396+
babylon "^6.11.0"
397+
lodash "^4.2.0"
398+
399+
babel-traverse@^6.16.0, babel-traverse@^6.18.0:
400+
version "6.21.0"
401+
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.21.0.tgz#69c6365804f1a4f69eb1213f85b00a818b8c21ad"
402+
dependencies:
403+
babel-code-frame "^6.20.0"
404+
babel-messages "^6.8.0"
405+
babel-runtime "^6.20.0"
406+
babel-types "^6.21.0"
407+
babylon "^6.11.0"
408+
debug "^2.2.0"
409+
globals "^9.0.0"
410+
invariant "^2.2.0"
411+
lodash "^4.2.0"
412+
413+
babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.21.0:
414+
version "6.21.0"
415+
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.21.0.tgz#314b92168891ef6d3806b7f7a917fdf87c11a4b2"
416+
dependencies:
417+
babel-runtime "^6.20.0"
418+
esutils "^2.0.2"
419+
lodash "^4.2.0"
420+
to-fast-properties "^1.0.1"
421+
422+
babylon@^6.11.0, babylon@^6.13.0:
423+
version "6.15.0"
424+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
425+
364426
365427
version "1.0.2"
366428
resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -926,6 +988,10 @@ content-type@~1.0.2:
926988
version "1.0.2"
927989
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
928990

991+
convert-source-map@^1.3.0:
992+
version "1.3.0"
993+
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67"
994+
929995
930996
version "1.0.6"
931997
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -934,7 +1000,7 @@ [email protected]:
9341000
version "0.3.1"
9351001
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
9361002

937-
core-js@^2.2.0, core-js@^2.4.1:
1003+
core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
9381004
version "2.4.1"
9391005
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
9401006

@@ -1182,6 +1248,12 @@ destroy@~1.0.4:
11821248
version "1.0.4"
11831249
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
11841250

1251+
detect-indent@^4.0.0:
1252+
version "4.0.0"
1253+
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
1254+
dependencies:
1255+
repeating "^2.0.0"
1256+
11851257
di@^0.0.1:
11861258
version "0.0.1"
11871259
resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -1722,6 +1794,10 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
17221794
once "^1.3.0"
17231795
path-is-absolute "^1.0.0"
17241796

1797+
globals@^9.0.0:
1798+
version "9.14.0"
1799+
resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
1800+
17251801
glogg@^1.0.0:
17261802
version "1.0.0"
17271803
resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
@@ -2031,6 +2107,12 @@ interpret@^1.0.0:
20312107
version "1.0.1"
20322108
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
20332109

2110+
invariant@^2.2.0:
2111+
version "2.2.2"
2112+
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
2113+
dependencies:
2114+
loose-envify "^1.0.0"
2115+
20342116
invert-kv@^1.0.0:
20352117
version "1.0.0"
20362118
resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
@@ -2204,15 +2286,32 @@ isstream@~0.1.2:
22042286
version "0.1.2"
22052287
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
22062288

2207-
istanbul-instrumenter-loader@0.2.0:
2208-
version "0.2.0"
2209-
resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-%3Cspan%20class="x x-first x-last">0.2.0.tgz#643e4e5e4e8f9466863a29a977d283ab372c019c"
2289+
istanbul-instrumenter-loader@1.2.0:
2290+
version "1.2.0"
2291+
resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-%3Cspan%20class="x x-first x-last">1.2.0.tgz#bef469049b81b23581d0d4db37a271206033cc52"
22102292
dependencies:
2211-
istanbul "0.x.x"
2212-
loader-utils "0.x.x"
2213-
object-assign "4.x.x"
2293+
convert-source-map "^1.3.0"
2294+
istanbul-lib-instrument "^1.1.3"
2295+
loader-utils "^0.2.16"
2296+
object-assign "^4.1.0"
22142297

2215-
2298+
istanbul-lib-coverage@^1.0.0:
2299+
version "1.0.0"
2300+
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz#c3f9b6d226da12424064cce87fce0fb57fdfa7a2"
2301+
2302+
istanbul-lib-instrument@^1.1.3:
2303+
version "1.4.2"
2304+
resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e"
2305+
dependencies:
2306+
babel-generator "^6.18.0"
2307+
babel-template "^6.16.0"
2308+
babel-traverse "^6.18.0"
2309+
babel-types "^6.18.0"
2310+
babylon "^6.13.0"
2311+
istanbul-lib-coverage "^1.0.0"
2312+
semver "^5.3.0"
2313+
2314+
[email protected], istanbul@^0.4.0:
22162315
version "0.4.5"
22172316
resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
22182317
dependencies:
@@ -2264,6 +2363,10 @@ jsbn@~0.1.0:
22642363
version "0.1.0"
22652364
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
22662365

2366+
jsesc@^1.3.0:
2367+
version "1.3.0"
2368+
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
2369+
22672370
jsesc@~0.5.0:
22682371
version "0.5.0"
22692372
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -2455,7 +2558,7 @@ loader-runner@^2.2.0:
24552558
version "2.2.0"
24562559
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
24572560

2458-
loader-utils@0.x.x, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@~0.2.2:
2561+
loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@~0.2.2:
24592562
version "0.2.16"
24602563
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
24612564
dependencies:
@@ -2616,7 +2719,7 @@ lodash@^3.8.0:
26162719
version "3.10.1"
26172720
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
26182721

2619-
lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.5.0:
2722+
lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.5.0:
26202723
version "4.17.4"
26212724
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
26222725

@@ -2635,6 +2738,12 @@ longest@^1.0.1:
26352738
version "1.0.1"
26362739
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
26372740

2741+
loose-envify@^1.0.0:
2742+
version "1.3.0"
2743+
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.0.tgz#6b26248c42f6d4fa4b0d8542f78edfcde35642a8"
2744+
dependencies:
2745+
js-tokens "^2.0.0"
2746+
26382747
loud-rejection@^1.0.0:
26392748
version "1.6.0"
26402749
resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -2961,14 +3070,14 @@ oauth-sign@~0.8.1:
29613070
version "0.8.2"
29623071
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
29633072

2964-
[email protected], object-assign@^4.0.1, object-assign@^4.1.0:
2965-
version "4.1.0"
2966-
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
2967-
29683073
object-assign@^3.0.0:
29693074
version "3.0.0"
29703075
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
29713076

3077+
object-assign@^4.0.1, object-assign@^4.1.0:
3078+
version "4.1.0"
3079+
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
3080+
29723081
29733082
version "0.0.3"
29743083
resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -3684,6 +3793,10 @@ regenerate@^1.2.1:
36843793
version "1.3.2"
36853794
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
36863795

3796+
regenerator-runtime@^0.10.0:
3797+
version "0.10.1"
3798+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
3799+
36873800
regex-cache@^0.4.2:
36883801
version "0.4.3"
36893802
resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
@@ -3874,7 +3987,7 @@ semver-diff@^2.0.0:
38743987
dependencies:
38753988
semver "^5.0.3"
38763989

3877-
"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@~5.3.0:
3990+
"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
38783991
version "5.3.0"
38793992
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
38803993

@@ -4071,7 +4184,7 @@ [email protected], source-map@^0.4.4:
40714184
dependencies:
40724185
amdefine ">=0.0.4"
40734186

4074-
source-map@>=0.5.6, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
4187+
source-map@>=0.5.6, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
40754188
version "0.5.6"
40764189
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
40774190

@@ -4319,6 +4432,10 @@ to-arraybuffer@^1.0.0:
43194432
version "1.0.1"
43204433
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
43214434

4435+
to-fast-properties@^1.0.1:
4436+
version "1.0.2"
4437+
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
4438+
43224439
toposort@^1.0.0:
43234440
version "1.0.0"
43244441
resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.0.tgz#b66cf385a1a8a8e68e45b8259e7f55875e8b06ef"

0 commit comments

Comments
 (0)