diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index bd3e151153..117eb8801a 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -20,6 +20,13 @@ load("@angular//packages/bazel:package.bzl", "rules_angular_dependencies") rules_angular_dependencies() +http_archive( + name = "io_bazel_rules_sass", + sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03", + strip_prefix = "rules_sass-1.11.0", + url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip", +) + # # Setup dependencies loaded above # diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json index 8f73cbaab3..97a1dd63a8 100644 --- a/integration/bazel/src/package.json +++ b/integration/bazel/src/package.json @@ -18,7 +18,6 @@ "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", - "tsickle": "0.32.0", "typescript": "3.1.1" }, "scripts": { diff --git a/integration/bazel/src/yarn.lock b/integration/bazel/src/yarn.lock index b5bdae311e..306e19ad10 100644 --- a/integration/bazel/src/yarn.lock +++ b/integration/bazel/src/yarn.lock @@ -5,9 +5,10 @@ "@angular/bazel@file:../angular/dist/packages-dist/bazel": version "7.0.0-rc.1" dependencies: - "@bazel/typescript" "^0.19.1" + "@bazel/typescript" "^0.20.3" "@types/node" "6.0.84" - tsickle "0.28.0" + shelljs "0.8.2" + tsickle "0.32.1" "@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli": version "7.0.0-rc.1" @@ -43,7 +44,7 @@ requirejs "2.3.5" tmp "0.0.33" -"@bazel/typescript@0.20.3": +"@bazel/typescript@0.20.3", "@bazel/typescript@^0.20.3": version "0.20.3" resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4" dependencies: @@ -52,15 +53,6 @@ tsickle "0.28.0" tsutils "2.27.2" -"@bazel/typescript@^0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.19.1.tgz#61dd57c0ab8a6c9930d2463d44e9522ec007fe3a" - dependencies: - protobufjs "5.0.0" - source-map-support "0.5.9" - tsickle "0.28.0" - tsutils "2.27.2" - "@types/jasmine@2.8.8": version "2.8.8" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9" @@ -1313,16 +1305,6 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@^5.0.10: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" @@ -1896,7 +1878,7 @@ karma-sourcemap-loader@0.3.7: dependencies: graceful-fs "^4.1.2" -"karma@github:alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a": +karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a: version "1.7.1" resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a" dependencies: @@ -2150,7 +2132,7 @@ mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" -"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -2626,15 +2608,6 @@ promisify-call@^2.0.2: dependencies: with-callback "^1.0.2" -protobufjs@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.0.tgz#4223063233ea96ac063ca2b554035204db524fa1" - dependencies: - ascli "~1" - bytebuffer "~5" - glob "^5.0.10" - yargs "^3.10.0" - protobufjs@5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" @@ -3089,7 +3062,7 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" -shelljs@^0.8.1: +shelljs@0.8.2, shelljs@^0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35" dependencies: @@ -3486,9 +3459,9 @@ tsickle@0.28.0: source-map "^0.6.0" source-map-support "^0.5.0" -tsickle@0.32.0: - version "0.32.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.0.tgz#8027eecf5872b4451ffae821a5fdbd0b3206c139" +tsickle@0.32.1: + version "0.32.1" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5" dependencies: jasmine-diff "^0.1.3" minimist "^1.2.0" diff --git a/package.json b/package.json index d69f1ae0b4..9d2f22ae1d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "@bazel/typescript": "0.20.3", "@types/angular": "^1.6.47", "@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", @@ -72,7 +71,6 @@ "bower": "1.8.2", "browserstacktunnel-wrapper": "2.0.1", "canonical-path": "0.0.2", - "chai": "4.2.0", "chokidar": "1.7.0", "clang-format": "1.0.41", "cldr": "4.10.0", @@ -125,7 +123,7 @@ "source-map": "^0.6.1", "source-map-support": "0.4.18", "systemjs": "0.18.10", - "tsickle": "0.32", + "tsickle": "0.32.1", "tslint": "5.7.0", "tslint-eslint-rules": "4.1.1", "tsutils": "2.27.2", diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl index 5783078b6f..7f94a25a64 100644 --- a/packages/bazel/package.bzl +++ b/packages/bazel/package.bzl @@ -40,15 +40,6 @@ def rules_angular_dependencies(): ], ) - # Angular apps don't necessarily depend on Sass, but it's common enough - _maybe( - http_archive, - name = "io_bazel_rules_sass", - sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03", - strip_prefix = "rules_sass-1.11.0", - url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip", - ) - rules_typescript_dependencies() rules_nodejs_dependencies() @@ -103,6 +94,13 @@ def rules_angular_dev_dependencies(): ############################################# # Dependencies for generating documentation # ############################################# + http_archive( + name = "io_bazel_rules_sass", + sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03", + strip_prefix = "rules_sass-1.11.0", + url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip", + ) + http_archive( name = "io_bazel_skydoc", sha256 = "7bfb5545f59792a2745f2523b9eef363f9c3e7274791c030885e7069f8116016", diff --git a/packages/bazel/package.json b/packages/bazel/package.json index 0efb732f0b..ba7bcf750d 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -12,9 +12,10 @@ }, "typings": "./src/ngc-wrapped/index.d.ts", "dependencies": { - "@bazel/typescript": "^0.19.1", + "@bazel/typescript": "^0.20.3", "@types/node": "6.0.84", - "tsickle": "0.28.0" + "shelljs": "0.8.2", + "tsickle": "0.32.1" }, "peerDependencies": { "@angular/compiler-cli": "0.0.0-PLACEHOLDER", diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl index 861e48987b..6b89ba0c70 100644 --- a/packages/bazel/src/ng_module.bzl +++ b/packages/bazel/src/ng_module.bzl @@ -551,13 +551,14 @@ NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{ "node_modules": attr.label( doc = """The npm packages which should be available during the compile. - The default value is `@npm//typescript:typescript__typings` is setup - for projects that use bazel managed npm deps that. It is recommended + The default value of `@npm//typescript:typescript__typings` is + for projects that use bazel managed npm deps. It is recommended that you use the workspace name `@npm` for bazel managed deps so the - default node_modules works out of the box. Otherwise, you'll have to + default value works out of the box. Otherwise, you'll have to override the node_modules attribute manually. This default is in place - since ng_module will always depend on at least the typescript - default libs which are provided by `@npm//typescript:typescript__typings`. + since code compiled by ng_module will always depend on at least the + typescript default libs which are provided by + `@npm//typescript:typescript__typings`. This attribute is DEPRECATED. As of version 0.18.0 the recommended approach to npm dependencies is to use fine grained npm dependencies @@ -569,7 +570,7 @@ NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{ ng_module( name = "my_lib", ... - node_modules = "@npm//node_modules", + node_modules = "//:node_modules", ) ``` diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel index 616e7f2c5d..ccd064ca88 100644 --- a/packages/bazel/src/ng_package/BUILD.bazel +++ b/packages/bazel/src/ng_package/BUILD.bazel @@ -11,14 +11,20 @@ exports_files([ ts_library( name = "lib", srcs = glob(["*.ts"]), - node_modules = "@angular_packager_deps//:node_modules", + node_modules = "@ngdeps//typescript:typescript__typings", tsconfig = ":tsconfig.json", + deps = [ + "@ngdeps//@types/node", + "@ngdeps//@types/shelljs", + ], ) nodejs_binary( name = "packager", - data = ["lib"], + data = [ + "lib", + "@ngdeps//shelljs", + ], entry_point = "angular/packages/bazel/src/ng_package/packager.js", install_source_map_support = False, - node_modules = "@angular_packager_deps//:node_modules", ) diff --git a/packages/bazel/src/ng_package/package.json b/packages/bazel/src/ng_package/package.json deleted file mode 100644 index 5bdd3ddceb..0000000000 --- a/packages/bazel/src/ng_package/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "description": "runtime dependences for packager", - "devDependencies": { - "@types/node": "6.0.84", - "@types/shelljs": "0.7.7", - "shelljs": "0.8.2", - "typescript": "2.7.2" - } -} diff --git a/packages/bazel/src/ng_package/tsconfig.json b/packages/bazel/src/ng_package/tsconfig.json index e9b6c07f85..9e2ce1d17c 100644 --- a/packages/bazel/src/ng_package/tsconfig.json +++ b/packages/bazel/src/ng_package/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "noImplicitAny": true, - "lib": ["es2015"] + "lib": ["es2015"], + "types": [] } } diff --git a/packages/bazel/src/ng_setup_workspace.bzl b/packages/bazel/src/ng_setup_workspace.bzl index e9aeecdda2..1926aaf393 100644 --- a/packages/bazel/src/ng_setup_workspace.bzl +++ b/packages/bazel/src/ng_setup_workspace.bzl @@ -5,7 +5,6 @@ "Install toolchain dependencies" -load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") load("@build_bazel_rules_typescript//:defs.bzl", "check_rules_typescript_version") def ng_setup_workspace(): @@ -14,11 +13,6 @@ def ng_setup_workspace(): It creates some additional Bazel external repositories that are used internally by the Angular rules. """ - yarn_install( - name = "angular_packager_deps", - package_json = "@angular//packages/bazel/src/ng_package:package.json", - yarn_lock = "@angular//packages/bazel/src/ng_package:yarn.lock", - ) # 0.16.0: minimal version required to work with ng_module # 0.16.2: bazel type resolution for zone.js types diff --git a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel index d2aec69dd4..59b24432f9 100644 --- a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel @@ -14,5 +14,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/host", "//packages/compiler-cli/src/ngtsc/metadata", "//packages/compiler-cli/src/ngtsc/util", + "@ngdeps//typescript", ], ) diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel index 49f6215f48..8a2bb98da1 100644 --- a/packages/core/test/bundling/animation_world/BUILD.bazel +++ b/packages/core/test/bundling/animation_world/BUILD.bazel @@ -35,9 +35,6 @@ ng_rollup_bundle( js_expected_symbol_test( name = "symbol_test", src = ":bundle.min_debug.js", - data = [ - "@ngdeps//typescript", - ], golden = ":bundle.golden_symbols.json", tags = [ "ivy-local", diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel index 719ecb5373..e577e4ba01 100644 --- a/packages/core/test/bundling/hello_world/BUILD.bazel +++ b/packages/core/test/bundling/hello_world/BUILD.bazel @@ -59,9 +59,6 @@ jasmine_node_test( js_expected_symbol_test( name = "symbol_test", src = ":bundle.min_debug.js", - data = [ - "@ngdeps//typescript", - ], golden = ":bundle.golden_symbols.json", tags = [ "ivy-local", diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel index 61f5290f8a..25d087e7c5 100644 --- a/packages/core/test/bundling/hello_world_r2/BUILD.bazel +++ b/packages/core/test/bundling/hello_world_r2/BUILD.bazel @@ -54,9 +54,6 @@ jasmine_node_test( js_expected_symbol_test( name = "symbol_test", src = ":bundle.min_debug.js", - data = [ - "@ngdeps//typescript", - ], golden = ":bundle.golden_symbols.json", ) diff --git a/packages/core/test/bundling/injection/BUILD.bazel b/packages/core/test/bundling/injection/BUILD.bazel index e36d010c06..0609034d56 100644 --- a/packages/core/test/bundling/injection/BUILD.bazel +++ b/packages/core/test/bundling/injection/BUILD.bazel @@ -11,7 +11,6 @@ ts_library( ], deps = [ "//packages/core", - "@ngdeps//typescript", ], ) @@ -50,8 +49,5 @@ jasmine_node_test( js_expected_symbol_test( name = "symbol_test", src = ":bundle.min_debug.js", - data = [ - "@ngdeps//typescript", - ], golden = ":bundle.golden_symbols.json", ) diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel index 07ad3a137e..dc81608b26 100644 --- a/packages/core/test/bundling/todo/BUILD.bazel +++ b/packages/core/test/bundling/todo/BUILD.bazel @@ -66,9 +66,6 @@ jasmine_node_test( js_expected_symbol_test( name = "symbol_test", src = ":bundle.min_debug.js", - data = [ - "@ngdeps//typescript", - ], golden = ":bundle.golden_symbols.json", tags = [ "ivy-local", diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel index e7d192489b..031a71f250 100644 --- a/packages/core/test/bundling/todo_r2/BUILD.bazel +++ b/packages/core/test/bundling/todo_r2/BUILD.bazel @@ -72,9 +72,6 @@ jasmine_node_test( js_expected_symbol_test( name = "symbol_test", src = ":bundle.min_debug.js", - data = [ - "@ngdeps//typescript", - ], golden = ":bundle.golden_symbols.json", tags = [ "ivy-local", diff --git a/tools/ng_setup_workspace.bzl b/tools/ng_setup_workspace.bzl index d69905b8b9..d1afc8603b 100644 --- a/tools/ng_setup_workspace.bzl +++ b/tools/ng_setup_workspace.bzl @@ -22,7 +22,7 @@ def ng_setup_workspace(): ) yarn_install( - name = "ts-api-guardian_runtime_deps", + name = "ts-api-guardian_deps", package_json = "@angular//tools/ts-api-guardian:package.json", yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock", ) diff --git a/tools/symbol-extractor/index.bzl b/tools/symbol-extractor/index.bzl index d5017b4d06..1237feb754 100644 --- a/tools/symbol-extractor/index.bzl +++ b/tools/symbol-extractor/index.bzl @@ -13,9 +13,13 @@ load("@build_bazel_rules_nodejs//internal/node:node.bzl", "nodejs_binary", "node def js_expected_symbol_test(name, src, golden, data = [], **kwargs): """This test verifies that a set of top level symbols from a javascript file match a gold file. """ - all_data = data + [src, golden] - all_data += [Label("//tools/symbol-extractor:lib")] - all_data += [Label("@bazel_tools//tools/bash/runfiles")] + all_data = data + [ + src, + golden, + Label("//tools/symbol-extractor:lib"), + Label("@bazel_tools//tools/bash/runfiles"), + Label("@ngdeps//typescript"), + ] entry_point = "angular/tools/symbol-extractor/cli.js" nodejs_test( diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index 169e7eb4bb..b22e829c1b 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -13,9 +13,17 @@ ts_library( name = "lib", srcs = glob(["lib/*.ts"]), module_name = "ts-api-guardian", - node_modules = "@ts-api-guardian_runtime_deps//:node_modules", + node_modules = "@ts-api-guardian_deps//typescript:typescript__typings", tsconfig = "//tools:tsconfig.json", visibility = ["//visibility:public"], + deps = [ + "@ts-api-guardian_deps//@types/diff", + "@ts-api-guardian_deps//@types/minimist", + "@ts-api-guardian_deps//@types/node", + "@ts-api-guardian_deps//diff", + "@ts-api-guardian_deps//minimist", + "@ts-api-guardian_deps//typescript", + ], ) # Copy Angular's license to govern ts-api-guardian as well. @@ -47,16 +55,16 @@ ts_library( name = "test_lib", testonly = True, srcs = glob(["test/*.ts"]), - node_modules = "@ngdeps//typescript:typescript__typings", + node_modules = "@ts-api-guardian_deps//typescript:typescript__typings", tsconfig = "//tools:tsconfig-test", deps = [ ":lib", - "@ngdeps//@types/chai", - "@ngdeps//@types/jasmine", - "@ngdeps//@types/node", - "@ngdeps//chai", - "@ngdeps//jasmine", - "@ngdeps//typescript", + "@ts-api-guardian_deps//@types/chai", + "@ts-api-guardian_deps//@types/jasmine", + "@ts-api-guardian_deps//@types/node", + "@ts-api-guardian_deps//chai", + "@ts-api-guardian_deps//jasmine", + "@ts-api-guardian_deps//typescript", ], ) @@ -69,7 +77,8 @@ jasmine_node_test( "test/fixtures/*.patch", ]) + [ ":ts-api-guardian", + "@ts-api-guardian_deps//chalk", ], - node_modules = "@ts-api-guardian_runtime_deps//:node_modules", + node_modules = "@ts-api-guardian_deps//typescript:typescript__typings", tags = ["local"], ) diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl index 08fc31242a..1a0556de49 100644 --- a/tools/ts-api-guardian/index.bzl +++ b/tools/ts-api-guardian/index.bzl @@ -42,7 +42,7 @@ def ts_api_guardian_test(name, golden, actual, data = [], strip_export_pattern = nodejs_test( name = name, data = data, - node_modules = "@ts-api-guardian_runtime_deps//:node_modules", + node_modules = "@ts-api-guardian_deps//:node_modules", entry_point = "angular/tools/ts-api-guardian/bin/ts-api-guardian", templated_args = args + ["--verify", golden, actual], **kwargs @@ -52,7 +52,7 @@ def ts_api_guardian_test(name, golden, actual, data = [], strip_export_pattern = name = name + ".accept", testonly = True, data = data, - node_modules = "@ts-api-guardian_runtime_deps//:node_modules", + node_modules = "@ts-api-guardian_deps//:node_modules", entry_point = "angular/tools/ts-api-guardian/bin/ts-api-guardian", templated_args = args + ["--out", golden, actual], **kwargs diff --git a/tools/ts-api-guardian/package.json b/tools/ts-api-guardian/package.json index 152b6c422d..74da9ae438 100644 --- a/tools/ts-api-guardian/package.json +++ b/tools/ts-api-guardian/package.json @@ -19,7 +19,9 @@ "minimist": "^1.2.0" }, "devDependencies": { + "@types/chai": "^4.1.2", "@types/diff": "^3.5.1", + "@types/jasmine": "^2.8.8", "@types/minimist": "^1.2.0", "@types/node": "^10.9.2", "chai": "^4.1.2", diff --git a/tools/ts-api-guardian/yarn.lock b/tools/ts-api-guardian/yarn.lock index 6803495652..8e63689438 100644 --- a/tools/ts-api-guardian/yarn.lock +++ b/tools/ts-api-guardian/yarn.lock @@ -2,35 +2,52 @@ # yarn lockfile v1 +"@types/chai@^4.1.2": + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.6.tgz#1eb26c040e3a84205b1008ad55c800e5e8a94e34" + integrity sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw== + "@types/diff@^3.5.1": version "3.5.1" resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.5.1.tgz#30253f6e177564ad7da707b1ebe46d3eade71706" + integrity sha512-nkT7bd/YM6QRDQjww8PYf0kOj1MvwxQ/WaCinj2Hm1HlL+JqGTm4cDoQeROfiWX/B3SNI1nyLLhLAQpp5sE3hw== + +"@types/jasmine@^2.8.8": + version "2.8.9" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.9.tgz#e028c891e8551fdf6de905d959581fc4fa0b5509" + integrity sha512-8dPZwjosElZOGGYw1nwTvOEMof4gjwAWNFS93nBI091BoEfd5drnHOLRMiRF/LOPuMTn5LgEdv0bTUO8QFVuHQ== "@types/minimist@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6" + integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= "@types/node@^10.9.2": version "10.9.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.2.tgz#f0ab8dced5cd6c56b26765e1c0d9e4fdcc9f2a00" + integrity sha512-pwZnkVyCGJ3LsQ0/3flQK5lCFao4esIzwUVzzk5NvL9vnkEyDhNf4fhHzUMHvyr56gNZywWTS2MR0euabMSz4A== ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" assertion-error@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" + integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" @@ -38,6 +55,7 @@ brace-expansion@^1.1.7: chai@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c" + integrity sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw= dependencies: assertion-error "^1.0.1" check-error "^1.0.1" @@ -49,6 +67,7 @@ chai@^4.1.2: chalk@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" + integrity sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ== dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -57,46 +76,56 @@ chalk@^2.3.1: check-error@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" + integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= color-convert@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" + integrity sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ== dependencies: color-name "^1.1.1" color-name@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= deep-eql@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" + integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== dependencies: type-detect "^4.0.0" diff@^3.4.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" + integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" + integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= glob@^7.0.6: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -108,10 +137,12 @@ glob@^7.0.6: has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" wrappy "1" @@ -119,14 +150,17 @@ inflight@^1.0.4: inherits@2: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= jasmine-core@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c" + integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw= jasmine@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.1.0.tgz#2bd59fd7ec6ec0e8acb64e09f45a68ed2ad1952a" + integrity sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo= dependencies: glob "^7.0.6" jasmine-core "~3.1.0" @@ -134,41 +168,50 @@ jasmine@^3.1.0: minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= pathval@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0" + integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA= supports-color@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" + integrity sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg== dependencies: has-flag "^3.0.0" type-detect@^4.0.0: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== typescript@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96" + integrity sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ== wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= diff --git a/yarn.lock b/yarn.lock index 3d41df7bb5..6b01af7048 100644 --- a/yarn.lock +++ b/yarn.lock @@ -70,11 +70,6 @@ resolved "https://registry.yarnpkg.com/@types/base64-js/-/base64-js-1.2.5.tgz#582b2476169a6cba460a214d476c744441d873d5" integrity sha1-WCskdhaabLpGCiFNR2x0REHYc9U= -"@types/chai@^4.1.2": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.4.tgz#5ca073b330d90b4066d6ce18f60d57f2084ce8ca" - integrity sha512-h6+VEw2Vr3ORiFCyyJmcho2zALnUq9cvdB/IO8Xs9itrJVCenC7o26A6+m7D0ihTTr65eS259H5/Ghl/VjYs6g== - "@types/chokidar@1.7.3": version "1.7.3" resolved "https://registry.yarnpkg.com/@types/chokidar/-/chokidar-1.7.3.tgz#ca87a53aa596c01eb93237ab4055edf71dcb9ca6" @@ -680,11 +675,6 @@ assert@^1.1.1: dependencies: util "0.10.3" -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -1283,18 +1273,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chai@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5" - integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^3.0.1" - get-func-name "^2.0.0" - pathval "^1.1.0" - type-detect "^4.0.5" - "chainsaw@>=0.0.7 <0.1": version "0.0.9" resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e" @@ -1320,11 +1298,6 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= - chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.4.1: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -2143,13 +2116,6 @@ decompress-zip@0.3.0: readable-stream "^1.1.8" touch "0.0.3" -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== - dependencies: - type-detect "^4.0.0" - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -3249,11 +3215,6 @@ get-caller-file@^1.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" integrity sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U= -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= - get-pkg-repo@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d" @@ -6354,11 +6315,6 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" -pathval@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0" - integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA= - pause-stream@0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" @@ -8334,10 +8290,10 @@ tsickle@0.28.0: source-map "^0.6.0" source-map-support "^0.5.0" -tsickle@0.32: - version "0.32.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.0.tgz#8027eecf5872b4451ffae821a5fdbd0b3206c139" - integrity sha512-n/XCe2J2oiWNf/JNG18K0isS7dC16znYUvCf11/CuCQbJQGvLAPWyD11543oMtLGUD7A/ygHW62kfQfy182Mfw== +tsickle@0.32.1: + version "0.32.1" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5" + integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw== dependencies: jasmine-diff "^0.1.3" minimist "^1.2.0" @@ -8436,11 +8392,6 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@^4.0.0, type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - type-is@~1.6.10, type-is@~1.6.16, type-is@~1.6.6: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"