From cf8c853523f93f87601ea5682aaef69dc8dc44c4 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Mon, 19 May 2025 08:28:35 +0000 Subject: [PATCH] build: remove `@types/diff` (#61447) The latest diff package includes the TS types. PR Close #61447 --- .../npm_translate_lock_MzA5NzUwNzMx | 6 +++--- adev/shared-docs/pipeline/guides/BUILD.bazel | 1 - package.json | 1 - packages/bazel/test/ng_package/BUILD.bazel | 4 +--- packages/core/schematics/utils/tsurge/BUILD.bazel | 1 - pnpm-lock.yaml | 7 ------- yarn.lock | 6 ------ 7 files changed, 4 insertions(+), 22 deletions(-) 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 2201af8078b..3c209f5eabf 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -2,10 +2,10 @@ # 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=-1406867100 -package.json=-793320858 +package.json=-115596762 packages/compiler-cli/package.json=571832290 packages/compiler/package.json=-426903429 -pnpm-lock.yaml=252365364 +pnpm-lock.yaml=1434682987 pnpm-workspace.yaml=353334404 tools/bazel/rules_angular_store/package.json=-239561259 -yarn.lock=2135122510 +yarn.lock=1406221091 diff --git a/adev/shared-docs/pipeline/guides/BUILD.bazel b/adev/shared-docs/pipeline/guides/BUILD.bazel index 6661db76b81..cab45392ace 100644 --- a/adev/shared-docs/pipeline/guides/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/BUILD.bazel @@ -15,7 +15,6 @@ ts_project( ], deps = [ "//:node_modules/@bazel/runfiles", - "//:node_modules/@types/diff", "//:node_modules/@types/jsdom", "//:node_modules/@types/node", "//:node_modules/diff", diff --git a/package.json b/package.json index 579e2b90e2f..fdfc7ec2573 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "@types/bluebird": "^3.5.27", "@types/chrome": "^0.0.322", "@types/convert-source-map": "^2.0.0", - "@types/diff": "^7.0.0", "@types/dom-navigation": "^1.0.5", "@types/hammerjs": "2.0.46", "@types/jasmine": "^5.0.0", diff --git a/packages/bazel/test/ng_package/BUILD.bazel b/packages/bazel/test/ng_package/BUILD.bazel index e3e56418354..204a6091004 100644 --- a/packages/bazel/test/ng_package/BUILD.bazel +++ b/packages/bazel/test/ng_package/BUILD.bazel @@ -68,7 +68,7 @@ ts_library( deps = [ "//packages:types", "@npm//@bazel/runfiles", - "@npm//@types/diff", + "@npm//diff", ], ) @@ -85,7 +85,6 @@ jasmine_node_test( # file is based on non-ivy output and therefore won't work for ngc and Ivy at the same time. # TODO: Update test to rely on Ivy partial compilation after View Engine's removal, update the # golden files as appropriate for the change in compilation. - deps = ["@npm//diff"], ) nodejs_binary( @@ -97,7 +96,6 @@ nodejs_binary( ":example_spec_lib", "//packages/bazel/test/ng_package/example:npm_package", "//packages/bazel/test/ng_package/example-with-ts-library:npm_package", - "@npm//diff", ], entry_point = ":example_package.spec.ts", templated_args = ["--accept"], diff --git a/packages/core/schematics/utils/tsurge/BUILD.bazel b/packages/core/schematics/utils/tsurge/BUILD.bazel index e905b28fa69..1c3c03601e3 100644 --- a/packages/core/schematics/utils/tsurge/BUILD.bazel +++ b/packages/core/schematics/utils/tsurge/BUILD.bazel @@ -23,7 +23,6 @@ ts_project( ], visibility = [":users"], deps = [ - "//:node_modules/@types/diff", "//:node_modules/@types/jasmine", "//:node_modules/chalk", "//:node_modules/diff", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0c96325e48a..77f9c9210b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -110,9 +110,6 @@ importers: '@types/convert-source-map': specifier: ^2.0.0 version: 2.0.3 - '@types/diff': - specifier: ^7.0.0 - version: 7.0.2 '@types/dom-navigation': specifier: ^1.0.5 version: 1.0.5 @@ -5604,10 +5601,6 @@ packages: '@types/d3-zoom': 3.0.8 dev: true - /@types/diff@7.0.2: - resolution: {integrity: sha512-JSWRMozjFKsGlEjiiKajUjIJVKuKdE3oVy2DNtK+fUo8q82nhFZ2CPQwicAIkXrofahDXrWJ7mjelvZphMS98Q==, tarball: https://registry.npmjs.org/@types/diff/-/diff-7.0.2.tgz} - dev: false - /@types/dom-navigation@1.0.5: resolution: {integrity: sha512-aM1Mr488jX62+6b9zdEtPHFnI7ILgvbII4BaBJMaqhhbDBupJJJ8+nXFVyQT1ptujOUAg6Sojkjk3j6rU73Bwg==, tarball: https://registry.npmjs.org/@types/dom-navigation/-/dom-navigation-1.0.5.tgz} dev: false diff --git a/yarn.lock b/yarn.lock index 50fc6a9345a..93ddb92145e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -468,7 +468,6 @@ "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#8f3889eedc8b9f55b266f129b9ada4ef1a453fe1": version "0.0.0-aef915fe9306251b2dc4edd3717ccb5d4fb5c75c" - uid "8f3889eedc8b9f55b266f129b9ada4ef1a453fe1" resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#8f3889eedc8b9f55b266f129b9ada4ef1a453fe1" dependencies: "@google-cloud/spanner" "7.21.0" @@ -4149,11 +4148,6 @@ "@types/d3-transition" "*" "@types/d3-zoom" "*" -"@types/diff@^7.0.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/diff/-/diff-7.0.2.tgz#d638edebf3c97aa4962b6f1164a7921ab3de9f83" - integrity sha512-JSWRMozjFKsGlEjiiKajUjIJVKuKdE3oVy2DNtK+fUo8q82nhFZ2CPQwicAIkXrofahDXrWJ7mjelvZphMS98Q== - "@types/dom-navigation@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/dom-navigation/-/dom-navigation-1.0.5.tgz#5fd6ed014d3ee66b53b0733b6c50994c105b542d"