diff --git a/package.json b/package.json index 2f3bcb8861..6ae7d73323 100644 --- a/package.json +++ b/package.json @@ -46,12 +46,14 @@ "@types/base64-js": "1.2.5", "@types/chai": "^4.1.2", "@types/chokidar": "1.7.3", + "@types/convert-source-map": "^1.5.1", "@types/diff": "^3.2.2", "@types/fs-extra": "4.0.2", "@types/hammerjs": "2.0.35", "@types/jasmine": "^2.8.8", "@types/jasminewd2": "^2.0.3", "@types/minimist": "^1.2.0", + "@types/mock-fs": "^3.6.30", "@types/node": "6.0.88", "@types/selenium-webdriver": "3.0.7", "@types/shelljs": "^0.7.8", @@ -72,6 +74,7 @@ "cldr-data-downloader": "0.3.2", "cldrjs": "0.5.0", "conventional-changelog": "1.1.0", + "convert-source-map": "^1.5.1", "cors": "2.8.4", "diff": "^3.5.0", "domino": "2.0.1", @@ -97,7 +100,9 @@ "karma-sauce-launcher": "^1.2.0", "karma-sourcemap-loader": "^0.3.7", "madge": "0.5.0", + "magic-string": "^0.25.0", "minimist": "1.2.0", + "mock-fs": "^4.5.0", "mutation-observer": "^1.0.3", "node-uuid": "1.4.8", "protobufjs": "5.0.0", @@ -110,7 +115,7 @@ "selenium-webdriver": "3.5.0", "semver": "5.4.1", "shelljs": "^0.8.1", - "source-map": "0.5.7", + "source-map": "^0.6.1", "source-map-support": "0.4.18", "systemjs": "0.18.10", "tsickle": "0.32", diff --git a/tools/ng_setup_workspace.bzl b/tools/ng_setup_workspace.bzl index 1e3c90bcac..e4f7209004 100644 --- a/tools/ng_setup_workspace.bzl +++ b/tools/ng_setup_workspace.bzl @@ -21,7 +21,7 @@ def ng_setup_workspace(): data = ["@angular//:tools/yarn/check-yarn.js", "@angular//:tools/postinstall-patches.js"], node_modules_filegroup = """ filegroup( - name = "node_modules", + name = "node_modules", srcs = glob(["/".join([ "node_modules", pkg, @@ -61,6 +61,7 @@ filegroup( "class-utils", "co", "collection-visit", + "convert-source-map", "combined-stream", "component-emitter", "concat-map", @@ -131,6 +132,7 @@ filegroup( "kind-of", "long", "lru-cache", + "magic-string", "map-cache", "map-visit", "math-random", @@ -140,6 +142,7 @@ filegroup( "minimatch", "minimist", "mixin-deep", + "mock-fs", "nanomatch", "normalize-path", "oauth-sign", @@ -190,6 +193,7 @@ filegroup( "source-map-resolve", "source-map-support", "source-map-url", + "sourcemap-codec", "split-string", "sshpk", "static-extend", diff --git a/yarn.lock b/yarn.lock index 86a9be8662..88c7dd25a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,6 +48,10 @@ dependencies: "@types/node" "*" +"@types/convert-source-map@^1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@types/convert-source-map/-/convert-source-map-1.5.1.tgz#d4d180dd6adc5cb68ad99bd56e03d637881f4616" + "@types/diff@^3.2.2": version "3.5.1" resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.5.1.tgz#30253f6e177564ad7da707b1ebe46d3eade71706" @@ -92,6 +96,12 @@ version "1.2.0" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6" +"@types/mock-fs@^3.6.30": + version "3.6.30" + resolved "https://registry.yarnpkg.com/@types/mock-fs/-/mock-fs-3.6.30.tgz#4d812541e87b23577261a5aa95f704dd3d01e410" + dependencies: + "@types/node" "*" + "@types/node@*": version "10.5.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707" @@ -1604,6 +1614,10 @@ conventional-commits-parser@^2.1.0, conventional-commits-parser@^2.1.7: through2 "^2.0.0" trim-off-newlines "^1.0.0" +convert-source-map@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" + cookie-parser@~1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.3.5.tgz#9d755570fb5d17890771227a02314d9be7cf8356" @@ -4338,6 +4352,12 @@ magic-string@^0.19.0: dependencies: vlq "^0.2.1" +magic-string@^0.25.0: + version "0.25.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b" + dependencies: + sourcemap-codec "^1.4.1" + mailcomposer@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4" @@ -4627,6 +4647,10 @@ mkpath@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-0.1.0.tgz#7554a6f8d871834cc97b5462b122c4c124d6de91" +mock-fs@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.5.0.tgz#75245b966f7e3defe197b03454af9c5b355594b7" + modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -6455,20 +6479,24 @@ source-map@0.1.31: dependencies: amdefine ">=0.0.4" -source-map@0.5.7, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - source-map@^0.4.4, source-map@~0.4.1: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: amdefine ">=0.0.4" +source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" +sourcemap-codec@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2" + sparkles@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"