diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx index 2f4175d70518..f7b0b1fa6667 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -2,7 +2,9 @@ # Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml"). # This file should be checked into version control along with the pnpm-lock.yaml file. .npmrc=-2023857461 -package.json=2055569205 -pnpm-lock.yaml=1847443622 -pnpm-workspace.yaml=1711114604 -yarn.lock=86020133 +package.json=1658609850 +packages/angular_devkit/architect/package.json=-107274537 +packages/angular_devkit/core/package.json=339935828 +pnpm-lock.yaml=1613268280 +pnpm-workspace.yaml=-1853274682 +yarn.lock=1185228888 diff --git a/BUILD.bazel b/BUILD.bazel index 9555ade0455e..9e4fda1bd0b7 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -22,16 +22,14 @@ exports_files([ "package.json", ]) -npm_link_all_packages( - name = "root_modules", -) +npm_link_all_packages() rules_js_tsconfig( name = "build-tsconfig", src = "tsconfig-build.json", deps = [ "tsconfig.json", - "//:root_modules/@types/node", + "//:node_modules/@types/node", ], ) @@ -48,8 +46,8 @@ rules_js_tsconfig( src = "tsconfig-test.json", deps = [ "tsconfig.json", - "//:root_modules/@types/jasmine", - "//:root_modules/@types/node", + "//:node_modules/@types/jasmine", + "//:node_modules/@types/node", ], ) diff --git a/WORKSPACE b/WORKSPACE index a1de5e2f5f22..afc2bcf6ee06 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -186,6 +186,8 @@ npm_translate_lock( data = [ "//:package.json", "//:pnpm-workspace.yaml", + "//packages/angular_devkit/architect:package.json", + "//packages/angular_devkit/core:package.json", ], npmrc = "//:.npmrc", patches = { @@ -225,3 +227,15 @@ http_file( sha256 = "5a5c46846ecda83e05b9da26f1672ad51c59bce08fed88419850d0e29c993b30", urls = ["https://raw.githubusercontent.com/devversion/rules_angular/4b7532ba2b29078d005899cd15b415593d03cceb/dist/worker.mjs"], ) + +http_archive( + name = "aspect_rules_jasmine", + sha256 = "0d2f9c977842685895020cac721d8cc4f1b37aae15af46128cf619741dc61529", + strip_prefix = "rules_jasmine-2.0.0", + url = "https://github.com/aspect-build/rules_jasmine/releases/download/v2.0.0/rules_jasmine-v2.0.0.tar.gz", +) + +load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies") + +# Fetch dependencies which users need as well +rules_jasmine_dependencies() diff --git a/goldens/public-api/angular_devkit/architect/index.api.md b/goldens/public-api/angular_devkit/architect/index.api.md index 7089d2124556..0ae8751719b5 100644 --- a/goldens/public-api/angular_devkit/architect/index.api.md +++ b/goldens/public-api/angular_devkit/architect/index.api.md @@ -25,6 +25,18 @@ export class Architect { scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise; } +// @public +export interface Builder { + // (undocumented) + [BuilderSymbol]: true; + // (undocumented) + [BuilderVersionSymbol]: string; + // (undocumented) + __OptionT: OptionT; + // (undocumented) + handler: JobHandler; +} + // @public export interface BuilderContext { addTeardown(teardown: () => Promise | void): void; diff --git a/modules/testing/builder/BUILD.bazel b/modules/testing/builder/BUILD.bazel index 1e0cbcbf33cb..7cd6a253890f 100644 --- a/modules/testing/builder/BUILD.bazel +++ b/modules/testing/builder/BUILD.bazel @@ -16,7 +16,7 @@ ts_project( ), data = glob(["projects/**/*"]), deps = [ - "//:root_modules/rxjs", + "//:node_modules/rxjs", "//packages/angular_devkit/architect:architect_rjs", "//packages/angular_devkit/architect/node:node_rjs", "//packages/angular_devkit/architect/testing:testing_rjs", diff --git a/package.json b/package.json index d9630626309e..8c71bc902179 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "@types/http-proxy": "^1.17.4", "@types/ini": "^4.0.0", "@types/jasmine": "~5.1.0", + "@types/jasmine-reporters": "^2", "@types/karma": "^6.3.0", "@types/less": "^3.0.3", "@types/loader-utils": "^2.0.0", @@ -141,6 +142,7 @@ "istanbul-lib-instrument": "6.0.3", "jasmine": "^5.0.0", "jasmine-core": "~5.5.0", + "jasmine-reporters": "^2.5.2", "jasmine-spec-reporter": "~7.0.0", "jsonc-parser": "3.3.1", "karma": "~6.4.0", diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel index 9f2e2452543f..958988bb23fa 100644 --- a/packages/angular/build/BUILD.bazel +++ b/packages/angular/build/BUILD.bazel @@ -61,52 +61,53 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular/build", deps = [ - "//:root_modules/@ampproject/remapping", - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@angular/core", - "//:root_modules/@angular/localize", - "//:root_modules/@angular/platform-server", - "//:root_modules/@angular/service-worker", - "//:root_modules/@babel/core", - "//:root_modules/@babel/helper-annotate-as-pure", - "//:root_modules/@babel/helper-split-export-declaration", - "//:root_modules/@babel/plugin-syntax-import-attributes", - "//:root_modules/@inquirer/confirm", - "//:root_modules/@types/babel__core", - "//:root_modules/@types/less", - "//:root_modules/@types/node", - "//:root_modules/@types/picomatch", - "//:root_modules/@types/semver", - "//:root_modules/@types/watchpack", - "//:root_modules/@vitejs/plugin-basic-ssl", - "//:root_modules/beasties", - "//:root_modules/browserslist", - "//:root_modules/esbuild", - "//:root_modules/esbuild-wasm", - "//:root_modules/fast-glob", - "//:root_modules/https-proxy-agent", - "//:root_modules/jsonc-parser", - "//:root_modules/listr2", - "//:root_modules/lmdb", - "//:root_modules/magic-string", - "//:root_modules/mrmime", - "//:root_modules/ng-packagr", - "//:root_modules/parse5-html-rewriting-stream", - "//:root_modules/picomatch", - "//:root_modules/piscina", - "//:root_modules/postcss", - "//:root_modules/rollup", - "//:root_modules/sass", - "//:root_modules/semver", - "//:root_modules/tslib", - "//:root_modules/typescript", - "//:root_modules/vite", - "//:root_modules/watchpack", + "//:node_modules/@ampproject/remapping", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@angular/core", + "//:node_modules/@angular/localize", + "//:node_modules/@angular/platform-server", + "//:node_modules/@angular/service-worker", + "//:node_modules/@babel/core", + "//:node_modules/@babel/helper-annotate-as-pure", + "//:node_modules/@babel/helper-split-export-declaration", + "//:node_modules/@babel/plugin-syntax-import-attributes", + "//:node_modules/@inquirer/confirm", + "//:node_modules/@types/babel__core", + "//:node_modules/@types/less", + "//:node_modules/@types/node", + "//:node_modules/@types/picomatch", + "//:node_modules/@types/semver", + "//:node_modules/@types/watchpack", + "//:node_modules/@vitejs/plugin-basic-ssl", + "//:node_modules/beasties", + "//:node_modules/browserslist", + "//:node_modules/esbuild", + "//:node_modules/esbuild-wasm", + "//:node_modules/fast-glob", + "//:node_modules/https-proxy-agent", + "//:node_modules/jsonc-parser", + "//:node_modules/listr2", + "//:node_modules/lmdb", + "//:node_modules/magic-string", + "//:node_modules/mrmime", + "//:node_modules/ng-packagr", + "//:node_modules/parse5-html-rewriting-stream", + "//:node_modules/picomatch", + "//:node_modules/piscina", + "//:node_modules/postcss", + "//:node_modules/rollup", + "//:node_modules/sass", + "//:node_modules/semver", + "//:node_modules/tslib", + "//:node_modules/typescript", + "//:node_modules/vite", + "//:node_modules/watchpack", "//packages/angular/ssr:ssr_rjs", "//packages/angular/ssr/node:node_rjs", "//packages/angular_devkit/architect:architect_rjs", + "//packages/angular_devkit/core:core_rjs", ], ) @@ -119,11 +120,11 @@ ts_project( ), deps = [ ":build_rjs", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@babel/core", - "//:root_modules/@types/jasmine", - "//:root_modules/prettier", - "//:root_modules/typescript", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@babel/core", + "//:node_modules/@types/jasmine", + "//:node_modules/prettier", + "//:node_modules/typescript", "//packages/angular/build/private:private_rjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", @@ -150,18 +151,18 @@ ts_project( "//packages/angular_devkit/core/node:node_rjs", # Base dependencies for the application in hello-world-app. - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-browser", - "//:root_modules/@angular/platform-browser-dynamic", - "//:root_modules/@angular/router", - "//:root_modules/rxjs", - "//:root_modules/tslib", - "//:root_modules/typescript", - "//:root_modules/zone.js", - "//:root_modules/buffer", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/platform-browser-dynamic", + "//:node_modules/@angular/router", + "//:node_modules/rxjs", + "//:node_modules/tslib", + "//:node_modules/typescript", + "//:node_modules/zone.js", + "//:node_modules/buffer", ], ) @@ -180,24 +181,24 @@ ts_project( "//packages/angular_devkit/core/node:node_rjs", # dev server only test deps - "//:root_modules/@types/http-proxy", - "//:root_modules/http-proxy", - "//:root_modules/puppeteer", + "//:node_modules/@types/http-proxy", + "//:node_modules/http-proxy", + "//:node_modules/puppeteer", # Base dependencies for the application in hello-world-app. - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-browser", - "//:root_modules/@angular/platform-browser-dynamic", - "//:root_modules/@angular/router", - "//:root_modules/ng-packagr", - "//:root_modules/rxjs", - "//:root_modules/tslib", - "//:root_modules/typescript", - "//:root_modules/zone.js", - "//:root_modules/buffer", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/platform-browser-dynamic", + "//:node_modules/@angular/router", + "//:node_modules/ng-packagr", + "//:node_modules/rxjs", + "//:node_modules/tslib", + "//:node_modules/typescript", + "//:node_modules/zone.js", + "//:node_modules/buffer", ], ) diff --git a/packages/angular/build/src/builders/application/index.ts b/packages/angular/build/src/builders/application/index.ts index 118f54c2013f..f8c850e5a5ab 100644 --- a/packages/angular/build/src/builders/application/index.ts +++ b/packages/angular/build/src/builders/application/index.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect'; +import { Builder, BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; import assert from 'node:assert'; import fs from 'node:fs/promises'; import path from 'node:path'; @@ -259,4 +260,7 @@ function generateFullPath( return fullFilePath; } -export default createBuilder(buildApplication); +const builder: Builder = + createBuilder(buildApplication); + +export default builder; diff --git a/packages/angular/build/src/builders/dev-server/index.ts b/packages/angular/build/src/builders/dev-server/index.ts index 0410d1b0f2d8..bb405cf67746 100644 --- a/packages/angular/build/src/builders/dev-server/index.ts +++ b/packages/angular/build/src/builders/dev-server/index.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import { createBuilder } from '@angular-devkit/architect'; +import { Builder, createBuilder } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; import { execute } from './builder'; import type { DevServerBuilderOutput } from './output'; import type { Schema as DevServerBuilderOptions } from './schema'; @@ -16,7 +17,12 @@ export { type DevServerBuilderOutput, execute as executeDevServerBuilder, }; -export default createBuilder(execute); +const builder: Builder = createBuilder< + DevServerBuilderOptions, + DevServerBuilderOutput +>(execute); + +export default builder; // Temporary export to support specs export { execute as executeDevServer }; diff --git a/packages/angular/build/src/builders/extract-i18n/index.ts b/packages/angular/build/src/builders/extract-i18n/index.ts index d751e3df5beb..fd4e1a9ccec4 100644 --- a/packages/angular/build/src/builders/extract-i18n/index.ts +++ b/packages/angular/build/src/builders/extract-i18n/index.ts @@ -6,9 +6,14 @@ * found in the LICENSE file at https://angular.dev/license */ -import { createBuilder } from '@angular-devkit/architect'; +import { Builder, createBuilder } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; import { execute } from './builder'; import type { Schema as ExtractI18nBuilderOptions } from './schema'; export { ExtractI18nBuilderOptions, execute }; -export default createBuilder(execute); + +const builder: Builder = + createBuilder(execute); + +export default builder; diff --git a/packages/angular/build/src/builders/ng-packagr/index.ts b/packages/angular/build/src/builders/ng-packagr/index.ts index df32d691aa43..b377fe19ced0 100644 --- a/packages/angular/build/src/builders/ng-packagr/index.ts +++ b/packages/angular/build/src/builders/ng-packagr/index.ts @@ -6,9 +6,14 @@ * found in the LICENSE file at https://angular.dev/license */ -import { createBuilder } from '@angular-devkit/architect'; +import { Builder, createBuilder } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; import { execute } from './builder'; import type { Schema as NgPackagrBuilderOptions } from './schema'; export { type NgPackagrBuilderOptions, execute }; -export default createBuilder(execute); + +const builder: Builder = + createBuilder(execute); + +export default builder; diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel index dc960bb8276b..5a48ad9adbed 100644 --- a/packages/angular/cli/BUILD.bazel +++ b/packages/angular/cli/BUILD.bazel @@ -43,26 +43,26 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular/cli", deps = [ - "//:root_modules/@angular/core", - "//:root_modules/@inquirer/prompts", - "//:root_modules/@listr2/prompt-adapter-inquirer", - "//:root_modules/@types/ini", - "//:root_modules/@types/node", - "//:root_modules/@types/npm-package-arg", - "//:root_modules/@types/pacote", - "//:root_modules/@types/resolve", - "//:root_modules/@types/semver", - "//:root_modules/@types/yargs", - "//:root_modules/@types/yarnpkg__lockfile", - "//:root_modules/@yarnpkg/lockfile", - "//:root_modules/ini", - "//:root_modules/jsonc-parser", - "//:root_modules/listr2", - "//:root_modules/npm-package-arg", - "//:root_modules/npm-pick-manifest", - "//:root_modules/pacote", - "//:root_modules/semver", - "//:root_modules/yargs", + "//:node_modules/@angular/core", + "//:node_modules/@inquirer/prompts", + "//:node_modules/@listr2/prompt-adapter-inquirer", + "//:node_modules/@types/ini", + "//:node_modules/@types/node", + "//:node_modules/@types/npm-package-arg", + "//:node_modules/@types/pacote", + "//:node_modules/@types/resolve", + "//:node_modules/@types/semver", + "//:node_modules/@types/yargs", + "//:node_modules/@types/yarnpkg__lockfile", + "//:node_modules/@yarnpkg/lockfile", + "//:node_modules/ini", + "//:node_modules/jsonc-parser", + "//:node_modules/listr2", + "//:node_modules/npm-package-arg", + "//:node_modules/npm-pick-manifest", + "//:node_modules/pacote", + "//:node_modules/semver", + "//:node_modules/yargs", "//packages/angular_devkit/architect:architect_rjs", "//packages/angular_devkit/architect/node:node_rjs", "//packages/angular_devkit/core:core_rjs", @@ -140,8 +140,8 @@ ts_project( ), deps = [ ":angular-cli_rjs", - "//:root_modules/@types/semver", - "//:root_modules/@types/yargs", + "//:node_modules/@types/semver", + "//:node_modules/@types/yargs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/schematics:schematics_rjs", "//packages/angular_devkit/schematics/testing:testing_rjs", diff --git a/packages/angular/create/BUILD.bazel b/packages/angular/create/BUILD.bazel index b2592c2ea56d..f472c44f7b15 100644 --- a/packages/angular/create/BUILD.bazel +++ b/packages/angular/create/BUILD.bazel @@ -24,7 +24,7 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular/create", deps = [ - "//:root_modules/@types/node", + "//:node_modules/@types/node", "//packages/angular/cli:angular-cli", ], ) diff --git a/packages/angular/pwa/BUILD.bazel b/packages/angular/pwa/BUILD.bazel index 5750a6c0d3d9..e514bf080ea5 100644 --- a/packages/angular/pwa/BUILD.bazel +++ b/packages/angular/pwa/BUILD.bazel @@ -32,8 +32,8 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular/pwa", deps = [ - "//:root_modules/@types/node", - "//:root_modules/parse5-html-rewriting-stream", + "//:node_modules/@types/node", + "//:node_modules/parse5-html-rewriting-stream", "//packages/angular_devkit/schematics:schematics_rjs", "//packages/schematics/angular:angular_rjs", ], @@ -50,7 +50,7 @@ ts_project( srcs = glob(["pwa/**/*_spec.ts"]), deps = [ ":pwa_rjs", - "//:root_modules/@types/jasmine", + "//:node_modules/@types/jasmine", "//packages/angular_devkit/schematics/testing:testing_rjs", ], ) diff --git a/packages/angular/ssr/BUILD.bazel b/packages/angular/ssr/BUILD.bazel index 219efba32c96..9322e5678a23 100644 --- a/packages/angular/ssr/BUILD.bazel +++ b/packages/angular/ssr/BUILD.bazel @@ -27,11 +27,11 @@ ts_project( source_map = True, tsconfig = "//:build-tsconfig-angular", deps = [ - "//:root_modules/@angular/common", - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-server", - "//:root_modules/@angular/router", - "//:root_modules/tslib", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-server", + "//:node_modules/@angular/router", + "//:node_modules/tslib", "//packages/angular/ssr/third_party/beasties:beasties_dts", ], ) diff --git a/packages/angular/ssr/node/BUILD.bazel b/packages/angular/ssr/node/BUILD.bazel index 6623c0b78530..387045f7a733 100644 --- a/packages/angular/ssr/node/BUILD.bazel +++ b/packages/angular/ssr/node/BUILD.bazel @@ -18,9 +18,9 @@ ts_project( source_map = True, tsconfig = "//:build-tsconfig-angular", deps = [ - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-server", - "//:root_modules/@types/node", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-server", + "//:node_modules/@types/node", "//packages/angular/ssr:ssr_rjs", ], ) diff --git a/packages/angular/ssr/test/BUILD.bazel b/packages/angular/ssr/test/BUILD.bazel index 0d232a66981b..b570aa7d1184 100644 --- a/packages/angular/ssr/test/BUILD.bazel +++ b/packages/angular/ssr/test/BUILD.bazel @@ -9,12 +9,12 @@ ts_project( include = ["**/*.ts"], ), deps = [ - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler", - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-browser", - "//:root_modules/@angular/platform-server", - "//:root_modules/@angular/router", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/platform-server", + "//:node_modules/@angular/router", "//packages/angular/ssr:ssr_rjs", ], ) diff --git a/packages/angular/ssr/test/npm_package/BUILD.bazel b/packages/angular/ssr/test/npm_package/BUILD.bazel index a30cc33e155a..1d70ce85370e 100644 --- a/packages/angular/ssr/test/npm_package/BUILD.bazel +++ b/packages/angular/ssr/test/npm_package/BUILD.bazel @@ -8,7 +8,7 @@ ts_project( testonly = True, srcs = glob(["**/*.ts"]), deps = [ - "//:root_modules/@bazel/runfiles", + "//:node_modules/@bazel/runfiles", ], ) diff --git a/packages/angular/ssr/third_party/beasties/BUILD.bazel b/packages/angular/ssr/third_party/beasties/BUILD.bazel index cebfaffa1639..b9623ec316ac 100644 --- a/packages/angular/ssr/third_party/beasties/BUILD.bazel +++ b/packages/angular/ssr/third_party/beasties/BUILD.bazel @@ -9,7 +9,7 @@ js_library( "index.d.ts", ], deps = [ - "//:root_modules/beasties", + "//:node_modules/beasties", ], ) @@ -19,7 +19,7 @@ js_library( ":bundled_beasties_files", ], deps = [ - "//:root_modules/beasties", + "//:node_modules/beasties", ], ) diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel index 33f3e399983e..d6b2748015f3 100644 --- a/packages/angular_devkit/architect/BUILD.bazel +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -4,13 +4,15 @@ # found in the LICENSE file at https://angular.dev/license load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") -load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") -load("//tools:defaults2.bzl", "npm_package", "ts_project") +load("@npm2//:defs.bzl", "npm_link_all_packages") +load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") +package(default_visibility = ["//visibility:public"]) + licenses(["notice"]) -package(default_visibility = ["//visibility:public"]) +npm_link_all_packages() ts_json_schema( name = "builder_input_schema", @@ -66,10 +68,9 @@ ts_project( data = JSON_FILES, module_name = "@angular-devkit/architect", deps = [ - "//:root_modules/@types/node", - "//:root_modules/rxjs", - "//packages/angular_devkit/core:core_rjs", - "//packages/angular_devkit/core/node:node_rjs", + ":node_modules/@angular-devkit/core", + "//:node_modules/@types/node", + "//:node_modules/rxjs", ], ) @@ -79,16 +80,16 @@ ts_project( srcs = glob(["src/**/*_spec.ts"]), deps = [ ":architect_rjs", - "//:root_modules/@types/jasmine", - "//:root_modules/rxjs", + ":node_modules/@angular-devkit/core", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//packages/angular_devkit/architect/testing:testing_rjs", - "//packages/angular_devkit/core:core_rjs", ], ) -jasmine_node_test( +jasmine_test( name = "architect_test", - srcs = [":architect_test_lib"], + data = [":architect_test_lib_rjs"], ) # @external_begin diff --git a/packages/angular_devkit/architect/node/BUILD.bazel b/packages/angular_devkit/architect/node/BUILD.bazel index 6b5440ade444..e263c3ec3d7e 100644 --- a/packages/angular_devkit/architect/node/BUILD.bazel +++ b/packages/angular_devkit/architect/node/BUILD.bazel @@ -18,8 +18,8 @@ ts_project( ), module_name = "@angular-devkit/architect/node", deps = [ - "//:root_modules/@types/node", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/rxjs", "//packages/angular_devkit/architect:architect_rjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", @@ -36,8 +36,8 @@ ts_project( ), deps = [ ":node_rjs", - "//:root_modules/@types/jasmine", - "//:root_modules/rxjs", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//packages/angular_devkit/architect:architect_rjs", "//tests/angular_devkit/architect/node/jobs:jobs_test_lib_rjs", ], diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts index c98cae63c3f2..d2fc8cfba5eb 100644 --- a/packages/angular_devkit/architect/src/create-builder.ts +++ b/packages/angular_devkit/architect/src/create-builder.ts @@ -37,6 +37,8 @@ import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal'; import { JobInboundMessageKind, createJobHandler } from './jobs'; import { scheduleByName, scheduleByTarget } from './schedule-by-name'; +export type { Builder }; + // eslint-disable-next-line max-lines-per-function export function createBuilder( fn: BuilderHandlerFn, @@ -252,6 +254,9 @@ export function createBuilder { // Metadata associated with this builder. [BuilderSymbol]: true; [BuilderVersionSymbol]: string; + __OptionT: OptionT; } export interface ArchitectHost { diff --git a/packages/angular_devkit/architect/testing/BUILD.bazel b/packages/angular_devkit/architect/testing/BUILD.bazel index ffe76eb63200..a6dc372c3d1f 100644 --- a/packages/angular_devkit/architect/testing/BUILD.bazel +++ b/packages/angular_devkit/architect/testing/BUILD.bazel @@ -17,8 +17,8 @@ ts_project( ), module_name = "@angular-devkit/architect/testing", deps = [ - "//:root_modules/@types/node", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/rxjs", "//packages/angular_devkit/architect:architect_rjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel index 636c07160582..8a8350cdcb52 100644 --- a/packages/angular_devkit/architect_cli/BUILD.bazel +++ b/packages/angular_devkit/architect_cli/BUILD.bazel @@ -15,10 +15,10 @@ ts_project( ] + glob(["src/**/*.ts"]), module_name = "@angular-devkit/architect-cli", deps = [ - "//:root_modules/@types/node", - "//:root_modules/@types/progress", - "//:root_modules/@types/yargs-parser", - "//:root_modules/ansi-colors", + "//:node_modules/@types/node", + "//:node_modules/@types/progress", + "//:node_modules/@types/yargs-parser", + "//:node_modules/ansi-colors", "//packages/angular_devkit/architect:architect_rjs", "//packages/angular_devkit/architect/node:node_rjs", "//packages/angular_devkit/core:core_rjs", diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 38c2f723c3d0..50f6386f0e3f 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -122,77 +122,77 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular-devkit/build-angular", deps = [ - "//:root_modules/@ampproject/remapping", - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@angular/core", - "//:root_modules/@angular/localize", - "//:root_modules/@angular/platform-server", - "//:root_modules/@angular/service-worker", - "//:root_modules/@babel/core", - "//:root_modules/@babel/generator", - "//:root_modules/@babel/helper-annotate-as-pure", - "//:root_modules/@babel/helper-split-export-declaration", - "//:root_modules/@babel/plugin-transform-async-generator-functions", - "//:root_modules/@babel/plugin-transform-async-to-generator", - "//:root_modules/@babel/plugin-transform-runtime", - "//:root_modules/@babel/preset-env", - "//:root_modules/@babel/runtime", - "//:root_modules/@discoveryjs/json-ext", - "//:root_modules/@types/babel__core", - "//:root_modules/@types/babel__generator", - "//:root_modules/@types/browser-sync", - "//:root_modules/@types/karma", - "//:root_modules/@types/less", - "//:root_modules/@types/loader-utils", - "//:root_modules/@types/node", - "//:root_modules/@types/picomatch", - "//:root_modules/@types/semver", - "//:root_modules/@types/watchpack", - "//:root_modules/@vitejs/plugin-basic-ssl", - "//:root_modules/@web/test-runner", - "//:root_modules/ajv", - "//:root_modules/ansi-colors", - "//:root_modules/autoprefixer", - "//:root_modules/babel-loader", - "//:root_modules/browserslist", - "//:root_modules/copy-webpack-plugin", - "//:root_modules/css-loader", - "//:root_modules/esbuild", - "//:root_modules/esbuild-wasm", - "//:root_modules/fast-glob", - "//:root_modules/http-proxy-middleware", - "//:root_modules/istanbul-lib-instrument", - "//:root_modules/jsonc-parser", - "//:root_modules/karma", - "//:root_modules/karma-source-map-support", - "//:root_modules/less", - "//:root_modules/less-loader", - "//:root_modules/license-webpack-plugin", - "//:root_modules/loader-utils", - "//:root_modules/mini-css-extract-plugin", - "//:root_modules/ng-packagr", - "//:root_modules/open", - "//:root_modules/ora", - "//:root_modules/piscina", - "//:root_modules/postcss", - "//:root_modules/postcss-loader", - "//:root_modules/resolve-url-loader", - "//:root_modules/rxjs", - "//:root_modules/sass", - "//:root_modules/sass-loader", - "//:root_modules/semver", - "//:root_modules/source-map-loader", - "//:root_modules/source-map-support", - "//:root_modules/terser", - "//:root_modules/tree-kill", - "//:root_modules/tslib", - "//:root_modules/typescript", - "//:root_modules/webpack", - "//:root_modules/webpack-dev-middleware", - "//:root_modules/webpack-dev-server", - "//:root_modules/webpack-merge", - "//:root_modules/webpack-subresource-integrity", + "//:node_modules/@ampproject/remapping", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@angular/core", + "//:node_modules/@angular/localize", + "//:node_modules/@angular/platform-server", + "//:node_modules/@angular/service-worker", + "//:node_modules/@babel/core", + "//:node_modules/@babel/generator", + "//:node_modules/@babel/helper-annotate-as-pure", + "//:node_modules/@babel/helper-split-export-declaration", + "//:node_modules/@babel/plugin-transform-async-generator-functions", + "//:node_modules/@babel/plugin-transform-async-to-generator", + "//:node_modules/@babel/plugin-transform-runtime", + "//:node_modules/@babel/preset-env", + "//:node_modules/@babel/runtime", + "//:node_modules/@discoveryjs/json-ext", + "//:node_modules/@types/babel__core", + "//:node_modules/@types/babel__generator", + "//:node_modules/@types/browser-sync", + "//:node_modules/@types/karma", + "//:node_modules/@types/less", + "//:node_modules/@types/loader-utils", + "//:node_modules/@types/node", + "//:node_modules/@types/picomatch", + "//:node_modules/@types/semver", + "//:node_modules/@types/watchpack", + "//:node_modules/@vitejs/plugin-basic-ssl", + "//:node_modules/@web/test-runner", + "//:node_modules/ajv", + "//:node_modules/ansi-colors", + "//:node_modules/autoprefixer", + "//:node_modules/babel-loader", + "//:node_modules/browserslist", + "//:node_modules/copy-webpack-plugin", + "//:node_modules/css-loader", + "//:node_modules/esbuild", + "//:node_modules/esbuild-wasm", + "//:node_modules/fast-glob", + "//:node_modules/http-proxy-middleware", + "//:node_modules/istanbul-lib-instrument", + "//:node_modules/jsonc-parser", + "//:node_modules/karma", + "//:node_modules/karma-source-map-support", + "//:node_modules/less", + "//:node_modules/less-loader", + "//:node_modules/license-webpack-plugin", + "//:node_modules/loader-utils", + "//:node_modules/mini-css-extract-plugin", + "//:node_modules/ng-packagr", + "//:node_modules/open", + "//:node_modules/ora", + "//:node_modules/piscina", + "//:node_modules/postcss", + "//:node_modules/postcss-loader", + "//:node_modules/resolve-url-loader", + "//:node_modules/rxjs", + "//:node_modules/sass", + "//:node_modules/sass-loader", + "//:node_modules/semver", + "//:node_modules/source-map-loader", + "//:node_modules/source-map-support", + "//:node_modules/terser", + "//:node_modules/tree-kill", + "//:node_modules/tslib", + "//:node_modules/typescript", + "//:node_modules/webpack", + "//:node_modules/webpack-dev-middleware", + "//:node_modules/webpack-dev-server", + "//:node_modules/webpack-merge", + "//:node_modules/webpack-subresource-integrity", "//packages/angular/build:build_rjs", "//packages/angular/build/private:private_rjs", "//packages/angular/ssr:ssr_rjs", @@ -219,10 +219,10 @@ ts_project( deps = [ ":build_angular_rjs", ":build_angular_test_utils_rjs", - "//:root_modules/fast-glob", - "//:root_modules/prettier", - "//:root_modules/typescript", - "//:root_modules/webpack", + "//:node_modules/fast-glob", + "//:node_modules/prettier", + "//:node_modules/typescript", + "//:node_modules/webpack", "//packages/angular_devkit/architect/testing:testing_rjs", "//packages/angular_devkit/core:core_rjs", ], @@ -287,7 +287,7 @@ ts_project( data = glob(["test/**/*"]), deps = [ ":build_angular_rjs", - "//:root_modules/@types/jasmine", + "//:node_modules/@types/jasmine", "//modules/testing/builder:builder_rjs", "//packages/angular/build:build_rjs", "//packages/angular/build/private:private_rjs", @@ -308,10 +308,10 @@ LARGE_SPECS = { "flaky": True, "extra_deps": [ "//packages/angular_devkit/build_webpack:build_webpack_rjs", - "//:root_modules/@types/http-proxy", - "//:root_modules/http-proxy", - "//:root_modules/puppeteer", - "//:root_modules/undici", + "//:node_modules/@types/http-proxy", + "//:node_modules/http-proxy", + "//:node_modules/puppeteer", + "//:node_modules/undici", ], }, "extract-i18n": {}, @@ -320,21 +320,21 @@ LARGE_SPECS = { "size": "large", "flaky": True, "extra_deps": [ - "//:root_modules/karma", - "//:root_modules/karma-chrome-launcher", - "//:root_modules/karma-coverage", - "//:root_modules/karma-jasmine", - "//:root_modules/karma-jasmine-html-reporter", - "//:root_modules/puppeteer", - "//:root_modules/webpack", + "//:node_modules/karma", + "//:node_modules/karma-chrome-launcher", + "//:node_modules/karma-coverage", + "//:node_modules/karma-jasmine", + "//:node_modules/karma-jasmine-html-reporter", + "//:node_modules/puppeteer", + "//:node_modules/webpack", ], }, "protractor": { "extra_deps": [ - "//:root_modules/jasmine-spec-reporter", - "//:root_modules/protractor", - "//:root_modules/puppeteer", - "//:root_modules/ts-node", + "//:node_modules/jasmine-spec-reporter", + "//:node_modules/protractor", + "//:node_modules/puppeteer", + "//:node_modules/ts-node", ], # NB: does not run on rbe because webdriver manager uses an absolute path to chromedriver "tags": ["no-remote-exec"], @@ -344,7 +344,7 @@ LARGE_SPECS = { "server": { "size": "large", "extra_deps": [ - "//:root_modules/@angular/animations", + "//:node_modules/@angular/animations", ], }, "ng-packagr": {}, @@ -353,8 +353,8 @@ LARGE_SPECS = { "size": "large", "flaky": True, "extra_deps": [ - "//:root_modules/@angular/animations", - "//:root_modules/@angular/material", + "//:node_modules/@angular/animations", + "//:node_modules/@angular/material", ], }, "prerender": {}, @@ -362,10 +362,10 @@ LARGE_SPECS = { "ssr-dev-server": { "extra_deps": [ "//packages/angular/ssr/node:node_rjs", - "//:root_modules/@types/browser-sync", - "//:root_modules/browser-sync", - "//:root_modules/express", - "//:root_modules/undici", + "//:node_modules/@types/browser-sync", + "//:node_modules/browser-sync", + "//:node_modules/express", + "//:node_modules/undici", ], }, } @@ -390,18 +390,18 @@ LARGE_SPECS = { # Base dependencies for the application in hello-world-app. # Some tests also require extra dependencies. - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-browser", - "//:root_modules/@angular/platform-browser-dynamic", - "//:root_modules/@angular/router", - "//:root_modules/rxjs", - "//:root_modules/tslib", - "//:root_modules/typescript", - "//:root_modules/zone.js", - "//:root_modules/@types/jasmine", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/platform-browser-dynamic", + "//:node_modules/@angular/router", + "//:node_modules/rxjs", + "//:node_modules/tslib", + "//:node_modules/typescript", + "//:node_modules/zone.js", + "//:node_modules/@types/jasmine", ] + LARGE_SPECS[spec].get("extra_deps", []), ) for spec in LARGE_SPECS diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel index 76867daf288c..8fb516402c78 100644 --- a/packages/angular_devkit/build_webpack/BUILD.bazel +++ b/packages/angular_devkit/build_webpack/BUILD.bazel @@ -45,11 +45,12 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular-devkit/build-webpack", deps = [ - "//:root_modules/@types/node", - "//:root_modules/rxjs", - "//:root_modules/webpack", - "//:root_modules/webpack-dev-server", + "//:node_modules/@types/node", + "//:node_modules/rxjs", + "//:node_modules/webpack", + "//:node_modules/webpack-dev-server", "//packages/angular_devkit/architect:architect_rjs", + "//packages/angular_devkit/core:core_rjs", ], ) @@ -68,7 +69,7 @@ ts_project( ), deps = [ ":build_webpack_rjs", - "//:root_modules/@types/jasmine", + "//:node_modules/@types/jasmine", "//packages/angular_devkit/architect:architect_rjs", "//packages/angular_devkit/architect/node:node_rjs", "//packages/angular_devkit/architect/testing:testing_rjs", @@ -82,14 +83,14 @@ jasmine_node_test( name = "build_webpack_test", srcs = [":build_webpack_test_lib"], data = [ - "//:root_modules/@angular/common", - "//:root_modules/@angular/compiler", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@angular/core", - "//:root_modules/@angular/platform-browser", - "//:root_modules/@angular/platform-browser-dynamic", - "//:root_modules/tslib", - "//:root_modules/zone.js", + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/platform-browser-dynamic", + "//:node_modules/tslib", + "//:node_modules/zone.js", ], ) diff --git a/packages/angular_devkit/build_webpack/src/builders/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/builders/webpack-dev-server/index.ts index a927f573dc10..7e21b837fcbe 100644 --- a/packages/angular_devkit/build_webpack/src/builders/webpack-dev-server/index.ts +++ b/packages/angular_devkit/build_webpack/src/builders/webpack-dev-server/index.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import { BuilderContext, createBuilder } from '@angular-devkit/architect'; +import { Builder, BuilderContext, createBuilder } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; import { resolve as pathResolve } from 'path'; import { Observable, from, isObservable, of, switchMap } from 'rxjs'; import webpack from 'webpack'; @@ -124,12 +125,15 @@ export function runWebpackDevServer( ); } -export default createBuilder( - (options, context) => { - const configPath = pathResolve(context.workspaceRoot, options.webpackConfig); +const builder: Builder = createBuilder< + WebpackDevServerBuilderSchema, + DevServerBuildOutput +>((options, context) => { + const configPath = pathResolve(context.workspaceRoot, options.webpackConfig); - return from(getWebpackConfig(configPath)).pipe( - switchMap((config) => runWebpackDevServer(config, context)), - ); - }, -); + return from(getWebpackConfig(configPath)).pipe( + switchMap((config) => runWebpackDevServer(config, context)), + ); +}); + +export default builder; diff --git a/packages/angular_devkit/build_webpack/src/builders/webpack/index.ts b/packages/angular_devkit/build_webpack/src/builders/webpack/index.ts index a7ef459c95b7..470b92970446 100644 --- a/packages/angular_devkit/build_webpack/src/builders/webpack/index.ts +++ b/packages/angular_devkit/build_webpack/src/builders/webpack/index.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect'; +import { Builder, BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect'; +import { json } from '@angular-devkit/core'; import { resolve as pathResolve } from 'path'; import { Observable, from, isObservable, of, switchMap } from 'rxjs'; import webpack from 'webpack'; @@ -120,10 +121,13 @@ export function runWebpack( ); } -export default createBuilder((options, context) => { - const configPath = pathResolve(context.workspaceRoot, options.webpackConfig); +const builder: Builder = + createBuilder((options, context) => { + const configPath = pathResolve(context.workspaceRoot, options.webpackConfig); - return from(getWebpackConfig(configPath)).pipe( - switchMap((config) => runWebpack(config, context)), - ); -}); + return from(getWebpackConfig(configPath)).pipe( + switchMap((config) => runWebpack(config, context)), + ); + }); + +export default builder; diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel index a27e72f14c5e..07ee4d8f8fc0 100644 --- a/packages/angular_devkit/core/BUILD.bazel +++ b/packages/angular_devkit/core/BUILD.bazel @@ -30,15 +30,15 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular-devkit/core", deps = [ - "//:root_modules/@types/node", - "//:root_modules/@types/picomatch", - "//:root_modules/@types/jasmine", - "//:root_modules/ajv", - "//:root_modules/ajv-formats", - "//:root_modules/jsonc-parser", - "//:root_modules/picomatch", - "//:root_modules/rxjs", - "//:root_modules/source-map", + "//:node_modules/@types/node", + "//:node_modules/@types/picomatch", + "//:node_modules/@types/jasmine", + "//:node_modules/ajv", + "//:node_modules/ajv-formats", + "//:node_modules/jsonc-parser", + "//:node_modules/picomatch", + "//:node_modules/rxjs", + "//:node_modules/source-map", # @node_module: typescript:es2015.proxy # @node_module: typescript:es2015.reflect # @node_module: typescript:es2015.symbol.wellknown @@ -55,7 +55,7 @@ ts_project( data = glob(["src/workspace/json/test/**/*.json"]), deps = [ ":core_rjs", - "//:root_modules/rxjs", + "//:node_modules/rxjs", "//packages/angular_devkit/core/node:node_rjs", ], ) diff --git a/packages/angular_devkit/core/node/BUILD.bazel b/packages/angular_devkit/core/node/BUILD.bazel index 6e2d05567ef2..fab7df5cdff5 100644 --- a/packages/angular_devkit/core/node/BUILD.bazel +++ b/packages/angular_devkit/core/node/BUILD.bazel @@ -21,9 +21,9 @@ ts_project( ), module_name = "@angular-devkit/core/node", deps = [ - "//:root_modules/@types/node", - "//:root_modules/chokidar", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/chokidar", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", ], ) @@ -43,8 +43,8 @@ ts_project( ), deps = [ ":node_rjs", - "//:root_modules/@types/jasmine", - "//:root_modules/rxjs", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", ], ) diff --git a/packages/angular_devkit/core/node/testing/BUILD.bazel b/packages/angular_devkit/core/node/testing/BUILD.bazel index 89870c7f876d..90f40f19a426 100644 --- a/packages/angular_devkit/core/node/testing/BUILD.bazel +++ b/packages/angular_devkit/core/node/testing/BUILD.bazel @@ -18,9 +18,9 @@ ts_project( ), module_name = "@angular-devkit/core/node/testing", deps = [ - "//:root_modules/@types/jasmine", - "//:root_modules/@types/node", - "//:root_modules/rxjs", + "//:node_modules/@types/jasmine", + "//:node_modules/@types/node", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", ], diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel index 2e69ab10ee39..077ac07bfdaf 100644 --- a/packages/angular_devkit/schematics/BUILD.bazel +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -25,10 +25,10 @@ ts_project( ], module_name = "@angular-devkit/schematics", deps = [ - "//:root_modules/@types/node", - "//:root_modules/jsonc-parser", - "//:root_modules/magic-string", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/jsonc-parser", + "//:node_modules/magic-string", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", # TODO: get rid of this for 6.0 ], @@ -40,8 +40,8 @@ ts_project( srcs = glob(["src/**/*_spec.ts"]), deps = [ ":schematics", - "//:root_modules/@types/jasmine", - "//:root_modules/rxjs", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//packages/angular_devkit/schematics/testing:testing_rjs", diff --git a/packages/angular_devkit/schematics/tasks/BUILD.bazel b/packages/angular_devkit/schematics/tasks/BUILD.bazel index 719558038aeb..bbd37087b759 100644 --- a/packages/angular_devkit/schematics/tasks/BUILD.bazel +++ b/packages/angular_devkit/schematics/tasks/BUILD.bazel @@ -20,9 +20,9 @@ ts_project( data = ["package.json"], module_name = "@angular-devkit/schematics/tasks", deps = [ - "//:root_modules/@types/node", - "//:root_modules/ora", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/ora", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//packages/angular_devkit/schematics:schematics_rjs", diff --git a/packages/angular_devkit/schematics/tasks/node/BUILD.bazel b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel index 1680791ae90e..1a8b991a0001 100644 --- a/packages/angular_devkit/schematics/tasks/node/BUILD.bazel +++ b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel @@ -18,8 +18,8 @@ ts_project( ), module_name = "@angular-devkit/schematics/tasks/node", deps = [ - "//:root_modules/@types/node", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//packages/angular_devkit/schematics:schematics_rjs", diff --git a/packages/angular_devkit/schematics/testing/BUILD.bazel b/packages/angular_devkit/schematics/testing/BUILD.bazel index 815fa49935d0..22583535d6b5 100644 --- a/packages/angular_devkit/schematics/testing/BUILD.bazel +++ b/packages/angular_devkit/schematics/testing/BUILD.bazel @@ -16,7 +16,7 @@ ts_project( data = ["package.json"], module_name = "@angular-devkit/schematics/testing", deps = [ - "//:root_modules/rxjs", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/schematics:schematics_rjs", "//packages/angular_devkit/schematics/tasks/node:node_rjs", diff --git a/packages/angular_devkit/schematics/tools/BUILD.bazel b/packages/angular_devkit/schematics/tools/BUILD.bazel index 2cad66f7adbc..eda1d2a56215 100644 --- a/packages/angular_devkit/schematics/tools/BUILD.bazel +++ b/packages/angular_devkit/schematics/tools/BUILD.bazel @@ -21,9 +21,9 @@ ts_project( data = ["package.json"], module_name = "@angular-devkit/schematics/tools", deps = [ - "//:root_modules/@types/node", - "//:root_modules/jsonc-parser", - "//:root_modules/rxjs", + "//:node_modules/@types/node", + "//:node_modules/jsonc-parser", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//packages/angular_devkit/schematics:schematics_rjs", @@ -43,8 +43,8 @@ ts_project( ), deps = [ ":tools_rjs", - "//:root_modules/@types/jasmine", - "//:root_modules/rxjs", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//packages/angular_devkit/schematics:schematics_rjs", diff --git a/packages/angular_devkit/schematics_cli/BUILD.bazel b/packages/angular_devkit/schematics_cli/BUILD.bazel index 91f0603b59b3..04d2962c8f0b 100644 --- a/packages/angular_devkit/schematics_cli/BUILD.bazel +++ b/packages/angular_devkit/schematics_cli/BUILD.bazel @@ -44,12 +44,12 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular-devkit/schematics-cli", deps = [ - "//:root_modules/@inquirer/prompts", - "//:root_modules/@types/node", - "//:root_modules/@types/yargs-parser", - "//:root_modules/ansi-colors", - "//:root_modules/symbol-observable", - "//:root_modules/yargs-parser", + "//:node_modules/@inquirer/prompts", + "//:node_modules/@types/node", + "//:node_modules/@types/yargs-parser", + "//:node_modules/ansi-colors", + "//:node_modules/symbol-observable", + "//:node_modules/yargs-parser", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//packages/angular_devkit/schematics:schematics_rjs", diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel index e736c65f96f9..f5b14dddd433 100644 --- a/packages/ngtools/webpack/BUILD.bazel +++ b/packages/ngtools/webpack/BUILD.bazel @@ -29,10 +29,10 @@ ts_project( ], module_name = "@ngtools/webpack", deps = [ - "//:root_modules/@angular/compiler-cli", - "//:root_modules/@types/node", - "//:root_modules/typescript", - "//:root_modules/webpack", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/@types/node", + "//:node_modules/typescript", + "//:node_modules/webpack", ], ) @@ -47,9 +47,9 @@ ts_project( ), deps = [ ":webpack_rjs", - "//:root_modules/@angular/compiler", - "//:root_modules/@types/jasmine", - "//:root_modules/typescript", + "//:node_modules/@angular/compiler", + "//:node_modules/@types/jasmine", + "//:node_modules/typescript", "//packages/angular_devkit/core:core_rjs", ], ) diff --git a/packages/schematics/angular/BUILD.bazel b/packages/schematics/angular/BUILD.bazel index 81f7372d34b9..b57ab3b33e10 100644 --- a/packages/schematics/angular/BUILD.bazel +++ b/packages/schematics/angular/BUILD.bazel @@ -81,10 +81,10 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@schematics/angular", deps = [ - "//:root_modules/@inquirer/prompts", - "//:root_modules/@types/node", - "//:root_modules/browserslist", - "//:root_modules/jsonc-parser", + "//:node_modules/@inquirer/prompts", + "//:node_modules/@types/node", + "//:node_modules/browserslist", + "//:node_modules/jsonc-parser", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/schematics:schematics_rjs", "//packages/angular_devkit/schematics/tasks:tasks_rjs", @@ -97,7 +97,7 @@ jasmine_node_test( srcs = ["no_typescript_runtime_dep_spec.js"], deps = [ ":angular", - "//:root_modules/@types/jasmine", + "//:node_modules/@types/jasmine", ], ) @@ -116,8 +116,8 @@ ts_project( ), deps = [ ":angular_rjs", - "//:root_modules/@types/jasmine", - "//:root_modules/jsonc-parser", + "//:node_modules/@types/jasmine", + "//:node_modules/jsonc-parser", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node/testing:testing_rjs", "//packages/angular_devkit/schematics:schematics_rjs", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fffae954d726..8545f4f91088 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -160,6 +160,9 @@ importers: '@types/jasmine': specifier: ~5.1.0 version: 5.1.5 + '@types/jasmine-reporters': + specifier: ^2 + version: 2.5.3 '@types/karma': specifier: ^6.3.0 version: 6.3.9 @@ -310,6 +313,9 @@ importers: jasmine-core: specifier: ~5.5.0 version: 5.5.0 + jasmine-reporters: + specifier: ^2.5.2 + version: 2.5.2 jasmine-spec-reporter: specifier: ~7.0.0 version: 7.0.0 @@ -520,6 +526,39 @@ importers: puppeteer: built: true + packages/angular_devkit/architect: + dependencies: + '@angular-devkit/core': + specifier: 0.0.0-PLACEHOLDER + version: link:../core + rxjs: + specifier: 7.8.1 + version: 7.8.1 + + packages/angular_devkit/core: + dependencies: + ajv: + specifier: 8.17.1 + version: 8.17.1 + ajv-formats: + specifier: 3.0.1 + version: 3.0.1(ajv@8.17.1) + chokidar: + specifier: ^4.0.0 + version: 4.0.3 + jsonc-parser: + specifier: 3.3.1 + version: 3.3.1 + picomatch: + specifier: 4.0.2 + version: 4.0.2 + rxjs: + specifier: 7.8.1 + version: 7.8.1 + source-map: + specifier: 0.7.4 + version: 0.7.4 + packages: /@ampproject/remapping@2.3.0: @@ -4537,6 +4576,12 @@ packages: '@types/istanbul-lib-report': 3.0.3 dev: true + /@types/jasmine-reporters@2.5.3: + resolution: {integrity: sha512-8aojAUdgdiD9VQbllBJb/9gny3lOjz9T5gyMcbYlKe6npwGVsarbr8v2JYSFJSZSuFYXcPVzFG2lLX3ib0j/DA==} + dependencies: + '@types/jasmine': 5.1.5 + dev: true + /@types/jasmine@5.1.5: resolution: {integrity: sha512-SaCZ3kM5NjOiJqMRYwHpLbTfUC2Dyk1KS3QanNFsUYPGTk70CWVK/J9ueun6zNhw/UkgV7xl8V4ZLQZNRbfnNw==} dev: true @@ -5694,7 +5739,6 @@ packages: optional: true dependencies: ajv: 8.17.1 - dev: true /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} @@ -5747,7 +5791,6 @@ packages: fast-uri: 3.0.5 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 - dev: true /ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -6559,7 +6602,6 @@ packages: engines: {node: '>= 14.16.0'} dependencies: readdirp: 4.0.2 - dev: true /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -8168,7 +8210,6 @@ packages: /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} @@ -8215,7 +8256,6 @@ packages: /fast-uri@3.0.5: resolution: {integrity: sha512-5JnBCWpFlMo0a3ciDy/JckMzzv1U9coZrIhedq+HXxxUfDTAiS0LA8OKVao4G9BxmCVck/jtA5r3KAtRWEyD8Q==} - dev: true /fastq@1.18.0: resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} @@ -9915,7 +9955,6 @@ packages: /json-schema-traverse@1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} - dev: true /json-schema@0.4.0: resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==} @@ -9955,7 +9994,6 @@ packages: /jsonc-parser@3.3.1: resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} - dev: true /jsonfile@3.0.1: resolution: {integrity: sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==} @@ -11806,7 +11844,6 @@ packages: /picomatch@4.0.2: resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} engines: {node: '>=12'} - dev: true /pify@2.3.0: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} @@ -12408,7 +12445,6 @@ packages: /readdirp@4.0.2: resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==} engines: {node: '>= 14.16.0'} - dev: true /real-require@0.2.0: resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} @@ -12539,7 +12575,6 @@ packages: /require-from-string@2.0.2: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} - dev: true /require-main-filename@2.0.0: resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} @@ -12771,7 +12806,6 @@ packages: resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} dependencies: tslib: 2.8.1 - dev: true /safe-array-concat@1.1.3: resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==} @@ -13399,7 +13433,6 @@ packages: /source-map@0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} engines: {node: '>= 8'} - dev: true /spdx-correct@3.2.0: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} @@ -14044,7 +14077,6 @@ packages: /tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - dev: true /tsscmp@1.0.6: resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index d05a7e7dc84a..48350d1ac507 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,4 @@ packages: - . + - packages/angular_devkit/architect + - packages/angular_devkit/core diff --git a/tests/angular_devkit/architect/node/jobs/BUILD.bazel b/tests/angular_devkit/architect/node/jobs/BUILD.bazel index 912028a0b1cb..92b3422ccc5d 100644 --- a/tests/angular_devkit/architect/node/jobs/BUILD.bazel +++ b/tests/angular_devkit/architect/node/jobs/BUILD.bazel @@ -16,7 +16,7 @@ ts_project( ], ), deps = [ - "//:root_modules/@types/node", + "//:node_modules/@types/node", "//packages/angular_devkit/architect:architect_rjs", ], ) diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel index 7994ff7a530f..efa750b6ff14 100644 --- a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel +++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel @@ -22,8 +22,8 @@ ts_project( ], ), deps = [ - "//:root_modules/@types/jasmine", - "//:root_modules/@types/node", + "//:node_modules/@types/jasmine", + "//:node_modules/@types/node", "//packages/angular_devkit/schematics:schematics_rjs", ], ) diff --git a/tests/legacy-cli/BUILD.bazel b/tests/legacy-cli/BUILD.bazel index e5e19bdc87a4..2003020d4f26 100644 --- a/tests/legacy-cli/BUILD.bazel +++ b/tests/legacy-cli/BUILD.bazel @@ -12,8 +12,8 @@ ts_project( "verdaccio_auth.yaml", ], deps = [ - "//:root_modules/ansi-colors", - "//:root_modules/fast-glob", + "//:node_modules/ansi-colors", + "//:node_modules/fast-glob", "//packages/angular_devkit/core:core_rjs", "//packages/angular_devkit/core/node:node_rjs", "//tests/legacy-cli/e2e/utils:utils_rjs", diff --git a/tests/legacy-cli/e2e/tests/BUILD.bazel b/tests/legacy-cli/e2e/tests/BUILD.bazel index 1dc0fa8ec9dc..bf26b9b03712 100644 --- a/tests/legacy-cli/e2e/tests/BUILD.bazel +++ b/tests/legacy-cli/e2e/tests/BUILD.bazel @@ -10,11 +10,11 @@ ts_project( "//tests/legacy-cli/e2e/ng-snapshot", ], deps = [ - "//:root_modules/@types/express", - "//:root_modules/@types/semver", - "//:root_modules/express", - "//:root_modules/fast-glob", - "//:root_modules/semver", + "//:node_modules/@types/express", + "//:node_modules/@types/semver", + "//:node_modules/express", + "//:node_modules/fast-glob", + "//:node_modules/semver", "//tests/legacy-cli/e2e/utils:utils_rjs", ], ) diff --git a/tests/legacy-cli/e2e/utils/BUILD.bazel b/tests/legacy-cli/e2e/utils/BUILD.bazel index 100f5df0f966..02a95ca4d8b3 100644 --- a/tests/legacy-cli/e2e/utils/BUILD.bazel +++ b/tests/legacy-cli/e2e/utils/BUILD.bazel @@ -10,17 +10,17 @@ ts_project( "//tests/legacy-cli/e2e/ng-snapshot", ], deps = [ - "//:root_modules/@types/jasmine", - "//:root_modules/@types/semver", - "//:root_modules/ansi-colors", - "//:root_modules/fast-glob", - "//:root_modules/npm", - "//:root_modules/protractor", - "//:root_modules/rxjs", - "//:root_modules/semver", - "//:root_modules/tar", - "//:root_modules/tree-kill", - "//:root_modules/verdaccio", - "//:root_modules/verdaccio-auth-memory", + "//:node_modules/@types/jasmine", + "//:node_modules/@types/semver", + "//:node_modules/ansi-colors", + "//:node_modules/fast-glob", + "//:node_modules/npm", + "//:node_modules/protractor", + "//:node_modules/rxjs", + "//:node_modules/semver", + "//:node_modules/tar", + "//:node_modules/tree-kill", + "//:node_modules/verdaccio", + "//:node_modules/verdaccio-auth-memory", ], ) diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 49fc0c271334..a2525c94cce7 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -56,8 +56,8 @@ js_binary( name = "vanilla_ts_worker", data = [ ":copy_worker_js", - "//:root_modules/@angular/compiler-cli", - "//:root_modules/typescript", + "//:node_modules/@angular/compiler-cli", + "//:node_modules/typescript", ], entry_point = ":copy_worker_js", fixed_args = ["--vanilla-ts"], diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl index aa2ff22e383a..8400da44268e 100644 --- a/tools/defaults2.bzl +++ b/tools/defaults2.bzl @@ -1,3 +1,4 @@ +load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test") load("//tools:interop.bzl", _ts_project = "ts_project") load("//tools/bazel:npm_package.bzl", _npm_package = "npm_package") @@ -6,3 +7,11 @@ def ts_project(**kwargs): def npm_package(**kwargs): _npm_package(**kwargs) + +def jasmine_test(**kwargs): + _jasmine_test( + node_modules = "//:node_modules", + chdir = native.package_name(), + args = ["**/*.js"], + **kwargs + ) diff --git a/tools/interop.bzl b/tools/interop.bzl index 61bc929b0a85..4b981129bcd8 100644 --- a/tools/interop.bzl +++ b/tools/interop.bzl @@ -107,8 +107,8 @@ def ts_project(name, module_name = None, deps = [], tsconfig = None, testonly = # execution, with regards to first-party dependency linking. rjs_modules_to_rnjs = [] for d in deps: - if d.startswith("//:root_modules/"): - rjs_modules_to_rnjs.append(d.replace("//:root_modules/", "@npm//")) + if d.startswith("//:node_modules/"): + rjs_modules_to_rnjs.append(d.replace("//:node_modules/", "@npm//")) if d.endswith("_rjs"): rjs_modules_to_rnjs.append(d.replace("_rjs", "")) diff --git a/yarn.lock b/yarn.lock index 119d13f38c96..25b196053f28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -357,6 +357,7 @@ __metadata: "@types/http-proxy": "npm:^1.17.4" "@types/ini": "npm:^4.0.0" "@types/jasmine": "npm:~5.1.0" + "@types/jasmine-reporters": "npm:^2" "@types/karma": "npm:^6.3.0" "@types/less": "npm:^3.0.3" "@types/loader-utils": "npm:^2.0.0" @@ -407,6 +408,7 @@ __metadata: istanbul-lib-instrument: "npm:6.0.3" jasmine: "npm:^5.0.0" jasmine-core: "npm:~5.5.0" + jasmine-reporters: "npm:^2.5.2" jasmine-spec-reporter: "npm:~7.0.0" jsonc-parser: "npm:3.3.1" karma: "npm:~6.4.0" @@ -4976,7 +4978,16 @@ __metadata: languageName: node linkType: hard -"@types/jasmine@npm:~5.1.0": +"@types/jasmine-reporters@npm:^2": + version: 2.5.3 + resolution: "@types/jasmine-reporters@npm:2.5.3" + dependencies: + "@types/jasmine": "npm:*" + checksum: 10c0/9e895e1b258bf59fbd7bb8c9079681ad48e1035c33c36e3ab0aa2034fd87e95abf71ef848996c21ca9ecd5a72ce2897cc26162fedf12e0ebaad9969f138a84a4 + languageName: node + linkType: hard + +"@types/jasmine@npm:*, @types/jasmine@npm:~5.1.0": version: 5.1.5 resolution: "@types/jasmine@npm:5.1.5" checksum: 10c0/904a2a6bfe7478478ec73d502708dc4b4cc46fa554c459cee3e0be01efda96fba7d26ef8bec2f246d9163cc517407b135acabcf6f076c11aa514ed9b79bc67e5 @@ -11913,7 +11924,7 @@ __metadata: languageName: node linkType: hard -"jasmine-reporters@npm:~2.5.0": +"jasmine-reporters@npm:^2.5.2, jasmine-reporters@npm:~2.5.0": version: 2.5.2 resolution: "jasmine-reporters@npm:2.5.2" dependencies: