Skip to content

Commit

Permalink
fix: downgrade @angular/cli due to not working testing sourcemaps
Browse files Browse the repository at this point in the history 
See angular/angular-cli#6583
  • Loading branch information
@ryzy
ryzy committed Jun 18, 2017
1 parent dd4b588 commit 3624534
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 61 deletions.
15 changes: 13 additions & 2 deletions karma.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,25 @@ module.exports = function (config) {
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
reports: [ 'html', 'lcovonly', 'text-summary' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'],
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"zone.js": "^0.8.12"
},
"devDependencies": {
"@angular/cli": "^1.1.2",
"@angular/cli": "1.0.6",
"@angular/compiler-cli": "^4.2.3",
"@angular/language-service": "^4.2.3",
"@types/jasmine": "^2.5.52",
Expand Down
117 changes: 59 additions & 58 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
dependencies:
tslib "^1.7.1"

"@angular/cli@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.1.2.tgz#03855777cdab1ba8dc3f6cdc55eac8fcb0fcf831"
"@angular/cli@1.0.6":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.0.6.tgz#a2e861f202131a8139882c78f1859cbefcbea77e"
dependencies:
"@ngtools/json-schema" "1.1.0"
"@ngtools/webpack" "1.4.1"
"@ngtools/json-schema" "1.0.10"
"@ngtools/webpack" "1.3.3"
autoprefixer "^6.5.3"
chalk "^1.1.3"
common-tags "^1.3.1"
Expand All @@ -36,6 +36,8 @@
isbinaryfile "^3.0.0"
istanbul-instrumenter-loader "^2.0.0"
json-loader "^0.5.4"
karma-sourcemap-loader "^0.3.7"
karma-webpack "^2.0.0"
less "^2.7.2"
less-loader "^4.0.2"
lodash "^4.11.1"
Expand All @@ -56,17 +58,16 @@
script-loader "^0.7.0"
semver "^5.1.0"
silent-error "^1.0.0"
source-map-loader "^0.2.0"
source-map-loader "^0.1.5"
style-loader "^0.13.1"
stylus "^0.54.5"
stylus-loader "^3.0.1"
temp "0.8.3"
typescript ">=2.0.0 <2.4.0"
typescript ">=2.0.0 <2.3.0"
url-loader "^0.5.7"
walk-sync "^0.3.1"
webpack "~2.4.0"
webpack-dev-middleware "^1.10.2"
webpack-dev-server "~2.4.5"
webpack "~2.2.0"
webpack-dev-server "~2.4.2"
webpack-merge "^2.4.0"
zone.js "^0.8.4"
optionalDependencies:
Expand Down Expand Up @@ -140,13 +141,13 @@
dependencies:
tsickle "^0.21.0"

"@ngtools/json-schema@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
"@ngtools/json-schema@1.0.10":
version "1.0.10"
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.0.10.tgz#2d1222f84ecb53deb2d619d0db8bd5edccb00b61"

"@ngtools/webpack@1.4.1":
version "1.4.1"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.4.1.tgz#6d498f21cd1afc027b8b746d8524a7f4e91e1dab"
"@ngtools/webpack@1.3.3":
version "1.3.3"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.3.3.tgz#f7941eb4fe9c77ef28fe7aec15f58a64a7be1457"
dependencies:
enhanced-resolve "^3.1.0"
loader-utils "^1.0.2"
Expand Down Expand Up @@ -190,14 +191,10 @@ acorn-dynamic-import@^2.0.0:
dependencies:
acorn "^4.0.3"

acorn@^4.0.3:
acorn@^4.0.3, acorn@^4.0.4:
version "4.0.13"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"

acorn@^5.0.0:
version "5.0.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"

[email protected]:
version "0.4.4"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
Expand Down Expand Up @@ -376,7 +373,7 @@ async-foreach@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"

async@^0.9.0:
async@^0.9.0, async@~0.9.0:
version "0.9.2"
resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"

Expand Down Expand Up @@ -2446,14 +2443,10 @@ istanbul-reports@^1.1.1:
dependencies:
handlebars "^4.0.3"

jasmine-core@^2.6.4:
jasmine-core@^2.6.4, jasmine-core@~2.6.0:
version "2.6.4"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.4.tgz#dec926cd0a9fa287fb6db5c755fa487e74cecac5"

jasmine-core@~2.6.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.2.tgz#74ea1f7cf428691af201107d631234027a09daab"

jasmine-spec-reporter@~4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.0.tgz#b8aa7584df58e4dab61acdbefb76d096aa38663f"
Expand Down Expand Up @@ -2538,7 +2531,7 @@ [email protected], json3@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"

json5@^0.5.0, json5@^0.5.1:
json5@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"

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

karma-sourcemap-loader@^0.3.7:
version "0.3.7"
resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
dependencies:
graceful-fs "^4.1.2"

karma-webpack@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6"
dependencies:
async "~0.9.0"
loader-utils "^0.2.5"
lodash "^3.8.0"
source-map "^0.1.41"
webpack-dev-middleware "^1.0.11"

karma@~1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269"
Expand Down Expand Up @@ -2684,7 +2693,7 @@ loader-runner@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"

loader-utils@^0.2.16, loader-utils@~0.2.2:
loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@~0.2.2:
version "0.2.17"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
dependencies:
Expand Down Expand Up @@ -4284,13 +4293,9 @@ source-list-map@^0.1.7, source-list-map@~0.1.7:
version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"

source-list-map@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"

source-map-loader@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.1.tgz#48126be9230bd47fad05e46a8c3c2e3d2dabe507"
source-map-loader@^0.1.5:
version "0.1.6"
resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.1.6.tgz#c09903da6d73b9e53b7ed8ee5245597051e98e91"
dependencies:
async "^0.9.0"
loader-utils "~0.2.2"
Expand All @@ -4302,7 +4307,7 @@ source-map-support@^0.4.0, source-map-support@^0.4.2, source-map-support@~0.4.0:
dependencies:
source-map "^0.5.6"

[email protected], source-map@~0.1.33, source-map@~0.1.7:
[email protected], source-map@^0.1.41, source-map@~0.1.33, source-map@~0.1.7:
version "0.1.43"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
dependencies:
Expand Down Expand Up @@ -4678,7 +4683,11 @@ type-is@~1.6.15:
media-typer "0.3.0"
mime-types "~2.1.15"

"typescript@>=2.0.0 <2.4.0", typescript@~2.3.3:
"typescript@>=2.0.0 <2.3.0":
version "2.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"

typescript@~2.3.3:
version "2.3.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"

Expand All @@ -4689,7 +4698,7 @@ [email protected]:
commander "~2.9.0"
source-map "~0.5.1"

uglify-js@^2.6, uglify-js@^2.8.5:
uglify-js@^2.6, uglify-js@^2.7.5:
version "2.8.27"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c"
dependencies:
Expand Down Expand Up @@ -4857,7 +4866,7 @@ walk-sync@^0.3.1:
ensure-posix-path "^1.0.0"
matcher-collection "^1.0.0"

watchpack@^1.3.1:
watchpack@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
dependencies:
Expand Down Expand Up @@ -4894,7 +4903,7 @@ webdriver-manager@^12.0.6:
semver "^5.3.0"
xml2js "^0.4.17"

webpack-dev-middleware@^1.10.2:
webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.10.2:
version "1.10.2"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
dependencies:
Expand All @@ -4903,7 +4912,7 @@ webpack-dev-middleware@^1.10.2:
path-is-absolute "^1.0.0"
range-parser "^1.0.3"

webpack-dev-server@~2.4.5:
webpack-dev-server@~2.4.2:
version "2.4.5"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf"
dependencies:
Expand Down Expand Up @@ -4931,33 +4940,25 @@ webpack-merge@^2.4.0:
dependencies:
lodash "^4.17.4"

webpack-sources@^0.1.0:
webpack-sources@^0.1.0, webpack-sources@^0.1.4:
version "0.1.5"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
dependencies:
source-list-map "~0.1.7"
source-map "~0.5.3"

webpack-sources@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
dependencies:
source-list-map "^1.1.1"
source-map "~0.5.3"

webpack@~2.4.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"
webpack@~2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
dependencies:
acorn "^5.0.0"
acorn "^4.0.4"
acorn-dynamic-import "^2.0.0"
ajv "^4.7.0"
ajv-keywords "^1.1.1"
async "^2.1.2"
enhanced-resolve "^3.0.0"
interpret "^1.0.0"
json-loader "^0.5.4"
json5 "^0.5.1"
loader-runner "^2.3.0"
loader-utils "^0.2.16"
memory-fs "~0.4.1"
Expand All @@ -4966,9 +4967,9 @@ webpack@~2.4.0:
source-map "^0.5.3"
supports-color "^3.1.0"
tapable "~0.2.5"
uglify-js "^2.8.5"
watchpack "^1.3.1"
webpack-sources "^0.2.3"
uglify-js "^2.7.5"
watchpack "^1.2.0"
webpack-sources "^0.1.4"
yargs "^6.0.0"

websocket-driver@>=0.5.1:
Expand Down

0 comments on commit 3624534

Please sign in to comment.