@babel/cli - npm Package Compare versions

Comparing version 7.17.6 to 7.17.10

lib/babel/file.js

@@ -28,12 +28,2 @@ "use strict";
 
-function _sourceMap() {
-  const data = require("source-map");
-
-  _sourceMap = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _slash() {
@@ -87,6 +77,3 @@ const data = require("slash");
     function buildResult(fileResults) {
-      const map = new (_sourceMap().SourceMapGenerator)({
-        file: cliOptions.sourceMapTarget || _path().basename(cliOptions.outFile || "") || "stdout",
-        sourceRoot: babelOptions.sourceRoot
-      });
+      const mapSections = [];
       let code = "";
@@ -97,33 +84,22 @@ let offset = 0;
         if (!result) continue;
+        mapSections.push({
+          offset: {
+            line: offset,
+            column: 0
+          },
+          map: result.map || emptyMap()
+        });
         code += result.code + "\n";
-
-        if (result.map) {
-          const consumer = new (_traceMapping().TraceMap)(result.map);
-          (0, _traceMapping().eachMapping)(consumer, mapping => {
-            map.addMapping({
-              generated: {
-                line: mapping.generatedLine + offset,
-                column: mapping.generatedColumn
-              },
-              source: mapping.source,
-              original: mapping.source == null ? null : {
-                line: mapping.originalLine,
-                column: mapping.originalColumn
-              }
-            });
-          });
-          const {
-            resolvedSources,
-            sourcesContent
-          } = consumer;
-          sourcesContent == null ? void 0 : sourcesContent.forEach((content, i) => {
-            if (content === null) return;
-            map.setSourceContent(resolvedSources[i], content);
-          });
-          offset = code.split("\n").length - 1;
-        }
+        offset += countNewlines(result.code) + 1;
       }
 
+      const map = new (_traceMapping().AnyMap)({
+        version: 3,
+        file: cliOptions.sourceMapTarget || _path().basename(cliOptions.outFile || "") || "stdout",
+        sections: mapSections
+      });
+      map.sourceRoot = babelOptions.sourceRoot;
+
       if (babelOptions.sourceMaps === "inline" || !cliOptions.outFile && babelOptions.sourceMaps) {
-        code += "\n" + _convertSourceMap().fromObject(map).toComment();
+        code += "\n" + _convertSourceMap().fromObject((0, _traceMapping().encodedMap)(map)).toComment();
       }
@@ -137,2 +113,22 @@
 
+    function countNewlines(code) {
+      let count = 0;
+      let index = -1;
+
+      while ((index = code.indexOf("\n", index + 1)) !== -1) {
+        count++;
+      }
+
+      return count;
+    }
+
+    function emptyMap() {
+      return {
+        version: 3,
+        names: [],
+        sources: [],
+        mappings: []
+      };
+    }
+
     function output(fileResults) {
@@ -150,3 +146,3 @@ const result = buildResult(fileResults);
 
-          _fs().writeFileSync(mapLoc, JSON.stringify(result.map));
+          _fs().writeFileSync(mapLoc, JSON.stringify((0, _traceMapping().encodedMap)(result.map)));
         }
@@ -153,0 +149,0 @@

lib/babel/options.js

@@ -126,3 +126,3 @@ "use strict";
 
-_commander().version("7.17.6" + " (@babel/core " + _core().version + ")");
+_commander().version("7.17.10" + " (@babel/core " + _core().version + ")");
 
@@ -129,0 +129,0 @@ _commander().usage("[options] <files ...>");

package.json

 {
   "name": "@babel/cli",
-  "version": "7.17.6",
+  "version": "7.17.10",
   "description": "Babel command line.",
@@ -27,3 +27,3 @@ "author": "The Babel Team (https://babel.dev/team)",
   "dependencies": {
-    "@jridgewell/trace-mapping": "^0.3.4",
+    "@jridgewell/trace-mapping": "^0.3.8",
     "commander": "^4.0.1",
@@ -34,4 +34,3 @@ "convert-source-map": "^1.1.0",
     "make-dir": "^2.1.0",
-    "slash": "^2.0.0",
-    "source-map": "^0.5.0"
+    "slash": "^2.0.0"
   },
@@ -46,4 +45,4 @@ "optionalDependencies": {
   "devDependencies": {
-    "@babel/core": "^7.17.5",
-    "@babel/helper-fixtures": "^7.17.0",
+    "@babel/core": "^7.17.10",
+    "@babel/helper-fixtures": "^7.17.10",
     "rimraf": "^3.0.0"
@@ -50,0 +49,0 @@ },

No alert changes

Improved metrics

Dependency count

10

decreased by-9.09%

Worsened metrics

Total package byte prevSize

36429

decreased by-1.1%

Lines of code

936

decreased by-0.53%

Dependency changes

• - Removedsource-map@^0.5.0

• - Removedsource-map@0.5.7(transitive)

• Updated@jridgewell/trace-mapping@^0.3.8