fix(module-tools): upgrade remapping version to 2.2.1 (#5072)

web-infra-dev · Dec 13, 2023 · eda89cb · eda89cb
1 parent 2c087e8
commit eda89cb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 27 deletions.
diff --git a/.changeset/tall-pugs-mix.md 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
@@ -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
@@ -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
diff --git 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"
     }
   ]
-}
+}
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
@@ -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",