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 cd518f4c03fd..905c7d4ea0b7 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,7 @@ # 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=-203833057 -package.json=932622271 -pnpm-lock.yaml=769575451 +package.json=991206202 +pnpm-lock.yaml=-879930952 pnpm-workspace.yaml=1711114604 -yarn.lock=-1894567419 +yarn.lock=-629218650 diff --git a/WORKSPACE b/WORKSPACE index 8722eb1f4082..66884170bda9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -269,7 +269,7 @@ setup_dependencies_2() git_repository( name = "rules_angular", - commit = "e35da7371d02d0c8d165c518d532d66be7afb8a6", + commit = "c0d7927a33802db438c01d2ae8ad1884e6c363fd", remote = "https://github.com/devversion/rules_angular.git", ) diff --git a/package.json b/package.json index 357b7c286665..5322e03ff252 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "canonical-path": "1.0.0", "chalk": "^5.4.1", "chokidar": "^4.0.0", - "convert-source-map": "^1.5.1", + "convert-source-map": "^2.0.0", "d3": "^7.0.0", "diff": "^7.0.0", "domino": "https://github.com/angular/domino.git#8f228f8862540c6ccd14f76b5a1d9bb5458618af", diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts index 7a57b33c6bf6..c5e3ff807609 100644 --- a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts +++ b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts @@ -5,6 +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.dev/license */ +import {readFileSync} from 'node:fs'; +import {resolve} from 'node:path'; import {decode, encode, SourceMapMappings, SourceMapSegment} from '@jridgewell/sourcemap-codec'; import mapHelpers from 'convert-source-map'; @@ -14,9 +16,11 @@ import {RawSourceMap, SourceMapInfo} from './raw_source_map'; import {compareSegments, offsetSegment, SegmentMarker} from './segment_marker'; export function removeSourceMapComments(contents: string): string { - return mapHelpers - .removeMapFileComments(mapHelpers.removeComments(contents)) - .replace(/\n\n$/, '\n'); + // Cast to as any as typings are broken for this method. + return (mapHelpers.removeMapFileComments as any)( + mapHelpers.removeComments(contents), + (filename: string) => readFileSync(resolve('../my-dir', filename), 'utf-8'), + ).replace(/\n\n$/, '\n'); } export class SourceFile { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65d581a1bc27..718185554142 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -196,8 +196,8 @@ importers: specifier: ^4.0.0 version: 4.0.3 convert-source-map: - specifier: ^1.5.1 - version: 1.9.0 + specifier: ^2.0.0 + version: 2.0.0 d3: specifier: ^7.0.0 version: 7.9.0 diff --git a/yarn.lock b/yarn.lock index 92df26b6f869..cd22aa3ea23f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -465,7 +465,6 @@ "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#14ea8ca5b4adfb73a1f4ad531116cd448379a0a3": version "0.0.0-030487ad792aad6856c48b2d1e699b0d96e11a7b" - uid "14ea8ca5b4adfb73a1f4ad531116cd448379a0a3" resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#14ea8ca5b4adfb73a1f4ad531116cd448379a0a3" dependencies: "@google-cloud/spanner" "7.21.0" @@ -7372,7 +7371,7 @@ conventional-commits-parser@^6.0.0: dependencies: meow "^13.0.0" -convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==