From eda89cb9bc4146d2e62897f7e0b412e96370ff73 Mon Sep 17 00:00:00 2001 From: 10Derozan Date: Wed, 13 Dec 2023 10:11:03 +0800 Subject: [PATCH] fix(module-tools): upgrade remapping version to 2.2.1 (#5072) --- .changeset/tall-pugs-mix.md | 6 ++++++ packages/solutions/module-tools/package.json | 2 +- .../solutions/module-tools/src/utils/map.ts | 2 +- pnpm-lock.yaml | 18 +++--------------- .../module/fixtures/build/dts/tsconfig.json | 11 ++++------- .../__snapshots__/sourceMap.test.ts.snap | 6 +++--- 6 files changed, 18 insertions(+), 27 deletions(-) create mode 100644 .changeset/tall-pugs-mix.md diff --git a/.changeset/tall-pugs-mix.md b/.changeset/tall-pugs-mix.md new file mode 100644 index 000000000000..702c24b1a1c4 --- /dev/null +++ b/.changeset/tall-pugs-mix.md @@ -0,0 +1,6 @@ +--- +'@modern-js/module-tools': patch +--- + +chore(module-tools): upgrade remapping version to 2.2.1 +chore(module-tools): 更新 remapping 版本至 2.2.1 diff --git a/packages/solutions/module-tools/package.json b/packages/solutions/module-tools/package.json index de7adc2edfdc..92898cd15e25 100644 --- a/packages/solutions/module-tools/package.json +++ b/packages/solutions/module-tools/package.json @@ -55,7 +55,7 @@ "test:watch": "vitest dev" }, "dependencies": { - "@ampproject/remapping": "1.0.2", + "@ampproject/remapping": "^2.2.1", "@ast-grep/napi": "0.12.0", "@modern-js/core": "workspace:*", "@modern-js/new-action": "workspace:*", diff --git a/packages/solutions/module-tools/src/utils/map.ts b/packages/solutions/module-tools/src/utils/map.ts index b3b485e91829..1cc0db557aad 100644 --- a/packages/solutions/module-tools/src/utils/map.ts +++ b/packages/solutions/module-tools/src/utils/map.ts @@ -1,6 +1,6 @@ import convertSourceMap from 'convert-source-map'; import ampremapping from '@ampproject/remapping'; -import { RawSourceMap } from '@ampproject/remapping/dist/types/types'; +import type { RawSourceMap } from '@ampproject/remapping'; import type { SourceMap } from '../types'; interface Options { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b8a5243aa5a..e54e2544a412 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4624,8 +4624,8 @@ importers: packages/solutions/module-tools: dependencies: '@ampproject/remapping': - specifier: 1.0.2 - version: 1.0.2 + specifier: ^2.2.1 + version: 2.2.1 '@ast-grep/napi': specifier: 0.12.0 version: 0.12.0 @@ -8393,14 +8393,6 @@ packages: resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==} engines: {node: '>=10'} - /@ampproject/remapping@1.0.2: - resolution: {integrity: sha512-SncaVxs+E3EdoA9xJgHfWPxZfowAgeIsd71VpqCKP6KNKm6s7zSqqvUc70UpKUFsrV3dAmy6qxHoIj5NG+3DiA==} - engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/resolve-uri': 1.0.0 - sourcemap-codec: 1.4.8 - dev: false - /@ampproject/remapping@2.2.1: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} @@ -12612,11 +12604,6 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.19 - /@jridgewell/resolve-uri@1.0.0: - resolution: {integrity: sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==} - engines: {node: '>=6.0.0'} - dev: false - /@jridgewell/resolve-uri@3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} engines: {node: '>=6.0.0'} @@ -31648,6 +31635,7 @@ packages: /sourcemap-codec@1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} deprecated: Please use @jridgewell/sourcemap-codec instead + dev: true /space-separated-tokens@1.1.5: resolution: {integrity: sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==} diff --git a/tests/integration/module/fixtures/build/dts/tsconfig.json b/tests/integration/module/fixtures/build/dts/tsconfig.json index d5a38110cd0e..914b538ff2b5 100644 --- a/tests/integration/module/fixtures/build/dts/tsconfig.json +++ b/tests/integration/module/fixtures/build/dts/tsconfig.json @@ -3,20 +3,17 @@ "compilerOptions": { "baseUrl": "./", "paths": { - "@src/*": [ - "./src/*" - ] + "@src/*": ["./src/*"] }, "declaration": true, "declarationMap": true, + "emitDeclarationOnly": true, "outDir": "dist/bundleless/types" }, - "include": [ - "src" - ], + "include": ["src"], "references": [ { "path": "../dts-composite" } ] -} \ No newline at end of file +} diff --git a/tests/integration/module/fixtures/build/sourceMap/__snapshots__/sourceMap.test.ts.snap b/tests/integration/module/fixtures/build/sourceMap/__snapshots__/sourceMap.test.ts.snap index 5eb4e26c5458..c15328246503 100644 --- a/tests/integration/module/fixtures/build/sourceMap/__snapshots__/sourceMap.test.ts.snap +++ b/tests/integration/module/fixtures/build/sourceMap/__snapshots__/sourceMap.test.ts.snap @@ -2,7 +2,7 @@ exports[`sourcemap usage sourcemap is external 1`] = ` { - "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,IAAM,YAAY,CAAC,QAAQ,QAAQ,GAAG,MAAM,IAAI,GAAG;;;ADEnD,IAAM,QAAQ,SAAO,UAAU,UAAU,GAAG;", + "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,IAAM,YAAY,CAAC,QAAQ,QAAQ,GAAG,MAAM,IAAI,GAAG;;;ADEnD,IAAM,QAAQ,SAAO,UAAU,UAAU,GAAG", "names": [], "sources": [ "../../src/index.js", @@ -22,7 +22,7 @@ export const debug = str => addPrefix('DEBUG:', str); exports[`sourcemap usage sourcemap is true 1`] = ` { - "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,IAAM,YAAY,CAAC,QAAQ,QAAQ,GAAG,MAAM,IAAI,GAAG;;;ADEnD,IAAM,QAAQ,SAAO,UAAU,UAAU,GAAG;", + "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,IAAM,YAAY,CAAC,QAAQ,QAAQ,GAAG,MAAM,IAAI,GAAG;;;ADEnD,IAAM,QAAQ,SAAO,UAAU,UAAU,GAAG", "names": [], "sources": [ "../../src/index.js", @@ -42,7 +42,7 @@ export const debug = str => addPrefix('DEBUG:', str); exports[`sourcemap usage sourcemap with swc 1`] = ` { - "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAO,IAAMA,YAAY,CAACC,QAAQC,QAAQ,GAAGD,UAAUC;;;ADEhD,IAAMC,QAAQD,SAAOF,UAAU,UAAUE;", + "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAO,IAAMA,YAAY,CAACC,QAAQC,QAAQ,GAAGD,UAAUC;;;ADEhD,IAAMC,QAAQD,SAAOF,UAAU,UAAUE", "names": [ "addPrefix", "prefix",