From 0622153f29c388b75303d0c71abe6d21ef8ba05a Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 29 Apr 2025 15:30:11 +0000 Subject: [PATCH] build: switch to `rules_angular` CLI rules Leverages our new rules for architect, contributed by Aspect alexeagle for serving material.angular.io. This allows us to drop the architect-cli logic (which is more or less experimental / internal), and fixes an issue where sometimes TS diagnostics were not properly reported with architect standalone. --- .github/workflows/docs-preview-build.yml | 2 +- WORKSPACE | 3 +- docs/BUILD.bazel | 12 +- docs/angular.json | 2 +- docs/defs.bzl | 116 +++++-------------- docs/karma.conf.js | 1 - docs/package.json | 4 +- docs/scenes/karma.conf.js | 1 - package.json | 4 - patches/@angular-devkit__architect-cli.patch | 13 --- pnpm-lock.yaml | 87 +++++--------- pnpm-workspace.yaml | 2 - 12 files changed, 77 insertions(+), 170 deletions(-) delete mode 100644 patches/@angular-devkit__architect-cli.patch diff --git a/.github/workflows/docs-preview-build.yml b/.github/workflows/docs-preview-build.yml index dcfaad42e6d4..24064070160d 100644 --- a/.github/workflows/docs-preview-build.yml +++ b/.github/workflows/docs-preview-build.yml @@ -35,4 +35,4 @@ jobs: workflow-artifact-name: 'docs-preview' pull-number: '${{github.event.pull_request.number}}' artifact-build-revision: '${{github.event.pull_request.head.sha}}' - deploy-directory: './dist/bin/docs/material-angular-io.production' + deploy-directory: './dist/bin/docs/dist' diff --git a/WORKSPACE b/WORKSPACE index fb28062dc705..db5a48f179dd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -88,7 +88,6 @@ npm_translate_lock( }, data = [ "//:package.json", - "//:patches/@angular-devkit__architect-cli.patch", "//:pnpm-workspace.yaml", "//integration:package.json", "//src/cdk:package.json", @@ -204,7 +203,7 @@ setup_dependencies_2() git_repository( name = "rules_angular", - commit = "0a54fca16350cab2b823908f1725aec175fcfeb2", + commit = "84a8039330a4accc86f0b53c4ef5ff745c3e1bbe", remote = "https://github.com/devversion/rules_angular.git", ) diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel index 6995fad73b1d..9d8d21041989 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_angular//src/architect:ng_config.bzl", "ng_config") load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library", "js_test") load("@npm//:defs.bzl", "npm_link_all_packages") @@ -12,9 +13,7 @@ npm_link_all_packages(name = "node_modules") copy_to_bin( name = "ng-base-config", srcs = [ - "angular.json", "package.json", - "tsconfig.json", ], ) @@ -26,6 +25,10 @@ copy_to_bin( ], ) +ng_config( + name = "config", +) + # The main application ng_app( name = "app", @@ -39,6 +42,11 @@ ng_app( ], ) +alias( + name = "serve", + actual = ":build.serve", +) + js_library( name = "audit_lib", srcs = [ diff --git a/docs/angular.json b/docs/angular.json index 031f7853a4f5..06d5462643e3 100644 --- a/docs/angular.json +++ b/docs/angular.json @@ -109,7 +109,7 @@ "builder": "@angular-devkit/build-angular:dev-server", "options": { "headers": { - // Keep in sync with `firebase.json` + "--NOTE--": "Keep in sync with `firebase.json`", "Content-Security-Policy": "upgrade-insecure-requests; default-src 'self'; font-src 'self' https://fonts.gstatic.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; img-src 'self' data: *; frame-src https://www.youtube.com; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.google-analytics.com https://www.googletagmanager.com; child-src 'self' blob:; connect-src 'self' https://material.angular.io https://*.google-analytics.com https://stats.g.doubleclick.net https://api.github.com https://www.googletagmanager.com;" }, "buildTarget": "material-angular-io:build" diff --git a/docs/defs.bzl b/docs/defs.bzl index 815a4876077b..3f75cbb07e2e 100644 --- a/docs/defs.bzl +++ b/docs/defs.bzl @@ -1,4 +1,5 @@ -load("@npm//:@angular-devkit/architect-cli/package_json.bzl", architect_cli = "bin") +load("@rules_angular//src/architect:ng_application.bzl", "ng_application") +load("@rules_angular//src/architect:ng_test.bzl", "ng_test") load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") # NOTE: @@ -9,9 +10,6 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") COMMON_CONFIG = [ "//docs:ng-base-config", - # The architect-cli invoking the build - "//docs:node_modules/@angular-devkit/architect-cli", - # Required for angular.json reference to '@angular/cli/lib/config/schema.json' "//docs:node_modules/@angular/cli", @@ -19,31 +17,14 @@ COMMON_CONFIG = [ "//docs:node_modules/@angular-devkit/build-angular", ] -# Standard dependencies common across libs/tests -# Only include the core Angular + Components/Material which are versioned together -NG_COMMON_DEPS = [ - # Angular libraries versioned together - "//docs:node_modules/@angular/animations", - "//docs:node_modules/@angular/common", - "//docs:node_modules/@angular/core", - "//docs:node_modules/@angular/forms", - "//docs:node_modules/@angular/localize", - "//docs:node_modules/@angular/router", - "//docs:node_modules/@angular/platform-browser", - "//docs:node_modules/@angular/platform-browser-dynamic", - - # Angular cdk+material libraries versioned together +# Project dependencies common across libs/tests +DEPS = [ "//docs:node_modules/@angular/cdk", "//docs:node_modules/@angular/cdk-experimental", "//docs:node_modules/@angular/material", "//docs:node_modules/@angular/material-experimental", "//docs:node_modules/@angular/material-moment-adapter", "//docs:node_modules/@angular/youtube-player", - - # Common libraries used throughout - "//docs:node_modules/rxjs", - "//docs:node_modules/tslib", - "//docs:node_modules/zone.js", ] # Common dependencies of Angular CLI applications @@ -51,24 +32,16 @@ APPLICATION_CONFIG = COMMON_CONFIG + [ ":ng-app-config", ] -# Common dependencies of Angular CLI test suites -TEST_CONFIG = COMMON_CONFIG + [ +TEST_DEPS = [ "@rules_browsers//src/browsers/chromium", "@rules_browsers//src/browsers/firefox", - "//docs:ng-base-test-config", - ":ng-test-config", - "//docs:node_modules/karma", - "//docs:node_modules/karma-chrome-launcher", "//docs:node_modules/karma-firefox-launcher", - "//docs:node_modules/karma-jasmine", - "//docs:node_modules/karma-jasmine-html-reporter", - "//docs:node_modules/karma-coverage-istanbul-reporter", ] -TEST_DEPS = [ - "//docs:node_modules/@types/jasmine", - "//docs:node_modules/@types/node", - "//docs:node_modules/@angular/compiler", - "//docs:node_modules/jasmine-core", + +# Common dependencies of Angular CLI test suites +TEST_CONFIG = COMMON_CONFIG + [ + "//docs:ng-base-test-config", + ":ng-test-config", ] # Common dependencies of Angular CLI e2e tests @@ -151,39 +124,23 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [], _architect_build( project_name, - srcs = srcs + deps + NG_COMMON_DEPS + APPLICATION_CONFIG, + srcs = srcs + deps + DEPS + APPLICATION_CONFIG, tags = tags + ["manual"], **kwargs ) _architect_build( project_name, - srcs = srcs + deps + NG_COMMON_DEPS + APPLICATION_CONFIG, + srcs = srcs + deps + DEPS + APPLICATION_CONFIG, configuration = "production", tags = tags, **kwargs ) - _architect_binary( - project_name, - "serve", - srcs = srcs + deps + NG_COMMON_DEPS + APPLICATION_CONFIG, - tags = tags + ["manual"], - **kwargs - ) - _architect_binary( - project_name, - "serve", - configuration = "production", - srcs = srcs + deps + NG_COMMON_DEPS + APPLICATION_CONFIG, - tags = tags + ["manual"], - **kwargs - ) - _architect_test( project_name, "test", args = ["--no-watch"], - srcs = srcs + test_srcs + deps + test_deps + NG_COMMON_DEPS + TEST_DEPS + TEST_CONFIG, + srcs = srcs + test_srcs + deps + test_deps + DEPS + TEST_DEPS + TEST_CONFIG, tags = tags, **kwargs ) @@ -193,7 +150,7 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [], # project_name, # "e2e", # size = "large", - # srcs = srcs + e2e_srcs + deps + e2e_deps + NG_COMMON_DEPS + E2E_DEPS + E2E_CONFIG, + # srcs = srcs + e2e_srcs + deps + e2e_deps + DEPS + E2E_DEPS + E2E_CONFIG, # args = [ # "--no-webdriver-update", # "--port=0", @@ -203,21 +160,19 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [], # ) def _architect_build(project_name, configuration = None, args = [], srcs = [], **kwargs): - output_dir = "%s%s" % (project_name, ".%s" % configuration if configuration else "") + args = [] - args = [ - "%s:build%s" % (project_name, ":%s" % configuration if configuration else ""), - "--output-path", - output_dir, - ] + args + if configuration != None: + args += ["--configuration", configuration] - architect_cli.architect( + ng_application( name = "%s%s" % ("build", ".%s" % configuration if configuration else ""), - chdir = native.package_name(), + ng_config = "//docs:config", + node_modules = "//docs:node_modules", + project_name = project_name, + args = args, # Needed for font inlining. execution_requirements = {"requires-network": "1"}, - args = args, - out_dirs = [output_dir], srcs = srcs, **kwargs ) @@ -227,18 +182,22 @@ def _architect_test(project_name, command, configuration = None, args = [], srcs if native.package_name() != "": to_root = "".join(["../" for _ in native.package_name().split("/")]) + args = [] + if configuration != None: + args += ["--configuration", configuration] + env = { "CHROME_BIN": to_root + "$(CHROME-HEADLESS-SHELL)", "CHROMEDRIVER_BIN": to_root + "$(CHROMEDRIVER)", } - architect_cli.architect_test( + ng_test( name = "%s%s" % (command, ".%s" % configuration if configuration else ""), - chdir = native.package_name(), - args = [ - "%s:%s%s" % (project_name, command, ":%s" % configuration if configuration else ""), - ] + args, - data = srcs, + args = args, + project_name = project_name, + ng_config = "//docs:config", + node_modules = "//docs:node_modules", + srcs = srcs, env = env, toolchains = [ "@rules_browsers//src/browsers/chromium:toolchain_alias", @@ -246,14 +205,3 @@ def _architect_test(project_name, command, configuration = None, args = [], srcs ], **kwargs ) - -def _architect_binary(project_name, command, configuration = None, args = [], srcs = [], **kwargs): - architect_cli.architect_binary( - name = "%s%s" % (command, ".%s" % configuration if configuration else ""), - chdir = native.package_name(), - args = [ - "%s:%s%s" % (project_name, command, ":%s" % configuration if configuration else ""), - ] + args, - data = srcs, - **kwargs - ) diff --git a/docs/karma.conf.js b/docs/karma.conf.js index 944a64069531..019fdb55e0c8 100644 --- a/docs/karma.conf.js +++ b/docs/karma.conf.js @@ -17,7 +17,6 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-firefox-launcher'), require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), require('@angular-devkit/build-angular/plugins/karma'), ], client: { diff --git a/docs/package.json b/docs/package.json index f14a0c420022..37fb0bb2c5ec 100644 --- a/docs/package.json +++ b/docs/package.json @@ -54,8 +54,6 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@angular-devkit/architect": "catalog:", - "@angular-devkit/architect-cli": "catalog:", "@angular-devkit/build-angular": "catalog:", "@angular/cli": "catalog:", "@angular/compiler-cli": "catalog:", @@ -68,7 +66,7 @@ "jasmine-spec-reporter": "7.0.0", "karma": "~6.4.4", "karma-chrome-launcher": "^3.1.1", - "karma-coverage-istanbul-reporter": "^3.0.3", + "karma-coverage": "~2.2.0", "karma-firefox-launcher": "^2.1.0", "karma-jasmine": "^4.0.1", "karma-jasmine-html-reporter": "^1.5.4", diff --git a/docs/scenes/karma.conf.js b/docs/scenes/karma.conf.js index fbad10db22c4..c885a859527f 100644 --- a/docs/scenes/karma.conf.js +++ b/docs/scenes/karma.conf.js @@ -21,7 +21,6 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-firefox-launcher'), require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), require('@angular-devkit/build-angular/plugins/karma'), ], client: { diff --git a/package.json b/package.json index c0b4badd4a59..d4dc68a53660 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "dependencies": { "@angular-devkit/core": "catalog:", "@angular-devkit/schematics": "catalog:", - "@angular-devkit/architect-cli": "catalog:", "@angular/animations": "catalog:", "@angular/common": "catalog:", "@angular/compiler": "catalog:", @@ -217,9 +216,6 @@ "@nginfra/angular-linking": "1.0.9" } } - }, - "patchedDependencies": { - "@angular-devkit/architect-cli@0.2000.0-next.5": "patches/@angular-devkit__architect-cli.patch" } } } diff --git a/patches/@angular-devkit__architect-cli.patch b/patches/@angular-devkit__architect-cli.patch deleted file mode 100644 index f8f9069a4db9..000000000000 --- a/patches/@angular-devkit__architect-cli.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/architect.js b/bin/architect.js -index 604bd506793d3e437247c0eadc8c67a300b1d5dd..fca7969e7f38990d8c1c49432c3f8b3b8a32e0af 100755 ---- a/bin/architect.js -+++ b/bin/architect.js -@@ -208,8 +208,6 @@ async function main(args) { - // Show usage of deprecated options - registry.useXDeprecatedProvider((msg) => logger.warn(msg)); - const { workspace } = await core_1.workspaces.readWorkspace(configFilePath, core_1.workspaces.createWorkspaceHost(new node_2.NodeJsSyncHost())); -- // Clear the console. -- process.stdout.write('\u001Bc'); - return await _executeTarget(logger, workspace, root, argv, registry); - } - main(process.argv.slice(2)).then((code) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b8489bf0ab11..19700eadf750 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,12 +6,6 @@ settings: catalogs: default: - '@angular-devkit/architect': - specifier: 0.2000.0-next.5 - version: 0.2000.0-next.5 - '@angular-devkit/architect-cli': - specifier: 0.2000.0-next.5 - version: 0.2000.0-next.5 '@angular-devkit/build-angular': specifier: 20.0.0-next.5 version: 20.0.0-next.5 @@ -72,18 +66,10 @@ overrides: packageExtensionsChecksum: f0e296dde7b086a53d76f809f69eba61 -patchedDependencies: - '@angular-devkit/architect-cli@0.2000.0-next.5': - hash: 6yxjg7dhfbtwlh5fb7noiwxhxa - path: patches/@angular-devkit__architect-cli.patch - importers: .: dependencies: - '@angular-devkit/architect-cli': - specifier: 'catalog:' - version: 0.2000.0-next.5(patch_hash=6yxjg7dhfbtwlh5fb7noiwxhxa)(chokidar@4.0.3) '@angular-devkit/core': specifier: 'catalog:' version: 20.0.0-next.5(chokidar@4.0.3) @@ -455,12 +441,6 @@ importers: specifier: ~0.15.0 version: 0.15.0 devDependencies: - '@angular-devkit/architect': - specifier: 'catalog:' - version: 0.2000.0-next.5(chokidar@4.0.3) - '@angular-devkit/architect-cli': - specifier: 'catalog:' - version: 0.2000.0-next.5(patch_hash=6yxjg7dhfbtwlh5fb7noiwxhxa)(chokidar@4.0.3) '@angular-devkit/build-angular': specifier: 'catalog:' version: 20.0.0-next.5(xomw6as5tm6jityr54yfpr3pvu) @@ -497,9 +477,9 @@ importers: karma-chrome-launcher: specifier: ^3.1.1 version: 3.2.0 - karma-coverage-istanbul-reporter: - specifier: ^3.0.3 - version: 3.0.3 + karma-coverage: + specifier: ~2.2.0 + version: 2.2.1 karma-firefox-launcher: specifier: ^2.1.0 version: 2.1.3 @@ -748,11 +728,6 @@ packages: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} - '@angular-devkit/architect-cli@0.2000.0-next.5': - resolution: {integrity: sha512-ssSc0mwccBQgevOMmG5Y8cYT3HiLMOo2oyBox74JarRgZ1mR470YThRTTyeRaGpIso24fuM2RCe9v7C3wLRzOg==} - engines: {node: ^20.11.1 || >=22.11.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - hasBin: true - '@angular-devkit/architect@0.2000.0-next.5': resolution: {integrity: sha512-6w0P3WcWbAZeIHJU7xBCufg609vyxokUWbQiN9cdqNX4AhcFZnOJ8uE0jCAWxJedu8FIhjvKXld6640IF8S3OA==} engines: {node: ^20.11.1 || >=22.11.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} @@ -5859,14 +5834,14 @@ packages: isstream@0.1.2: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} - istanbul-lib-coverage@2.0.5: - resolution: {integrity: sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==} - engines: {node: '>=6'} - istanbul-lib-coverage@3.2.2: resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} engines: {node: '>=8'} + istanbul-lib-instrument@5.2.1: + resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} + engines: {node: '>=8'} + istanbul-lib-instrument@6.0.3: resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==} engines: {node: '>=10'} @@ -5875,9 +5850,9 @@ packages: resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} engines: {node: '>=10'} - istanbul-lib-source-maps@3.0.6: - resolution: {integrity: sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==} - engines: {node: '>=6'} + istanbul-lib-source-maps@4.0.1: + resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} + engines: {node: '>=10'} istanbul-reports@3.1.7: resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==} @@ -6073,8 +6048,9 @@ packages: karma-chrome-launcher@3.2.0: resolution: {integrity: sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==} - karma-coverage-istanbul-reporter@3.0.3: - resolution: {integrity: sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==} + karma-coverage@2.2.1: + resolution: {integrity: sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==} + engines: {node: '>=10.0.0'} karma-firefox-launcher@2.1.3: resolution: {integrity: sha512-LMM2bseebLbYjODBOVt7TCPP9OI2vZIXCavIXhkO9m+10Uj5l7u/SKoeRmYx8FYHTVGZSpk6peX+3BMHC1WwNw==} @@ -9257,16 +9233,6 @@ snapshots: '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 - '@angular-devkit/architect-cli@0.2000.0-next.5(patch_hash=6yxjg7dhfbtwlh5fb7noiwxhxa)(chokidar@4.0.3)': - dependencies: - '@angular-devkit/architect': 0.2000.0-next.5(chokidar@4.0.3) - '@angular-devkit/core': 20.0.0-next.5(chokidar@4.0.3) - ansi-colors: 4.1.3 - progress: 2.0.3 - yargs-parser: 21.1.1 - transitivePeerDependencies: - - chokidar - '@angular-devkit/architect@0.2000.0-next.5(chokidar@4.0.3)': dependencies: '@angular-devkit/core': 20.0.0-next.5(chokidar@4.0.3) @@ -15185,10 +15151,18 @@ snapshots: isstream@0.1.2: {} - istanbul-lib-coverage@2.0.5: {} - istanbul-lib-coverage@3.2.2: {} + istanbul-lib-instrument@5.2.1: + dependencies: + '@babel/core': 7.26.10 + '@babel/parser': 7.27.0 + '@istanbuljs/schema': 0.1.3 + istanbul-lib-coverage: 3.2.2 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + istanbul-lib-instrument@6.0.3: dependencies: '@babel/core': 7.26.10 @@ -15205,12 +15179,10 @@ snapshots: make-dir: 4.0.0 supports-color: 7.2.0 - istanbul-lib-source-maps@3.0.6: + istanbul-lib-source-maps@4.0.1: dependencies: debug: 4.4.0(supports-color@10.0.0) - istanbul-lib-coverage: 2.0.5 - make-dir: 2.1.0 - rimraf: 2.7.1 + istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: - supports-color @@ -15457,11 +15429,12 @@ snapshots: dependencies: which: 1.3.1 - karma-coverage-istanbul-reporter@3.0.3: + karma-coverage@2.2.1: dependencies: istanbul-lib-coverage: 3.2.2 + istanbul-lib-instrument: 5.2.1 istanbul-lib-report: 3.0.1 - istanbul-lib-source-maps: 3.0.6 + istanbul-lib-source-maps: 4.0.1 istanbul-reports: 3.1.7 minimatch: 3.1.2 transitivePeerDependencies: @@ -15891,6 +15864,7 @@ snapshots: dependencies: pify: 4.0.1 semver: 5.7.2 + optional: true make-dir@3.1.0: dependencies: @@ -16761,7 +16735,8 @@ snapshots: pify@3.0.0: {} - pify@4.0.1: {} + pify@4.0.1: + optional: true pinkie-promise@2.0.1: dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index c8a041625bef..10fbf5c5974a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -17,8 +17,6 @@ packages: - src/youtube-player catalog: - '@angular-devkit/architect-cli': 0.2000.0-next.5 - '@angular-devkit/architect': 0.2000.0-next.5 '@angular-devkit/build-angular': 20.0.0-next.5 '@angular-devkit/core': 20.0.0-next.5 '@angular-devkit/schematics': 20.0.0-next.5