diff --git a/.bazelrc b/.bazelrc index 0704eeca0a66..c8af3b4f534b 100644 --- a/.bazelrc +++ b/.bazelrc @@ -141,4 +141,8 @@ common --experimental_allow_incremental_repository_updates # Load any settings which are specific to the current user. Needs to be *last* statement # in this config, as the user configuration should be able to overwrite flags from this file. -try-import .bazelrc.user \ No newline at end of file +try-import .bazelrc.user + +# Enable runfiles even on Windows. +# Architect resolves output files from data files, and this isn't possible without runfile support. +test --enable_runfiles \ No newline at end of file diff --git a/WORKSPACE b/WORKSPACE index 4db24eaa2e6d..0f9b43fad582 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -17,7 +17,7 @@ git_repository( name = "com_google_protobuf", commit = "6263268b8c1b78a8a9b65acd6f5dd5c04dd9b0e1", remote = "https://github.com/protocolbuffers/protobuf", - shallow_since = "1559159889 -0400", + shallow_since = "1576607245 -0800", ) load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") diff --git a/docs/process/bazel.md b/docs/process/bazel.md index 01a63a1f0a67..0f14a7dc5ae3 100644 --- a/docs/process/bazel.md +++ b/docs/process/bazel.md @@ -23,6 +23,25 @@ well. This is to ensure that when users download a published version from NPM, they will be able to install all dependencies correctly without Bazel. It is the responsibility of the developer to keep both `package.json` in sync. +## Windows support + +In general, any sort of node file lookup on Bazel should be subject to `require.resolve`. +This is how rules_nodejs resolves paths using the Bazel runfiles mechanism, where a given +Bazel target only has access to outputs from its dependencies. + +In practice, this does not make a lot of difference on Linux. +A symlink forest is laid down where the target is going to actually run, and mostly the +files are resolved correctly whether you use `require.resolve` or not because the files are there. + +On Windows though, that's a stricter. Bazel does not lay down a symlink forest on +windows by default. If you don't use `require.resolve`, it's still possible to correctly +resolve some files, like outputs from other rules. But other files, like node modules +dependencies and data files, need to be looked up in the runfiles. + +Since the requirement is quite lax on Linux but quite strict on windows, what ends up +happening is that lack of `require.resolve` calls go unnoticed until someone tries to run +things on Windows, at which point it breaks. + ## Issues 1. Yarn workspaces is not compatible with Bazel-managed deps diff --git a/package.json b/package.json index 04640eae8557..56666143fe65 100644 --- a/package.json +++ b/package.json @@ -107,11 +107,13 @@ "conventional-changelog": "^3.0.0", "conventional-commits-parser": "^3.0.0", "debug": "^4.1.1", + "enhanced-resolve": "4.1.1", "fast-json-stable-stringify": "2.1.0", "gh-got": "^9.0.0", "git-raw-commits": "^2.0.0", "glob": "^7.0.3", "husky": "^4.0.10", + "inquirer": "7.1.0", "jasmine": "^3.3.1", "jasmine-spec-reporter": "~5.0.0", "karma": "~4.4.1", @@ -123,18 +125,21 @@ "node-fetch": "^2.2.0", "npm-registry-client": "8.6.0", "ora": "^4.0.2", - "pacote": "9.5.12", - "pidtree": "^0.4.0", + "pacote": "11.1.4", + "parse5-html-rewriting-stream": "5.1.1", + "pidtree": "^0.3.0", "pidusage": "^2.0.17", "prettier": "^2.0.0", "puppeteer": "2.1.1", "quicktype-core": "^6.0.15", + "raw-loader": "4.0.0", "rxjs": "6.5.4", "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz", "semver": "7.1.3", "source-map": "^0.7.3", "source-map-support": "^0.5.0", "spdx-satisfies": "^5.0.0", + "symbol-observable": "1.2.0", "tar": "^6.0.0", "temp": "^0.9.0", "through2": "^3.0.0", @@ -145,7 +150,9 @@ "tslint-no-circular-imports": "^0.7.0", "tslint-sonarts": "1.9.0", "typescript": "3.8.3", - "verdaccio": "4.5.1" + "verdaccio": "4.5.1", + "webpack": "4.42.0", + "webpack-sources": "1.4.3" }, "husky": { "hooks": { diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD.bazel similarity index 68% rename from packages/angular/cli/BUILD rename to packages/angular/cli/BUILD.bazel index 806b50bc4848..ac2868a1f7de 100644 --- a/packages/angular/cli/BUILD +++ b/packages/angular/cli/BUILD.bazel @@ -6,6 +6,7 @@ licenses(["notice"]) # MIT load("@npm_bazel_typescript//:index.bzl", "ts_library") +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("//tools:ts_json_schema.bzl", "ts_json_schema") package(default_visibility = ["//visibility:public"]) @@ -18,7 +19,28 @@ ts_library( "**/*_spec.ts", "**/*_spec_large.ts", ], - ), + ) + [ + "//packages/angular/cli:lib/config/schema.ts", + "//packages/angular/cli:commands/analytics.ts", + "//packages/angular/cli:commands/add.ts", + "//packages/angular/cli:commands/build.ts", + "//packages/angular/cli:commands/deploy.ts", + "//packages/angular/cli:commands/config.ts", + "//packages/angular/cli:commands/deprecated.ts", + "//packages/angular/cli:commands/doc.ts", + "//packages/angular/cli:commands/e2e.ts", + "//packages/angular/cli:commands/easter-egg.ts", + "//packages/angular/cli:commands/generate.ts", + "//packages/angular/cli:commands/help.ts", + "//packages/angular/cli:commands/lint.ts", + "//packages/angular/cli:commands/new.ts", + "//packages/angular/cli:commands/serve.ts", + "//packages/angular/cli:commands/test.ts", + "//packages/angular/cli:commands/update.ts", + "//packages/angular/cli:commands/version.ts", + "//packages/angular/cli:commands/run.ts", + "//packages/angular/cli:commands/xi18n.ts", + ], data = glob([ "**/*.json", "**/*.md", @@ -26,13 +48,12 @@ ts_library( module_name = "@angular/cli", # strict_checks = False, deps = [ - ":command_schemas", "//packages/angular_devkit/architect", - "//packages/angular_devkit/architect:node", + "//packages/angular_devkit/architect/node", "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "//packages/angular_devkit/core/node", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:tools", + "//packages/angular_devkit/schematics/tools", # @node_module: typescript:es2017.object "@npm//@types/debug", "@npm//@types/node", @@ -45,33 +66,6 @@ ts_library( ], ) -ts_library( - name = "command_schemas", - srcs = [], - deps = [ - ":add_schema", - ":analytics_schema", - ":build_schema", - ":cli_schema", - ":config_schema", - ":deploy_schema", - ":deprecated_schema", - ":doc_schema", - ":e2e_schema", - ":easter_egg_schema", - ":generate_schema", - ":help_schema", - ":lint_schema", - ":new_schema", - ":run_schema", - ":serve_schema", - ":test_schema", - ":update_schema", - ":version_schema", - ":xi18n_schema", - ], -) - ts_json_schema( name = "cli_schema", src = "lib/config/schema.json", @@ -228,3 +222,27 @@ ts_json_schema( "commands/definitions.json", ], ) + +ts_library( + name = "angular-cli_test_lib", + testonly = True, + srcs = glob( + include = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + ], + ), + # strict_checks = False, + tsconfig = "//:tsconfig-test.json", + deps = [ + ":angular-cli", + "//packages/angular_devkit/core", + "@npm//@types/jasmine", + "@npm//@types/node", + ], +) + +jasmine_node_test( + name = "angular-cli_test", + srcs = [":angular-cli_test_lib"], +) diff --git a/packages/angular/pwa/BUILD b/packages/angular/pwa/BUILD.bazel similarity index 57% rename from packages/angular/pwa/BUILD rename to packages/angular/pwa/BUILD.bazel index e82da86cfb9b..e0f893135f77 100644 --- a/packages/angular/pwa/BUILD +++ b/packages/angular/pwa/BUILD.bazel @@ -6,6 +6,7 @@ licenses(["notice"]) # MIT load("@npm_bazel_typescript//:index.bzl", "ts_library") +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("//tools:ts_json_schema.bzl", "ts_json_schema") package(default_visibility = ["//visibility:public"]) @@ -24,12 +25,23 @@ ts_library( "**/*_spec.ts", "**/*_spec_large.ts", ], + ) + [ + "//packages/angular/pwa:pwa/schema.ts", + ], + data = glob( + include = [ + "collection.json", + "package.json", + "pwa/schema.json", + "pwa/files/**/*", + ], ), deps = [ - ":pwa_schema", "//packages/angular_devkit/core", "//packages/angular_devkit/schematics", + "//packages/schematics/angular", "@npm//@types/node", + "@npm//parse5-html-rewriting-stream", "@npm//rxjs", ], ) @@ -38,3 +50,27 @@ ts_json_schema( name = "pwa_schema", src = "pwa/schema.json", ) + +ts_library( + name = "pwa_test_lib", + testonly = True, + srcs = glob( + include = [ + "pwa/**/*_spec.ts", + "pwa/**/*_spec_large.ts", + ], + ), + # strict_checks = False, + tsconfig = "//:tsconfig-test.json", + deps = [ + ":pwa", + "//packages/angular_devkit/schematics/testing", + "@npm//@types/jasmine", + "@npm//@types/node", + ], +) + +jasmine_node_test( + name = "pwa_test", + srcs = [":pwa_test_lib"], +) diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts index fa0b457a036a..3f1f3490d52d 100644 --- a/packages/angular/pwa/pwa/index_spec.ts +++ b/packages/angular/pwa/pwa/index_spec.ts @@ -12,7 +12,7 @@ import { Schema as PwaOptions } from './schema'; describe('PWA Schematic', () => { const schematicRunner = new SchematicTestRunner( '@angular/pwa', - path.join(__dirname, '../collection.json'), + require.resolve(path.join(__dirname, '../collection.json')), ); const defaultOptions: PwaOptions = { project: 'bar', diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD.bazel similarity index 59% rename from packages/angular_devkit/architect/BUILD rename to packages/angular_devkit/architect/BUILD.bazel index 6f05d50d499d..6e8e892fbfb8 100644 --- a/packages/angular_devkit/architect/BUILD +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -5,6 +5,8 @@ licenses(["notice"]) # MIT +load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("@npm_bazel_typescript//:index.bzl", "ts_library") # @external_begin @@ -35,30 +37,6 @@ ts_json_schema( src = "src/progress-schema.json", ) -ts_library( - name = "node", - srcs = glob( - include = ["node/**/*.ts"], - exclude = [ - "**/*_spec.ts", - "**/*_spec_large.ts", - ], - ), - module_name = "@angular-devkit/architect/node", - module_root = "node/index.d.ts", - # strict_checks = False, - deps = [ - ":architect", - ":builder_builders_schema", - ":builder_input_schema", - ":builder_output_schema", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "@npm//@types/node", - "@npm//rxjs", - ], -) - ts_library( name = "architect", srcs = glob( @@ -67,48 +45,65 @@ ts_library( "**/*_spec.ts", "**/*_spec_large.ts", ], - ), + ) + [ + "//packages/angular_devkit/architect:src/input-schema.ts", + "//packages/angular_devkit/architect:src/output-schema.ts", + "//packages/angular_devkit/architect:src/builders-schema.ts", + "//packages/angular_devkit/architect:src/progress-schema.ts", + ], # strict_checks = False, data = glob(["**/*.json"]), module_name = "@angular-devkit/architect", module_root = "src/index.d.ts", deps = [ - ":builder_input_schema", - ":builder_output_schema", - ":progress_schema", "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "//packages/angular_devkit/core/node", "@npm//@types/node", "@npm//rxjs", ], ) ts_library( - name = "testing", + name = "architect_test_lib", + testonly = True, srcs = glob( - include = ["testing/**/*.ts"], - exclude = [ - "**/*_spec.ts", - "**/*_spec_large.ts", + include = [ + "src/**/*_spec.ts", + "src/**/*_spec_large.ts", ], ), - module_name = "@angular-devkit/architect/testing", - module_root = "testing/index.d.ts", + # strict_checks = False, + tsconfig = "//:tsconfig-test.json", deps = [ ":architect", + "//packages/angular_devkit/architect/testing", "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "@npm//@types/jasmine", "@npm//@types/node", "@npm//rxjs", ], ) +jasmine_node_test( + name = "architect_test", + srcs = [":architect_test_lib"], +) + # @external_begin pkg_npm( name = "npm_package", deps = [ ":architect", - ":testing", + "//packages/angular_devkit/architect/node", + "//packages/angular_devkit/architect/testing", ], ) + +pkg_tar( + name = "npm_package_archive", + srcs = [":npm_package"], + extension = "tar.gz", + strip_prefix = "./npm_package", + tags = ["manual"], +) # @external_end diff --git a/packages/angular_devkit/architect/node/BUILD.bazel b/packages/angular_devkit/architect/node/BUILD.bazel new file mode 100644 index 000000000000..c42dd0377573 --- /dev/null +++ b/packages/angular_devkit/architect/node/BUILD.bazel @@ -0,0 +1,31 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license + +licenses(["notice"]) # MIT + +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +package(default_visibility = ["//visibility:public"]) + +ts_library( + name = "node", + srcs = glob( + include = ["**/*.ts"], + exclude = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + ], + ), + module_name = "@angular-devkit/architect/node", + module_root = "index.d.ts", + # strict_checks = False, + deps = [ + "//packages/angular_devkit/architect", + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "@npm//@types/node", + "@npm//rxjs", + ], +) diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts index 9e78000ea783..f723611891de 100644 --- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts +++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts @@ -143,7 +143,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost { - const builder = (await import(info.import)).default; + // f1 const is a temporary workaround for a TS bug with UMDs. + // See microsoft/TypeScript#36780. Should be removed when + // https://github.com/bazelbuild/rules_typescript/pull/492 goes in. + const f1 = info.import; + const builder = (await import(f1)).default; if (builder[BuilderSymbol]) { return builder; } diff --git a/packages/angular_devkit/architect/testing/BUILD.bazel b/packages/angular_devkit/architect/testing/BUILD.bazel new file mode 100644 index 000000000000..2af583f8c4aa --- /dev/null +++ b/packages/angular_devkit/architect/testing/BUILD.bazel @@ -0,0 +1,30 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license + +licenses(["notice"]) # MIT + +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +package(default_visibility = ["//visibility:public"]) + +ts_library( + name = "testing", + srcs = glob( + include = ["**/*.ts"], + exclude = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + ], + ), + module_name = "@angular-devkit/architect/testing", + module_root = "index.d.ts", + deps = [ + "//packages/angular_devkit/architect", + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "@npm//@types/node", + "@npm//rxjs", + ], +) diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts index c7d901f3906b..d5fd05479a37 100644 --- a/packages/angular_devkit/architect/testing/testing-architect-host.ts +++ b/packages/angular_devkit/architect/testing/testing-architect-host.ts @@ -36,7 +36,11 @@ export class TestingArchitectHost implements ArchitectHost { this._builderMap.set(builderName, { builderName, description, optionSchema }); } async addBuilderFromPackage(packageName: string) { - const packageJson = await import(packageName + '/package.json'); + // f1 const is a temporary workaround for a TS bug with UMDs. + // See microsoft/TypeScript#36780. Should be removed when + // https://github.com/bazelbuild/rules_typescript/pull/492 goes in. + const f1 = packageName + '/package.json'; + const packageJson = await import(f1); if (!('builders' in packageJson)) { throw new Error('Invalid package.json, builders key not found.'); } @@ -56,8 +60,13 @@ export class TestingArchitectHost implements ArchitectHost { const b = builders[builderName]; // TODO: remove this check as v1 is not supported anymore. if (!b.implementation) { continue; } - const handler = (await import(builderJsonPath + '/../' + b.implementation)).default; - const optionsSchema = await import(builderJsonPath + '/../' + b.schema); + // f2 and f3 consts are a temporary workaround for a TS bug with UMDs. + // See microsoft/TypeScript#36780. Should be removed when + // https://github.com/bazelbuild/rules_typescript/pull/492 goes in. + const f2 = builderJsonPath + '/../' + b.implementation; + const handler = (await import(f2)).default; + const f3 = builderJsonPath + '/../' + b.schema; + const optionsSchema = await import(f3); this.addBuilder(`${packageJson.name}:${builderName}`, handler, b.description, optionsSchema); } } diff --git a/packages/angular_devkit/architect_cli/BUILD b/packages/angular_devkit/architect_cli/BUILD.bazel similarity index 87% rename from packages/angular_devkit/architect_cli/BUILD rename to packages/angular_devkit/architect_cli/BUILD.bazel index bec3a8a165a5..fa8bfe9031e6 100644 --- a/packages/angular_devkit/architect_cli/BUILD +++ b/packages/angular_devkit/architect_cli/BUILD.bazel @@ -16,9 +16,9 @@ ts_library( module_name = "@angular-devkit/architect-cli", deps = [ "//packages/angular_devkit/architect", - "//packages/angular_devkit/architect:node", + "//packages/angular_devkit/architect/node", "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "//packages/angular_devkit/core/node", "@npm//@types/minimist", "@npm//@types/node", "@npm//@types/progress", diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD.bazel similarity index 86% rename from packages/angular_devkit/benchmark/BUILD rename to packages/angular_devkit/benchmark/BUILD.bazel index e7266d8ebd10..033d2029513d 100644 --- a/packages/angular_devkit/benchmark/BUILD +++ b/packages/angular_devkit/benchmark/BUILD.bazel @@ -5,6 +5,7 @@ licenses(["notice"]) # MIT +load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("@npm_bazel_typescript//:index.bzl", "ts_library") load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") @@ -25,7 +26,7 @@ ts_library( module_root = "src/index.d.ts", deps = [ "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "//packages/angular_devkit/core/node", "@npm//@types/minimist", "@npm//@types/node", "@npm//rxjs", @@ -54,7 +55,7 @@ ts_library( deps = [ ":benchmark", "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "//packages/angular_devkit/core/node", "@npm//@types/jasmine", "@npm//@types/node", "@npm//rxjs", @@ -82,3 +83,11 @@ pkg_npm( ":benchmark", ], ) + +pkg_tar( + name = "npm_package_archive", + srcs = [":npm_package"], + extension = "tar.gz", + strip_prefix = "./npm_package", + tags = ["manual"], +) diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD.bazel similarity index 80% rename from packages/angular_devkit/build_optimizer/BUILD rename to packages/angular_devkit/build_optimizer/BUILD.bazel index e775bced2391..b3f7297aaa11 100644 --- a/packages/angular_devkit/build_optimizer/BUILD +++ b/packages/angular_devkit/build_optimizer/BUILD.bazel @@ -5,6 +5,7 @@ licenses(["notice"]) # MIT +load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("@npm_bazel_typescript//:index.bzl", "ts_library") load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") @@ -24,6 +25,14 @@ ts_library( "src/**/*_benchmark.ts", ], ), + data = glob( + include = [ + "package.json", + "webpack-loader/package.json", + ], + ), + module_name = "@angular-devkit/build-optimizer", + module_root = "src/index.d.ts", deps = [ "@npm//@types/node", "@npm//@types/webpack", @@ -70,3 +79,11 @@ pkg_npm( ":build_optimizer", ], ) + +pkg_tar( + name = "npm_package_archive", + srcs = [":npm_package"], + extension = "tar.gz", + strip_prefix = "./npm_package", + tags = ["manual"], +) diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD.bazel similarity index 54% rename from packages/angular_devkit/core/BUILD rename to packages/angular_devkit/core/BUILD.bazel index 6fe33923b439..c5bdacb4e49f 100644 --- a/packages/angular_devkit/core/BUILD +++ b/packages/angular_devkit/core/BUILD.bazel @@ -4,6 +4,7 @@ # found in the LICENSE file at https://angular.io/license package(default_visibility = ["//visibility:public"]) +load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("@npm_bazel_typescript//:index.bzl", "ts_library") @@ -56,7 +57,7 @@ ts_library( "src/**/*_spec_large.ts", ], ), - data = [ + data = glob(["src/workspace/json/test/**/*.json"]) + [ "src/experimental/workspace/test/test-workspace.json", "src/experimental/workspace/workspace-schema.json", ], @@ -67,7 +68,7 @@ ts_library( # @external_end deps = [ ":core", - ":node", + "//packages/angular_devkit/core/node", "@npm//@types/jasmine", "@npm//@types/node", "@npm//rxjs", @@ -87,98 +88,21 @@ jasmine_node_test( ], ) -# @angular-devkit/core/node - -ts_library( - name = "node", - srcs = glob( - include = ["node/**/*.ts"], - exclude = [ - "node/testing/**/*.ts", - "node/**/*_spec.ts", - "node/**/*_spec_large.ts", - "node/**/*_benchmark.ts", - ], - ), - module_name = "@angular-devkit/core/node", - module_root = "node/index.d.ts", - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - deps = [ - ":core", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -ts_library( - name = "node_test_lib", - testonly = True, - srcs = glob( - include = [ - "node/**/*_spec.ts", - "node/**/*_spec_large.ts", - ], - ), - # @external_begin - tsconfig = "//:tsconfig-test.json", - # @external_end - deps = [ - ":core", - ":node", - "//tests/angular_devkit/core/node/jobs:jobs_test_lib", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -jasmine_node_test( - name = "node_test", - srcs = [":node_test_lib"], - # TODO: Audit tests to determine if tests can be run in RBE environments - local = True, - deps = [ - "@npm//chokidar", - "@npm//temp", - # @node_module: ajv - # @node_module: fast_json_stable_stringify - # @node_module: magic_string - ], -) - -# @angular-devkit/core/node/testing - -ts_library( - name = "node_testing", - srcs = glob( - include = ["node/testing/**/*.ts"], - exclude = [ - "node/testing/**/*_spec.ts", - "node/testing/**/*_spec_large.ts", - "node/testing/**/*_benchmark.ts", - ], - ), - module_name = "@angular-devkit/core/node/testing", - module_root = "node/testing/index.d.ts", - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - deps = [ - ":core", - ":node", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//rxjs", - ], -) - # @external_begin pkg_npm( name = "npm_package", deps = [ ":core", - ":node", - ":node_testing", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/core/node/testing", ], ) + +pkg_tar( + name = "npm_package_archive", + srcs = [":npm_package"], + extension = "tar.gz", + strip_prefix = "./npm_package", + tags = ["manual"], +) # @external_end diff --git a/packages/angular_devkit/core/node/BUILD.bazel b/packages/angular_devkit/core/node/BUILD.bazel new file mode 100644 index 000000000000..6802f8ff9f8d --- /dev/null +++ b/packages/angular_devkit/core/node/BUILD.bazel @@ -0,0 +1,71 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +licenses(["notice"]) # MIT License + +ts_library( + name = "node", + srcs = glob( + include = ["**/*.ts"], + exclude = [ + "testing/**/*.ts", + "**/*_spec.ts", + "**/*_spec_large.ts", + "**/*_benchmark.ts", + ], + ), + module_name = "@angular-devkit/core/node", + module_root = "index.d.ts", + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + deps = [ + "//packages/angular_devkit/core", + "@npm//@types/node", + "@npm//rxjs", + ], +) + +ts_library( + name = "node_test_lib", + testonly = True, + srcs = glob( + include = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + ], + exclude = [ + "testing/**/*.ts", + ], + ), + # @external_begin + tsconfig = "//:tsconfig-test.json", + # @external_end + deps = [ + ":node", + "//packages/angular_devkit/core", + "//tests/angular_devkit/core/node/jobs:jobs_test_lib", + "@npm//@types/jasmine", + "@npm//@types/node", + "@npm//rxjs", + ], +) + +jasmine_node_test( + name = "node_test", + srcs = [":node_test_lib"], + # TODO: Audit tests to determine if tests can be run in RBE environments + local = True, + deps = [ + "@npm//chokidar", + "@npm//temp", + # @node_module: ajv + # @node_module: fast_json_stable_stringify + # @node_module: magic_string + ], +) diff --git a/packages/angular_devkit/core/node/testing/BUILD.bazel b/packages/angular_devkit/core/node/testing/BUILD.bazel new file mode 100644 index 000000000000..f5d0634740b7 --- /dev/null +++ b/packages/angular_devkit/core/node/testing/BUILD.bazel @@ -0,0 +1,32 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +licenses(["notice"]) # MIT License + +ts_library( + name = "testing", + srcs = glob( + include = ["**/*.ts"], + exclude = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + "**/*_benchmark.ts", + ], + ), + module_name = "@angular-devkit/core/node/testing", + module_root = "index.d.ts", + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "@npm//@types/jasmine", + "@npm//@types/node", + "@npm//rxjs", + ], +) diff --git a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts index c21550b07d07..8d21ad8e9828 100644 --- a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts +++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts @@ -28,7 +28,7 @@ const basicFile = stripIndent` "x-bar": 5, }`; -const representativeFile = readFileSync(__dirname + '/test/angular.json', 'utf8'); +const representativeFile = readFileSync(require.resolve(__dirname + '/test/angular.json'), 'utf8'); function createTestHost(content: string, onWrite?: (path: string, data: string) => void) { return { diff --git a/packages/angular_devkit/core/src/workspace/json/writer_spec.ts b/packages/angular_devkit/core/src/workspace/json/writer_spec.ts index 26362e626e5a..a3bce74464bc 100644 --- a/packages/angular_devkit/core/src/workspace/json/writer_spec.ts +++ b/packages/angular_devkit/core/src/workspace/json/writer_spec.ts @@ -30,7 +30,7 @@ const basicFile = stripIndent` "x-bar": 5, }`; -const representativeFile = readFileSync(__dirname + '/test/angular.json', 'utf8'); +const representativeFile = readFileSync(require.resolve(__dirname + '/test/angular.json'), 'utf8'); function createTestCaseHost(inputData = '') { const host = { @@ -39,7 +39,8 @@ function createTestCaseHost(inputData = '') { }, async writeFile(path: string, data: string) { try { - const testCase = readFileSync(join(__dirname, 'test', 'cases', path) + '.json', 'utf8'); + const testCase = readFileSync( + require.resolve(join(__dirname, 'test', 'cases', path) + '.json'), 'utf8'); expect(data).toEqual(testCase); } catch (e) { fail(`Unable to load test case '${path}': ${e.message || e}`); diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD.bazel similarity index 100% rename from packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD rename to packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD.bazel diff --git a/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD.bazel similarity index 100% rename from packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD rename to packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD.bazel diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD deleted file mode 100644 index 3432c749eb89..000000000000 --- a/packages/angular_devkit/schematics/BUILD +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright Google Inc. All Rights Reserved. -# -# Use of this source code is governed by an MIT-style license that can be -# found in the LICENSE file at https://angular.io/license -package(default_visibility = ["//visibility:public"]) - -load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") -load("@npm_bazel_typescript//:index.bzl", "ts_library") - -# @external_begin -load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") -# @external_end - -licenses(["notice"]) - -# @angular-devkit/schematics - -ts_library( - name = "schematics", - srcs = glob( - include = ["src/**/*.ts"], - exclude = [ - "src/**/*_spec.ts", - "src/**/*_spec_large.ts", - "src/**/*_benchmark.ts", - ], - ), - module_name = "@angular-devkit/schematics", - module_root = "src/index.d.ts", - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - deps = [ - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", # TODO: get rid of this for 6.0 - "@npm//@types/node", - "@npm//rxjs", - ], -) - -ts_library( - name = "schematics_test_lib", - testonly = True, - srcs = glob( - include = [ - "src/**/*_spec.ts", - "src/**/*_spec_large.ts", - ], - ), - # @external_begin - tsconfig = "//:tsconfig-test.json", - # @external_end - deps = [ - ":schematics", - ":testing", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -jasmine_node_test( - name = "schematics_test", - srcs = [":schematics_test_lib"], - deps = [ - "@npm//jasmine", - "@npm//source-map", - ], -) - -# @angular-devkit/schematics/tasks - -ts_library( - name = "tasks", - srcs = glob( - include = ["tasks/**/*.ts"], - exclude = [ - "tasks/node/**/*.ts", - "tasks/**/*_spec.ts", - "tasks/**/*_benchmark.ts", - "tasks/tslint-fix/test/**/*", - ], - ), - module_name = "@angular-devkit/schematics/tasks", - module_root = "tasks/index.d.ts", - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - deps = [ - ":schematics", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "@npm//@types/node", - "@npm//ora", - "@npm//rxjs", - "@npm//tslint", - "@npm//typescript", - ], -) - -# @angular-devkit/schematics/tasks/node - -ts_library( - name = "tasks_node", - srcs = glob( - include = ["tasks/node/**/*.ts"], - exclude = [ - "tasks/node/**/*_spec.ts", - "tasks/node/**/*_benchmark.ts", - ], - ), - module_name = "@angular-devkit/schematics/tasks/node", - module_root = "tasks/node/index.d.ts", - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - deps = [ - ":schematics", - ":tasks", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -ts_library( - name = "tasks_test_lib", - testonly = True, - srcs = glob( - include = [ - "tasks/**/*_spec.ts", - "tasks/**/*_spec_large.ts", - "tasks/tslint-fix/test/**/*.ts", - ], - ), - data = [ - "tasks/tslint-fix/test/collection.json", - "tasks/tslint-fix/test/rules/customRuleRule.js", - ], - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - # @external_begin - tsconfig = "//:tsconfig-test.json", - # @external_end - deps = [ - ":schematics", - ":tasks", - ":testing", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "//packages/angular_devkit/core:node_testing", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -jasmine_node_test( - name = "tasks_test", - srcs = [":tasks_test_lib"], - deps = [ - "@npm//jasmine", - "@npm//source-map", - ], -) - -# @angular-devkit/schematics/tools - -ts_library( - name = "tools", - srcs = glob( - include = ["tools/**/*.ts"], - exclude = [ - "tools/**/*_spec.ts", - "tools/**/*_benchmark.ts", - "tools/test/**/*.ts", - ], - ), - module_name = "@angular-devkit/schematics/tools", - module_root = "tools/index.d.ts", - # The attribute below is needed in g3 to turn off strict typechecking - # strict_checks = False, - deps = [ - ":schematics", - ":tasks", - ":tasks_node", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -ts_library( - name = "tools_test_lib", - testonly = True, - srcs = glob( - include = [ - "tools/**/*_spec.ts", - "tools/**/*_spec_large.ts", - "tools/test/**/*.ts", - ], - ), - # @external_begin - tsconfig = "//:tsconfig-test.json", - # @external_end - deps = [ - ":schematics", - ":tasks", - ":testing", - ":tools", - "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", - "//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -jasmine_node_test( - name = "tools_test", - srcs = [":tools_test_lib"], - deps = [ - "@npm//jasmine", - "@npm//source-map", - ], -) - -# @angular-devkit/schematics/testing - -ts_library( - name = "testing", - srcs = glob( - include = ["testing/**/*.ts"], - ), - module_name = "@angular-devkit/schematics/testing", - module_root = "testing/index.d.ts", - deps = [ - ":schematics", - ":tasks", - ":tasks_node", - ":tools", - "//packages/angular_devkit/core", - "@npm//@types/node", - "@npm//rxjs", - ], -) - -# @external_begin -pkg_npm( - name = "npm_package", - deps = [ - ":schematics", - ":tasks", - ":testing", - ":tools", - ], -) -# @external_end diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel new file mode 100644 index 000000000000..5a8bc3a544c6 --- /dev/null +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -0,0 +1,92 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +# @external_begin +load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") +# @external_end + +licenses(["notice"]) + +# @angular-devkit/schematics + +ts_library( + name = "schematics", + srcs = glob( + include = ["src/**/*.ts"], + exclude = [ + "src/**/*_spec.ts", + "src/**/*_spec_large.ts", + "src/**/*_benchmark.ts", + ], + ), + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + data = glob(["**/*.json"]), + module_name = "@angular-devkit/schematics", + module_root = "src/index.d.ts", + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", # TODO: get rid of this for 6.0 + "@npm//@types/node", + "@npm//rxjs", + ], +) + +ts_library( + name = "schematics_test_lib", + testonly = True, + srcs = glob( + include = [ + "src/**/*_spec.ts", + "src/**/*_spec_large.ts", + ], + ), + # @external_begin + tsconfig = "//:tsconfig-test.json", + # @external_end + deps = [ + ":schematics", + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/schematics/testing", + "@npm//@types/jasmine", + "@npm//@types/node", + "@npm//rxjs", + ], +) + +jasmine_node_test( + name = "schematics_test", + srcs = [":schematics_test_lib"], + deps = [ + "@npm//jasmine", + "@npm//source-map", + ], +) + +# @external_begin +pkg_npm( + name = "npm_package", + deps = [ + ":schematics", + "//packages/angular_devkit/schematics/tasks", + "//packages/angular_devkit/schematics/testing", + "//packages/angular_devkit/schematics/tools", + ], +) + +pkg_tar( + name = "npm_package_archive", + srcs = [":npm_package"], + extension = "tar.gz", + strip_prefix = "./npm_package", + tags = ["manual"], +) +# @external_end diff --git a/packages/angular_devkit/schematics/tasks/BUILD.bazel b/packages/angular_devkit/schematics/tasks/BUILD.bazel new file mode 100644 index 000000000000..9d5bb5820327 --- /dev/null +++ b/packages/angular_devkit/schematics/tasks/BUILD.bazel @@ -0,0 +1,81 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +licenses(["notice"]) + +ts_library( + name = "tasks", + srcs = glob( + include = ["**/*.ts"], + exclude = [ + "node/**/*.ts", + "**/*_spec.ts", + "**/*_benchmark.ts", + "tslint-fix/test/**/*", + ], + ), + module_name = "@angular-devkit/schematics/tasks", + module_root = "index.d.ts", + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/schematics", + "@npm//@types/node", + "@npm//ora", + "@npm//rxjs", + "@npm//tslint", + "@npm//typescript", + ], +) + +ts_library( + name = "tasks_test_lib", + testonly = True, + srcs = glob( + include = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + "tslint-fix/test/**/*.ts", + ], + exclude = [ + "node/**/*.ts", + ], + ), + data = [ + "tslint-fix/test/collection.json", + "tslint-fix/test/rules/customRuleRule.js", + ], + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + # @external_begin + tsconfig = "//:tsconfig-test.json", + # @external_end + deps = [ + ":tasks", + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/core/node/testing", + "//packages/angular_devkit/schematics", + "//packages/angular_devkit/schematics/testing", + "@npm//@types/jasmine", + "@npm//@types/node", + "@npm//rxjs", + ], +) + +jasmine_node_test( + name = "tasks_test", + srcs = [":tasks_test_lib"], + deps = [ + "@npm//jasmine", + "@npm//source-map", + ], +) diff --git a/packages/angular_devkit/schematics/tasks/index.ts b/packages/angular_devkit/schematics/tasks/index.ts index 880b69566645..893b35b83e4a 100644 --- a/packages/angular_devkit/schematics/tasks/index.ts +++ b/packages/angular_devkit/schematics/tasks/index.ts @@ -5,8 +5,8 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export { NodePackageInstallTask } from './node-package/install-task'; -export { NodePackageLinkTask } from './node-package/link-task'; +export { NodePackageInstallTask } from './package-manager/install-task'; +export { NodePackageLinkTask } from './package-manager/link-task'; export { RepositoryInitializerTask } from './repo-init/init-task'; export { RunSchematicTask } from './run-schematic/task'; export { TslintFixTask } from './tslint-fix/task'; diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel similarity index 56% rename from packages/angular_devkit/schematics_cli/BUILD rename to packages/angular_devkit/schematics/tasks/node/BUILD.bazel index 929dcd6fe882..f79844d29dba 100644 --- a/packages/angular_devkit/schematics_cli/BUILD +++ b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel @@ -8,30 +8,24 @@ load("@npm_bazel_typescript//:index.bzl", "ts_library") licenses(["notice"]) -# @angular-devkit/schematics-cli - ts_library( - name = "schematics_cli", + name = "node", srcs = glob( - include = ["bin/**/*.ts"], + include = ["**/*.ts"], exclude = [ - "bin/**/*_spec.ts", - "bin/**/*_spec_large.ts", - "bin/**/*_benchmark.ts", + "**/*_spec.ts", + "**/*_benchmark.ts", ], ), - module_name = "@angular-devkit/schematics-cli", - module_root = "bin", + module_name = "@angular-devkit/schematics/tasks/node", + module_root = "index.d.ts", # The attribute below is needed in g3 to turn off strict typechecking # strict_checks = False, deps = [ "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node", + "//packages/angular_devkit/core/node", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:tasks", - "//packages/angular_devkit/schematics:tools", - "@npm//@types/inquirer", - "@npm//@types/minimist", + "//packages/angular_devkit/schematics/tasks", "@npm//@types/node", "@npm//rxjs", ], diff --git a/packages/angular_devkit/schematics/tasks/node/index.ts b/packages/angular_devkit/schematics/tasks/node/index.ts index c349c8a49936..1d02ea10bfea 100644 --- a/packages/angular_devkit/schematics/tasks/node/index.ts +++ b/packages/angular_devkit/schematics/tasks/node/index.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import { TaskExecutorFactory } from '../../src'; -import { NodePackageName, NodePackageTaskFactoryOptions } from '../node-package/options'; +import { NodePackageName, NodePackageTaskFactoryOptions } from '../package-manager/options'; import { RepositoryInitializerName, RepositoryInitializerTaskFactoryOptions, @@ -17,7 +17,7 @@ import { TslintFixName } from '../tslint-fix/options'; export class BuiltinTaskExecutor { static readonly NodePackage: TaskExecutorFactory = { name: NodePackageName, - create: (options) => import('../node-package/executor').then(mod => mod.default(options)), + create: (options) => import('../package-manager/executor').then(mod => mod.default(options)), }; static readonly RepositoryInitializer: TaskExecutorFactory = { diff --git a/packages/angular_devkit/schematics/tasks/node-package/executor.ts b/packages/angular_devkit/schematics/tasks/package-manager/executor.ts similarity index 100% rename from packages/angular_devkit/schematics/tasks/node-package/executor.ts rename to packages/angular_devkit/schematics/tasks/package-manager/executor.ts diff --git a/packages/angular_devkit/schematics/tasks/node-package/install-task.ts b/packages/angular_devkit/schematics/tasks/package-manager/install-task.ts similarity index 100% rename from packages/angular_devkit/schematics/tasks/node-package/install-task.ts rename to packages/angular_devkit/schematics/tasks/package-manager/install-task.ts diff --git a/packages/angular_devkit/schematics/tasks/node-package/link-task.ts b/packages/angular_devkit/schematics/tasks/package-manager/link-task.ts similarity index 100% rename from packages/angular_devkit/schematics/tasks/node-package/link-task.ts rename to packages/angular_devkit/schematics/tasks/package-manager/link-task.ts diff --git a/packages/angular_devkit/schematics/tasks/node-package/options.ts b/packages/angular_devkit/schematics/tasks/package-manager/options.ts similarity index 100% rename from packages/angular_devkit/schematics/tasks/node-package/options.ts rename to packages/angular_devkit/schematics/tasks/package-manager/options.ts diff --git a/packages/angular_devkit/schematics/testing/BUILD.bazel b/packages/angular_devkit/schematics/testing/BUILD.bazel new file mode 100644 index 000000000000..4f5491d7ed86 --- /dev/null +++ b/packages/angular_devkit/schematics/testing/BUILD.bazel @@ -0,0 +1,27 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +licenses(["notice"]) + +ts_library( + name = "testing", + srcs = glob( + include = ["**/*.ts"], + ), + module_name = "@angular-devkit/schematics/testing", + module_root = "index.d.ts", + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/schematics", + "//packages/angular_devkit/schematics/tasks", + "//packages/angular_devkit/schematics/tasks/node", + "//packages/angular_devkit/schematics/tools", + "@npm//@types/node", + "@npm//rxjs", + ], +) diff --git a/packages/angular_devkit/schematics/tools/BUILD.bazel b/packages/angular_devkit/schematics/tools/BUILD.bazel new file mode 100644 index 000000000000..044e3a02b650 --- /dev/null +++ b/packages/angular_devkit/schematics/tools/BUILD.bazel @@ -0,0 +1,71 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") +load("@npm_bazel_typescript//:index.bzl", "ts_library") + +licenses(["notice"]) + +ts_library( + name = "tools", + srcs = glob( + include = ["**/*.ts"], + exclude = [ + "**/*_spec.ts", + "**/*_benchmark.ts", + "test/**/*.ts", + ], + ), + module_name = "@angular-devkit/schematics/tools", + module_root = "index.d.ts", + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/schematics", + "//packages/angular_devkit/schematics/tasks", + "//packages/angular_devkit/schematics/tasks/node", + "@npm//@types/node", + "@npm//rxjs", + ], +) + +ts_library( + name = "tools_test_lib", + testonly = True, + srcs = glob( + include = [ + "**/*_spec.ts", + "**/*_spec_large.ts", + "test/**/*.ts", + ], + ), + # @external_begin + tsconfig = "//:tsconfig-test.json", + # @external_end + deps = [ + ":tools", + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/schematics", + "//packages/angular_devkit/schematics/tasks", + "//packages/angular_devkit/schematics/testing", + "//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib", + "@npm//@types/jasmine", + "@npm//@types/node", + "@npm//rxjs", + ], +) + +jasmine_node_test( + name = "tools_test", + srcs = [":tools_test_lib"], + deps = [ + "@npm//jasmine", + "@npm//source-map", + ], +) diff --git a/packages/angular_devkit/schematics_cli/BUILD.bazel b/packages/angular_devkit/schematics_cli/BUILD.bazel new file mode 100644 index 000000000000..77535b0371e3 --- /dev/null +++ b/packages/angular_devkit/schematics_cli/BUILD.bazel @@ -0,0 +1,66 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license +package(default_visibility = ["//visibility:public"]) + +load("@npm_bazel_typescript//:index.bzl", "ts_library") +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") + +licenses(["notice"]) + +# @angular-devkit/schematics-cli + +ts_library( + name = "schematics_cli", + srcs = glob( + include = ["bin/**/*.ts"], + exclude = [ + "bin/**/*_spec.ts", + "bin/**/*_spec_large.ts", + "bin/**/*_benchmark.ts", + ], + ), + # The attribute below is needed in g3 to turn off strict typechecking + # strict_checks = False, + data = glob(["**/*.json"]), + module_name = "@angular-devkit/schematics-cli", + module_root = "bin/schematics.d.ts", + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "//packages/angular_devkit/schematics", + "//packages/angular_devkit/schematics/tasks", + "//packages/angular_devkit/schematics/tools", + "//packages/schematics/schematics", + "@npm//@types/inquirer", + "@npm//@types/minimist", + "@npm//@types/node", + "@npm//inquirer", + "@npm//minimist", + "@npm//rxjs", + "@npm//symbol-observable", + ], +) + +ts_library( + name = "schematics_cli_test_lib", + testonly = True, + srcs = glob( + include = [ + "bin/**/*_spec.ts", + ], + ), + # strict_checks = False, + tsconfig = "//:tsconfig-test.json", + deps = [ + ":schematics_cli", + "@npm//@types/jasmine", + "@npm//@types/node", + ], +) + +jasmine_node_test( + name = "schematics_cli_test", + srcs = [":schematics_cli_test_lib"], +) diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel new file mode 100644 index 000000000000..a4a53ebbf997 --- /dev/null +++ b/packages/ngtools/webpack/BUILD.bazel @@ -0,0 +1,91 @@ +# Copyright Google Inc. All Rights Reserved. +# +# Use of this source code is governed by an MIT-style license that can be +# found in the LICENSE file at https://angular.io/license + +licenses(["notice"]) # MIT + +load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") +load("@npm_bazel_typescript//:index.bzl", "ts_library") +load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") + +package(default_visibility = ["//visibility:public"]) + +ts_library( + name = "webpack", + srcs = glob( + include = [ + "src/**/*.ts", + ], + exclude = [ + "src/**/*_spec.ts", + "src/**/*_spec_helpers.ts", + ], + ), + data = glob( + include = [ + "src/type_checker_bootstrap.js", + "package.json", + ], + ), + module_name = "@ngtools/webpack", + module_root = "src/index.d.ts", + deps = [ + "//packages/angular_devkit/core", + "//packages/angular_devkit/core/node", + "@npm//@angular/compiler-cli", + "@npm//@types/node", + "@npm//@types/webpack", + "@npm//@types/webpack-sources", + "@npm//enhanced-resolve", + "@npm//rxjs", + "@npm//typescript", + "@npm//webpack", + "@npm//webpack-sources", + ], +) + +ts_library( + name = "webpack_test_lib", + testonly = True, + srcs = glob( + include = [ + "src/**/*_spec.ts", + "src/**/*_spec_helpers.ts", + ], + ), + tsconfig = "//:tsconfig-test.json", + deps = [ + ":webpack", + "//packages/angular_devkit/core", + "@npm//@angular/compiler", + "@npm//@types/jasmine", + "@npm//jasmine", + "@npm//typescript", + ], +) + +jasmine_node_test( + name = "webpack_test", + srcs = [":webpack_test_lib"], + deps = [ + "@npm//jasmine", + "@npm//source-map", + ], +) + +pkg_npm( + name = "npm_package", + deps = [ + ":webpack", + ], +) + +pkg_tar( + name = "npm_package_archive", + srcs = [":npm_package"], + extension = "tar.gz", + strip_prefix = "./npm_package", + tags = ["manual"], +) diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD.bazel similarity index 81% rename from packages/schematics/angular/BUILD rename to packages/schematics/angular/BUILD.bazel index f32188057d79..443a612c4668 100644 --- a/packages/schematics/angular/BUILD +++ b/packages/schematics/angular/BUILD.bazel @@ -12,7 +12,7 @@ load("//tools:ts_json_schema.bzl", "ts_json_schema") package(default_visibility = ["//visibility:public"]) # Create a list of Tuple("path/file.json", "path_file") to be used as rules -ALL_SCHEMA_TARGETS_PAIR = [ +ALL_SCHEMA_TARGETS = [ ( x, x.replace("/", "_").replace("-", "_").replace(".json", ""), @@ -26,11 +26,9 @@ ALL_SCHEMA_TARGETS_PAIR = [ name = name, src = src, ) - for (src, name) in ALL_SCHEMA_TARGETS_PAIR + for (src, name) in ALL_SCHEMA_TARGETS ] -ALL_SCHEMA_DEPS = [":" + name for (_, name) in ALL_SCHEMA_TARGETS_PAIR] - ts_library( name = "angular", srcs = glob( @@ -45,13 +43,26 @@ ts_library( # Exclude test helpers. "utility/test/**/*.ts", ], + ) + [ + "//packages/schematics/angular:" + src.replace(".json", ".ts") + for (src, _) in ALL_SCHEMA_TARGETS + ], + # strict_checks = False, + data = glob( + include = [ + "collection.json", + "package.json", + "migrations/migration-collection.json", + "*/schema.json", + "*/files/**/*", + "*/other-files/**/*", + ], ), module_name = "@schematics/angular", - # strict_checks = False, - deps = ALL_SCHEMA_DEPS + [ + deps = [ "//packages/angular_devkit/core", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:tasks", + "//packages/angular_devkit/schematics/tasks", "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript", "@npm//@types/node", "@npm//rxjs", @@ -78,24 +89,17 @@ ts_library( "utility/test/**/*.ts", ], ), - data = glob( - include = [ - "**/*.json", - "*/files/**", - "*/other-files/**", - ], - ), # @external_begin tsconfig = "//:tsconfig-test.json", - deps = ALL_SCHEMA_DEPS + [ + deps = [ ":angular", "//packages/angular_devkit/core", - "//packages/angular_devkit/core:node_testing", + "//packages/angular_devkit/core/node/testing", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:testing", + "//packages/angular_devkit/schematics/testing", "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript", - "@npm//@types/node", "@npm//@types/jasmine", + "@npm//@types/node", "@npm//rxjs", "@npm//tslint", ], diff --git a/packages/schematics/angular/no_typescript_runtime_dep_spec.js b/packages/schematics/angular/no_typescript_runtime_dep_spec.js index 224291d0e9a0..7851026628c0 100644 --- a/packages/schematics/angular/no_typescript_runtime_dep_spec.js +++ b/packages/schematics/angular/no_typescript_runtime_dep_spec.js @@ -9,7 +9,7 @@ const fs = require('fs'); const path = require('path'); -const pkg = path.join('packages', 'schematics', 'angular'); +const pkg = path.dirname(require.resolve(__filename)); describe('@schematics/angular javascript code', () => { fs.readdirSync(pkg).forEach(d => { const dir = path.join(pkg, d); @@ -21,10 +21,10 @@ describe('@schematics/angular javascript code', () => { const file = path.join(subdir, f); if (fs.statSync(file).isDirectory()) { check(file); - } else if (file.endsWith('.js')) { + } else if (file.endsWith('.ts')) { const content = fs.readFileSync(file, { encoding: 'utf-8' }); - if (content.indexOf('require("typescript")') >= 0) { - fail(`${file} has a typescript require`); + if (content.indexOf(`from 'typescript'`) >= 0) { + fail(`${file} has a typescript import`); } } }); diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD.bazel similarity index 77% rename from packages/schematics/schematics/BUILD rename to packages/schematics/schematics/BUILD.bazel index ca27c69e7496..bee53eb778b0 100644 --- a/packages/schematics/schematics/BUILD +++ b/packages/schematics/schematics/BUILD.bazel @@ -22,13 +22,26 @@ ts_library( "blank/project-files/**", "blank/schematic-files/**", ], + ) + [ + "//packages/schematics/schematics:blank/schema.ts", + "//packages/schematics/schematics:schematic/schema.ts", + ], + data = glob( + include = [ + "collection.json", + "package.json", + "blank/schema.json", + "blank/project-files/**/*", + "blank/schematic-files/**/*", + "schematic/schema.json", + "schematic/files/**/*", + ], ), + module_name = "@schematics/schematics", deps = [ - ":blank_schema", - ":schematic_schema", "//packages/angular_devkit/core", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:tasks", + "//packages/angular_devkit/schematics/tasks", "@npm//@types/node", "@npm//rxjs", ], @@ -71,7 +84,7 @@ ts_json_schema( # ":schematics", # "//packages/angular_devkit/core", # "//packages/angular_devkit/schematics", -# "//packages/angular_devkit/schematics:testing", +# "//packages/angular_devkit/schematics/testing", # "@npm//rxjs", # # "@npm//@types/node", diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD.bazel similarity index 89% rename from packages/schematics/update/BUILD rename to packages/schematics/update/BUILD.bazel index a01b3e62cfd1..c7ea64d9e43a 100644 --- a/packages/schematics/update/BUILD +++ b/packages/schematics/update/BUILD.bazel @@ -20,13 +20,14 @@ ts_library( "**/*_spec_large.ts", "**/*_benchmark.ts", ], - ), + ) + [ + "//packages/schematics/update:update/schema.ts", + "//packages/schematics/update:migrate/schema.ts", + ], deps = [ - ":migrate_schema", - ":update_schema", "//packages/angular_devkit/core", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:tasks", + "//packages/angular_devkit/schematics/tasks", "@npm//@types/node", "@npm//@types/npm-package-arg", "@npm//@types/semver", @@ -66,7 +67,7 @@ ts_library( ":update", "//packages/angular_devkit/core", "//packages/angular_devkit/schematics", - "//packages/angular_devkit/schematics:testing", + "//packages/angular_devkit/schematics/testing", "@npm//@types/jasmine", "@npm//@types/node", "@npm//@types/semver", diff --git a/tests/angular_devkit/core/node/jobs/BUILD b/tests/angular_devkit/core/node/jobs/BUILD.bazel similarity index 100% rename from tests/angular_devkit/core/node/jobs/BUILD rename to tests/angular_devkit/core/node/jobs/BUILD.bazel diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel similarity index 94% rename from tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD rename to tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel index a21f8771bd48..ccb1c9e945b3 100644 --- a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD +++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel @@ -25,7 +25,7 @@ ts_library( "//packages/angular_devkit/schematics", # ":testing", # "//packages/angular_devkit/core", - # "//packages/angular_devkit/core:node", + # "//packages/angular_devkit/core/node", # "@npm//rxjs", # "@npm//@types/jasmine", diff --git a/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD.bazel similarity index 100% rename from third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD rename to third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD.bazel diff --git a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel similarity index 100% rename from third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD rename to third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel diff --git a/tools/BUILD b/tools/BUILD.bazel similarity index 100% rename from tools/BUILD rename to tools/BUILD.bazel diff --git a/tools/build_event_protocol/BUILD b/tools/build_event_protocol/BUILD.bazel similarity index 100% rename from tools/build_event_protocol/BUILD rename to tools/build_event_protocol/BUILD.bazel diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl index b74d27f12a6f..f0e9fa773fb5 100644 --- a/tools/ts_json_schema.bzl +++ b/tools/ts_json_schema.bzl @@ -3,8 +3,6 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.io/license -load("@npm_bazel_typescript//:index.bzl", "ts_library") - # @external_begin def _ts_json_schema_interface_impl(ctx): args = [ @@ -46,9 +44,9 @@ _ts_json_schema_interface = rule( ) # @external_end -# Generates a library that contains the interface for a JSON Schema file. Takes a single `src` -# argument as input, an optional data field for reference files, and produces a ts_library() -# rule containing the typescript interface. +# Generates a TS file that contains the interface for a JSON Schema file. Takes a single `src` +# argument as input, an optional data field for reference files, and produces a +# _ts_json_schema_interface() rule containing the typescript interface. # The file produced will have the same name, with the extension replaced from `.json` to `.ts`. # Any filename collision will be an error thrown by Bazel. def ts_json_schema(name, src, data = []): @@ -62,16 +60,3 @@ def ts_json_schema(name, src, data = []): data = data, ) # @external_end - - ts_library( - name = name, - deps = [ - "@npm//@types/node", - ], - # Remove these to empty the rule, since those files are also compiled elsewhere. - # @external_begin - srcs = [ - out, - ], - # @external_end - ) diff --git a/yarn.lock b/yarn.lock index 55066956cfac..10465971c6ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -965,6 +965,41 @@ brfs "^1.4.0" unicode-trie "^0.3.0" +"@npmcli/ci-detect@^1.0.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.2.0.tgz#0df142a1ac3bba6cbf2e9da1a6994cd898e32c95" + integrity sha512-JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA== + +"@npmcli/git@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.1.tgz#d7ecaa9c945de6bb1af5a7e6ea634771193c168b" + integrity sha512-hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw== + dependencies: + "@npmcli/promise-spawn" "^1.1.0" + mkdirp "^1.0.3" + npm-pick-manifest "^6.0.0" + promise-inflight "^1.0.1" + promise-retry "^1.1.1" + unique-filename "^1.1.1" + which "^2.0.2" + +"@npmcli/installed-package-contents@^1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.5.tgz#cc78565e55d9f14d46acf46a96f70934e516fa3d" + integrity sha512-aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A== + dependencies: + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + read-package-json-fast "^1.1.1" + readdir-scoped-modules "^1.1.0" + +"@npmcli/promise-spawn@^1.1.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.2.0.tgz#167d70b926f771c8bd8b9183bfc8b5aec29d7e45" + integrity sha512-nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow== + dependencies: + infer-owner "^1.0.4" + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -1078,6 +1113,11 @@ dependencies: defer-to-connect "^2.0.0" +"@tootallnate/once@1": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.0.0.tgz#9c13c2574c92d4503b005feca8f2e16cc1611506" + integrity sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA== + "@types/anymatch@*": version "1.3.1" resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" @@ -1668,6 +1708,15 @@ resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-1.4.0.tgz#090127dbbcd5d679993d1e88ef94db00bf7bd5b9" integrity sha512-YAPp3i7L6/a0t7T6xTRlEQi++ijlwcxObh6yo8GaiWsUJf4pUBnv6yOKP5C5fPBBH1PvoDVE3FQZ9GhSEm1nGw== +"@webassemblyjs/ast@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" + integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== + dependencies: + "@webassemblyjs/helper-module-context" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/wast-parser" "1.8.5" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -1677,21 +1726,43 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wast-parser" "1.9.0" +"@webassemblyjs/floating-point-hex-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" + integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== + "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== +"@webassemblyjs/helper-api-error@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" + integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== + "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== +"@webassemblyjs/helper-buffer@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" + integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== + "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== +"@webassemblyjs/helper-code-frame@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" + integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== + dependencies: + "@webassemblyjs/wast-printer" "1.8.5" + "@webassemblyjs/helper-code-frame@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" @@ -1699,11 +1770,24 @@ dependencies: "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/helper-fsm@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" + integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== + "@webassemblyjs/helper-fsm@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== +"@webassemblyjs/helper-module-context@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" + integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== + dependencies: + "@webassemblyjs/ast" "1.8.5" + mamacro "^0.0.3" + "@webassemblyjs/helper-module-context@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" @@ -1711,11 +1795,26 @@ dependencies: "@webassemblyjs/ast" "1.9.0" +"@webassemblyjs/helper-wasm-bytecode@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" + integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== + "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== +"@webassemblyjs/helper-wasm-section@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" + integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -1726,6 +1825,13 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wasm-gen" "1.9.0" +"@webassemblyjs/ieee754@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" + integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -1733,6 +1839,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/leb128@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" + integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -1740,11 +1853,30 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/utf8@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" + integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== + "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== +"@webassemblyjs/wasm-edit@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" + integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/helper-wasm-section" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/wasm-opt" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + "@webassemblyjs/wast-printer" "1.8.5" + "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -1759,6 +1891,17 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/wasm-gen@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" + integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/ieee754" "1.8.5" + "@webassemblyjs/leb128" "1.8.5" + "@webassemblyjs/utf8" "1.8.5" + "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -1770,6 +1913,16 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" +"@webassemblyjs/wasm-opt@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" + integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -1780,6 +1933,18 @@ "@webassemblyjs/wasm-gen" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" +"@webassemblyjs/wasm-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" + integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-api-error" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/ieee754" "1.8.5" + "@webassemblyjs/leb128" "1.8.5" + "@webassemblyjs/utf8" "1.8.5" + "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -1792,6 +1957,18 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" +"@webassemblyjs/wast-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" + integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/floating-point-hex-parser" "1.8.5" + "@webassemblyjs/helper-api-error" "1.8.5" + "@webassemblyjs/helper-code-frame" "1.8.5" + "@webassemblyjs/helper-fsm" "1.8.5" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" @@ -1804,6 +1981,15 @@ "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" + integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/wast-parser" "1.8.5" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -1923,6 +2109,13 @@ agent-base@5: resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== +agent-base@6: + version "6.0.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a" + integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw== + dependencies: + debug "4" + agent-base@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" @@ -1937,6 +2130,15 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" +agentkeepalive@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.0.tgz#a48e040ed16745dd29ce923675f60c9c90f39ee0" + integrity sha512-CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + aggregate-error@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" @@ -2696,7 +2898,7 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@15.0.0: +cacache@15.0.0, cacache@^15.0.0: version "15.0.0" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.0.tgz#133b59edbd2a37ea8ef2d54964c6f247e47e5059" integrity sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g== @@ -2966,7 +3168,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3: +chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -4115,7 +4317,7 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@~1.1.2: +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -4143,11 +4345,6 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -4381,7 +4578,7 @@ encoding-down@^6.3.0: level-codec "^9.0.0" level-errors "^2.0.0" -encoding@^0.1.11: +encoding@^0.1.11, encoding@^0.1.12: version "0.1.12" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= @@ -5069,7 +5266,7 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.6.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -5098,7 +5295,6 @@ fsevents@^1.2.7: dependencies: bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "*" fsevents@~2.1.2: version "2.1.2" @@ -5265,7 +5461,7 @@ glob@7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -5603,7 +5799,7 @@ http-cache-semantics@^3.8.1: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.0.4: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -5658,6 +5854,15 @@ http-proxy-agent@^2.1.0: agent-base "4" debug "3.1.0" +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -5712,6 +5917,14 @@ https-proxy-agent@^4.0.0: agent-base "5" debug "4" +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -5735,7 +5948,7 @@ husky@^4.0.10: slash "^3.0.0" which-pm-runs "^1.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -5752,7 +5965,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: +ignore-walk@^3.0.1, ignore-walk@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== @@ -6146,6 +6359,11 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" @@ -6625,6 +6843,11 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz#304d29aa54bb01156a1328c454034ff0ac8a7bf4" + integrity sha512-2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g== + json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -6680,7 +6903,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.2.0: +jsonparse@^1.2.0, jsonparse@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= @@ -7349,6 +7572,32 @@ make-fetch-happen@^5.0.0: socks-proxy-agent "^4.0.0" ssri "^6.0.0" +make-fetch-happen@^8.0.2: + version "8.0.4" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz#d3451baf5b43d6230c4eea7009c5aa6b6bccf9d4" + integrity sha512-hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA== + dependencies: + agentkeepalive "^4.1.0" + cacache "^15.0.0" + http-cache-semantics "^4.0.4" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^5.1.1" + minipass "^3.0.0" + minipass-collect "^1.0.2" + minipass-fetch "^1.1.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + promise-retry "^1.1.1" + socks-proxy-agent "^5.0.0" + ssri "^8.0.0" + +mamacro@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" + integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== + map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -7628,6 +7877,18 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" +minipass-fetch@^1.1.2, minipass-fetch@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.2.1.tgz#1b97ecb559be56b09812d45b2e9509f1f59ece2f" + integrity sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg== + dependencies: + minipass "^3.1.0" + minipass-pipeline "^1.2.2" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -7635,6 +7896,14 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" +minipass-json-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" + integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== + dependencies: + jsonparse "^1.3.1" + minipass "^3.0.0" + minipass-pipeline@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a" @@ -7642,6 +7911,13 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -7650,7 +7926,7 @@ minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: +minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== @@ -7664,7 +7940,7 @@ minizlib@^1.2.1: dependencies: minipass "^2.9.0" -minizlib@^2.1.0: +minizlib@^2.0.0, minizlib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3" integrity sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA== @@ -7809,15 +8085,6 @@ ncp@~2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -needle@^2.2.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a" - integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -7918,22 +8185,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.53: version "1.1.53" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" @@ -8001,7 +8252,7 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== -npm-bundled@^1.0.1: +npm-bundled@^1.0.1, npm-bundled@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== @@ -8020,7 +8271,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -npm-package-arg@8.0.1, npm-package-arg@^8.0.0: +npm-package-arg@8.0.1, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.0.1.tgz#9d76f8d7667b2373ffda60bb801a27ef71e3e270" integrity sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ== @@ -8039,7 +8290,7 @@ npm-package-arg@8.0.1, npm-package-arg@^8.0.0: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.12, npm-packlist@^1.1.6: +npm-packlist@^1.1.12: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -8048,7 +8299,17 @@ npm-packlist@^1.1.12, npm-packlist@^1.1.6: npm-bundled "^1.0.1" npm-normalize-package-bin "^1.0.1" -npm-pick-manifest@6.0.0: +npm-packlist@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.1.tgz#08806a1df79acdc43d02d20c83a3d5472d96c90c" + integrity sha512-95TSDvGwujIhqfSpIiRRLodEF+y6mJMopuZdahoGzqtRDFZXGav46S0p6ngeWaiAkb5R72w6eVARhzej0HvZeQ== + dependencies: + glob "^7.1.6" + ignore-walk "^3.0.3" + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + +npm-pick-manifest@6.0.0, npm-pick-manifest@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz#bfde7abe95f2670aed1629a3c18245ccb3cc2eb8" integrity sha512-PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg== @@ -8098,6 +8359,20 @@ npm-registry-fetch@^4.0.0: npm-package-arg "^6.1.0" safe-buffer "^5.2.0" +npm-registry-fetch@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz#65bb51dd2b9634b8363019aac9c76c003e5c5eaf" + integrity sha512-975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ== + dependencies: + "@npmcli/ci-detect" "^1.0.0" + lru-cache "^5.1.1" + make-fetch-happen "^8.0.2" + minipass "^3.0.0" + minipass-fetch "^1.1.2" + minipass-json-stream "^1.0.1" + minizlib "^2.0.0" + npm-package-arg "^8.0.0" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -8105,7 +8380,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2: +"npmlog@2 || ^3.1.0 || ^4.0.0": version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -8465,6 +8740,35 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" +pacote@11.1.4: + version "11.1.4" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.1.4.tgz#5529a453c59881b7f059da8af6903b0f79c124b2" + integrity sha512-eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw== + dependencies: + "@npmcli/git" "^2.0.1" + "@npmcli/installed-package-contents" "^1.0.5" + "@npmcli/promise-spawn" "^1.1.0" + cacache "^15.0.0" + chownr "^1.1.4" + fs-minipass "^2.1.0" + infer-owner "^1.0.4" + lru-cache "^5.1.1" + minipass "^3.0.1" + minipass-fetch "^1.2.1" + mkdirp "^1.0.3" + npm-package-arg "^8.0.1" + npm-packlist "^2.1.0" + npm-pick-manifest "^6.0.0" + npm-registry-fetch "^8.0.0" + promise-inflight "^1.0.1" + promise-retry "^1.1.1" + read-package-json-fast "^1.1.3" + rimraf "^2.7.1" + semver "^7.1.3" + ssri "^8.0.0" + tar "^6.0.1" + which "^2.0.2" + pacote@9.5.12: version "9.5.12" resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66" @@ -8717,11 +9021,16 @@ picomatch@^2.0.4, picomatch@^2.0.7: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== -pidtree@0.4.0, pidtree@^0.4.0: +pidtree@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.4.0.tgz#d08edab26f3a608505b645b132079ef980bf4bf3" integrity sha512-pGLtsfpWu421md4m6YKlg3aMI6zFoqfJ28QD4zE3ThQB+mKsAxPSaME/9taApTBsW+dnviIq0drxF7GGAm5+pA== +pidtree@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a" + integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA== + pidusage@2.0.18, pidusage@^2.0.17: version "2.0.18" resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.18.tgz#9ccef35df5508a5a4b0838c712ea9b79609aff34" @@ -9461,7 +9770,7 @@ raw-loader@4.0.0: loader-utils "^1.2.3" schema-utils "^2.5.0" -rc@^1.2.7, rc@^1.2.8: +rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -9492,6 +9801,14 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" +read-package-json-fast@^1.1.1, read-package-json-fast@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz#3b78464ea8f3c4447f3358635390b6946dc0737e" + integrity sha512-MmFqiyfCXV2Dmm4jH24DEGhxdkUDFivJQj4oPZQPOKywxR7HWBE6WnMWDAapfFHi3wm1b+mhR+XHlUH0CL8axg== + dependencies: + json-parse-even-better-errors "^2.0.1" + npm-normalize-package-bin "^1.0.1" + read-package-json@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1" @@ -9595,7 +9912,7 @@ read-pkg@^5.0.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readdir-scoped-modules@^1.0.0: +readdir-scoped-modules@^1.0.0, readdir-scoped-modules@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== @@ -10071,7 +10388,6 @@ sass@1.26.3, sass@^1.23.0: "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz": version "0.0.0" - uid dc5efcd2be24ddb099a85b923d6e754754651fa8 resolved "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz#dc5efcd2be24ddb099a85b923d6e754754651fa8" saucelabs@^1.5.0: @@ -10081,7 +10397,7 @@ saucelabs@^1.5.0: dependencies: https-proxy-agent "^2.2.1" -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: +sax@>=0.6.0, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -10193,6 +10509,11 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.3: + version "7.2.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.1.tgz#d997aa36bdbb00b501ae4ac4c7d17e9f7a587ae5" + integrity sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10443,7 +10764,16 @@ socks-proxy-agent@^4.0.0: agent-base "~4.2.1" socks "~2.3.2" -socks@~2.3.2: +socks-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" + integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== + dependencies: + agent-base "6" + debug "4" + socks "^2.3.3" + +socks@^2.3.3, socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA== @@ -11055,7 +11385,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.2: +tar@^4.4.10: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -11122,16 +11452,7 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@4.6.10: - version "4.6.10" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2" - integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -terser@^4.1.2, terser@^4.3.8, terser@^4.4.3: +terser@4.6.10, terser@^4.1.2, terser@^4.3.8, terser@^4.4.3: version "4.6.10" resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2" integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA== @@ -12035,6 +12356,35 @@ webpack-subresource-integrity@1.4.0: dependencies: webpack-sources "^1.3.0" +webpack@4.42.0: + version "4.42.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" + integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-module-context" "1.8.5" + "@webassemblyjs/wasm-edit" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + acorn "^6.2.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" + enhanced-resolve "^4.1.0" + eslint-scope "^4.0.3" + json-parse-better-errors "^1.0.2" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.1" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" + schema-utils "^1.0.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.3" + watchpack "^1.6.0" + webpack-sources "^1.4.1" + webpack@4.42.1: version "4.42.1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef" @@ -12121,6 +12471,13 @@ which@^1.2.1, which@^1.2.9, which@^1.3.0, which@^1.3.1: dependencies: isexe "^2.0.0" +which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"