Improve source map generation (#14967)

babel · Sep 29, 2022 · 4f4b450 · 4f4b450
1 parent e9b3ef1
commit 4f4b450
Show file tree

Hide file tree

Showing 91 changed files with 2,877 additions and 220 deletions.
diff --git a/...babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/out-files/lib/bar/bar.js b/...babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/out-files/lib/bar/bar.js
diff --git a/...ges/babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/out-files/lib/foo.js b/...ges/babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/out-files/lib/foo.js
diff --git a/...es/babel-cli/test/fixtures/babel/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map b/...es/babel-cli/test/fixtures/babel/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps/out-files/lib/foo.js.map b/packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps/out-files/lib/foo.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/bar/bar.js b/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/bar/bar.js
diff --git a/...ages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/bar/bar.js.map b/...ages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/bar/bar.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/foo.js b/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/foo.js
diff --git a/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/foo.js.map b/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-both/out-files/lib/foo.js.map
diff --git a/...cli/test/fixtures/babel/dir-sourcemap-config-inline-cli-true/out-files/lib/bar/bar.js.map b/...cli/test/fixtures/babel/dir-sourcemap-config-inline-cli-true/out-files/lib/bar/bar.js.map
diff --git a/...bel-cli/test/fixtures/babel/dir-sourcemap-config-inline-cli-true/out-files/lib/foo.js.map b/...bel-cli/test/fixtures/babel/dir-sourcemap-config-inline-cli-true/out-files/lib/foo.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-inline/out-files/lib/bar/bar.js b/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-inline/out-files/lib/bar/bar.js
diff --git a/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-inline/out-files/lib/foo.js b/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-inline/out-files/lib/foo.js
diff --git a/...ages/babel-cli/test/fixtures/babel/dir-sourcemap-config-true/out-files/lib/bar/bar.js.map b/...ages/babel-cli/test/fixtures/babel/dir-sourcemap-config-true/out-files/lib/bar/bar.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-true/out-files/lib/foo.js.map b/packages/babel-cli/test/fixtures/babel/dir-sourcemap-config-true/out-files/lib/foo.js.map
diff --git a/...bel-cli/test/fixtures/babel/filename --out-file --source-maps inline/out-files/script2.js b/...bel-cli/test/fixtures/babel/filename --out-file --source-maps inline/out-files/script2.js
diff --git a/...st/fixtures/babel/filename-sourcemap --out-file --source-maps inline/out-files/script2.js b/...st/fixtures/babel/filename-sourcemap --out-file --source-maps inline/out-files/script2.js
diff --git a/...el-cli/test/fixtures/babel/filenames --out-file --source-maps inline/out-files/script3.js b/...el-cli/test/fixtures/babel/filenames --out-file --source-maps inline/out-files/script3.js
diff --git a/...babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map b/...babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/filenames-sourcemap-config-both/out-files/script3.js b/packages/babel-cli/test/fixtures/babel/filenames-sourcemap-config-both/out-files/script3.js
diff --git a/...es/babel-cli/test/fixtures/babel/filenames-sourcemap-config-both/out-files/script3.js.map b/...es/babel-cli/test/fixtures/babel/filenames-sourcemap-config-both/out-files/script3.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/stdin --out-file --source-maps/out-files/test.js.map b/packages/babel-cli/test/fixtures/babel/stdin --out-file --source-maps/out-files/test.js.map
diff --git a/packages/babel-cli/test/fixtures/babel/stdin --source-maps inline/stdout.txt b/packages/babel-cli/test/fixtures/babel/stdin --source-maps inline/stdout.txt
@@ -3,6 +3,6 @@
 arr.map(function (x) {
   return x * x;
 });
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJhcnIiLCJtYXAiLCJ4Il0sInNvdXJjZXMiOlsic3RkaW4iXSwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiB4KTsiXSwibWFwcGluZ3MiOiI7O0FBQUFBLEdBQUcsQ0FBQ0MsR0FBSixDQUFRLFVBQUFDLENBQUM7RUFBQSxPQUFJQSxDQUFDLEdBQUdBLENBQVI7QUFBQSxDQUFUIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJhcnIiLCJtYXAiLCJ4Il0sInNvdXJjZXMiOlsic3RkaW4iXSwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiB4KTsiXSwibWFwcGluZ3MiOiI7O0FBQUFBLEdBQUcsQ0FBQ0MsR0FBRyxDQUFDLFVBQUFDLENBQUM7RUFBQSxPQUFJQSxDQUFDLEdBQUdBLENBQUM7QUFBQSxFQUFDIn0=
 
 //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Rkb3V0IiwibmFtZXMiOltdLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJtYXBwaW5ncyI6IiJ9
diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/arrow-function/source-map.json b/packages/babel-core/test/fixtures/transformation/source-maps/arrow-function/source-map.json
@@ -0,0 +1,14 @@
+{
+  "version": 3,
+  "names": [
+    "t",
+    "x"
+  ],
+  "sources": [
+    "source-maps/arrow-function/input.js"
+  ],
+  "sourcesContent": [
+    "var t = x => x * x;"
+  ],
+  "mappings": "AAAA,IAAIA,CAAC,GAAG,SAAJA,CAAC,CAAGC,CAAC;EAAA,OAAIA,CAAC,GAAGA,CAAC;AAAA"
+}
diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/class/source-map.json b/packages/babel-core/test/fixtures/transformation/source-maps/class/source-map.json
@@ -0,0 +1,16 @@
+{
+  "version": 3,
+  "names": [
+    "Test",
+    "Error",
+    "test",
+    "bar"
+  ],
+  "sources": [
+    "source-maps/class/input.js"
+  ],
+  "sourcesContent": [
+    "class Test {\n  get bar() {\n    throw new Error(\"wow\");\n  }\n}\n\nvar test = new Test;\ntest.bar;"
+  ],
+  "mappings": "IAAMA,IAAI;EAAA;;EAAA;IAAA;EAAA;;EAAA;IAAA;IAAA,KACR,YAAU;MACR,MAAM,IAAIC,KAAK,CAAC,KAAK,CAAC;IACxB;EAAC;EAAA;AAAA;;AAGH,IAAIC,IAAI,GAAG,IAAIF,IAAI;AACnBE,IAAI,CAACC,GAAG"
+}
diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/full/source-map.json b/packages/babel-core/test/fixtures/transformation/source-maps/full/source-map.json
@@ -11,5 +11,5 @@
   "sourcesContent": [
     "arr.map(x => x * x);"
   ],
-  "mappings": "AAAAA,GAAG,CAACC,GAAJ,CAAQ,UAAAC,CAAC;EAAA,OAAIA,CAAC,GAAGA,CAAR;AAAA,CAAT"
+  "mappings": "AAAAA,GAAG,CAACC,GAAG,CAAC,UAAAC,CAAC;EAAA,OAAIA,CAAC,GAAGA,CAAC;AAAA,EAAC"
 }
diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/inline/output.js b/packages/babel-core/test/fixtures/transformation/source-maps/inline/output.js
diff --git a/...el-core/test/fixtures/transformation/source-maps/input-source-map-complex/source-map.json b/...el-core/test/fixtures/transformation/source-maps/input-source-map-complex/source-map.json
@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAsFA;EACAA,kBADA;;EAEAC;IACA;MACAC;IADA;EAGA;;AANA,C",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAsFA;EACAA;;EACAC;IACA;MACAC;IACA;EACA;;AACA",
   "names": [
     "name",
     "data",

diff --git a/...re/test/fixtures/transformation/source-maps/input-source-map-complex/source-mappings.json b/...re/test/fixtures/transformation/source-maps/input-source-map-complex/source-mappings.json
@@ -55,7 +55,7 @@
       "column": 4
     },
     "original": {
-      "line": 90,
+      "line": 92,
       "column": 0
     }
   },

diff --git a/...l-core/test/fixtures/transformation/source-maps/input-source-map-external/source-map.json b/...l-core/test/fixtures/transformation/source-maps/input-source-map-external/source-map.json
@@ -1,7 +1,11 @@
 {
-  "mappings": "AAAA,UAAU,Y;SAAM;AAAC,CAAjB",
+  "version": 3,
+  "mappings": "AAAA,UAAU,Y;SAAM,C;CAAC",
   "names": [],
-  "sources": ["original.js"],
-  "sourcesContent": ["var foo = () => 4;"],
-  "version": 3
-}
+  "sources": [
+    "original.js"
+  ],
+  "sourcesContent": [
+    "var foo = () => 4;"
+  ]
+}
diff --git a/...ion/source-maps/input-source-map-multiple-output-sources-complete-replace/source-map.json b/...ion/source-maps/input-source-map-multiple-output-sources-complete-replace/source-map.json
@@ -1,15 +1,13 @@
 {
   "version": 3,
-  "mappings": "AAAC,KCAD;ACAA,K",
+  "mappings": "AAAC,KAAG;ACAJ,KAAG",
   "names": [],
   "sources": [
     "bar.js",
-    "input.tsx",
     "baz.js"
   ],
   "sourcesContent": [
     "<bar />",
-    "foo(1);\nfunction foo(bar: number): never {\n    throw new Error('Intentional.');\n}",
     "baz();"
   ]
 }
diff --git a/...tures/transformation/source-maps/input-source-map-multiple-output-sources/source-map.json b/...tures/transformation/source-maps/input-source-map-multiple-output-sources/source-map.json
@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "mappings": "AAAC,KCAD;;AACA,SAASA,GAAT,CAAaC,GAAb,EAAwB;EACpB,MAAM,IAAIC,KAAJ,CAAU,cAAV,CAAN;AACH",
+  "mappings": "AAAC,KAAG;;ACCJ,SAASA,GAAG,CAACC,GAAW;EACpB,MAAM,IAAIC,KAAK,CAAC,cAAc,CAAC;AACnC",
   "names": [
     "foo",
     "bar",

diff --git a/...e/test/fixtures/transformation/source-maps/input-source-map-same-location/source-map.json b/...e/test/fixtures/transformation/source-maps/input-source-map-same-location/source-map.json
@@ -1,7 +1,11 @@
 {
-  "mappings": "AAAA,UAAU,Y;SAAM;AAAC,CAAjB",
+  "version": 3,
+  "mappings": "AAAA,UAAU,Y;SAAM,C;CAAC",
   "names": [],
-  "sources": ["source-maps/input-source-map-same-location/input.js"],
-  "sourcesContent": ["var foo = () => 4;"],
-  "version": 3
-}
+  "sources": [
+    "source-maps/input-source-map-same-location/input.js"
+  ],
+  "sourcesContent": [
+    "var foo = () => 4;"
+  ]
+}
diff --git a/...ures/transformation/source-maps/input-source-map-sources-complete-replace/source-map.json b/...ures/transformation/source-maps/input-source-map-sources-complete-replace/source-map.json
@@ -1,13 +1,11 @@
 {
   "version": 3,
-  "mappings": "AAAC,KCAD",
+  "mappings": "AAAC,KAAG",
   "names": [],
   "sources": [
-    "test.js",
-    "input.tsx"
+    "test.js"
   ],
   "sourcesContent": [
-    "<bar />",
-    "foo(1);\nfunction foo(bar: number): never {\n    throw new Error('Intentional.');\n}"
+    "<bar />"
   ]
 }
diff --git a/...ages/babel-core/test/fixtures/transformation/source-maps/input-source-map/source-map.json b/...ages/babel-core/test/fixtures/transformation/source-maps/input-source-map/source-map.json
@@ -1,7 +1,11 @@
 {
-  "mappings": "AAAA,UAAU,Y;SAAM;AAAC,CAAjB",
+  "version": 3,
+  "mappings": "AAAA,UAAU,Y;SAAM,C;CAAC",
   "names": [],
-  "sources": ["original.js"],
-  "sourcesContent": ["var foo = () => 4;"],
-  "version": 3
-}
+  "sources": [
+    "original.js"
+  ],
+  "sourcesContent": [
+    "var foo = () => 4;"
+  ]
+}
diff --git a/...ore/test/fixtures/transformation/source-maps/interpreter-directive-prefix/source-map.json b/...ore/test/fixtures/transformation/source-maps/interpreter-directive-prefix/source-map.json
@@ -1,5 +1,5 @@
 {
-  "mappings": "AAAA;AAEAA,OAAO,CAACC,GAAR,CAAY,eAAZ",
+  "version": 3,
   "names": [
     "console",
     "log"
@@ -10,5 +10,5 @@
   "sourcesContent": [
     "#!env node\n\nconsole.log(\"Hello, world!\");"
   ],
-  "version": 3
-}
+  "mappings": "AAAA;AAEAA,OAAO,CAACC,GAAG,CAAC,eAAe,CAAC"
+}