@atlaspack/packager-js 2.25.11-dev-fix-sourcemaps-50acc1acf.0 → 2.25.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaspack/packager-js
 
+## 2.25.11
+
+### Patch Changes
+
+- Updated dependencies [[`c97de81`](https://github.com/atlassian-labs/atlaspack/commit/c97de81b0b4b866bef4396e9131f37ffd273258d)]:
+  - @atlaspack/rust@3.30.0
+  - @atlaspack/logger@2.14.56
+  - @atlaspack/source-map@3.3.8
+  - @atlaspack/utils@3.4.6
+  - @atlaspack/types@2.15.54
+  - @atlaspack/plugin@2.14.64
+
 ## 2.25.10
 
 ### Patch Changes

package/dist/ScopeHoistingPackager.js

@@ -37,7 +37,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScopeHoistingPackager = void 0;
-exports.appendHoistedValues = appendHoistedValues;
 const utils_1 = require("@atlaspack/utils");
 const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
@@ -58,25 +57,6 @@ const utils_2 = require("./utils");
 const REPLACEMENT_RE_CONDITIONAL = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require|importCond)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const BUILTINS = Object.keys(globals_1.default.builtin);
-/**
- * Joins filtered hoisted parcelRequire values into the bundle output,
- * returning the text to append and the number of newlines it adds.
- *
- * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
- * emitting a stray leading `\n` (which would over-count lineCount and
- * desynchronise the bundle source-map offset bookkeeping).
- *
- * Exported for direct unit testing of the lineCount bookkeeping.
- */
-function appendHoistedValues(values) {
-    if (values.length === 0) {
-        return { text: '', lineCount: 0 };
-    }
-    return {
-        text: '\n' + values.join('\n'),
-        lineCount: values.length,
-    };
-}
 const GLOBALS_BY_CONTEXT = {
     browser: new Set([...BUILTINS, ...Object.keys(globals_1.default.browser)]),
     'web-worker': new Set([...BUILTINS, ...Object.keys(globals_1.default.worker)]),
@@ -156,14 +136,10 @@ class ScopeHoistingPackager {
             this.seenHoistedRequires.clear();
             let [content, map, lines] = this.visitAsset(asset);
             if (sourceMap && map) {
-                this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
                 sourceMap.addSourceMap(map, lineCount);
             }
             else if (this.bundle.env.sourceMap) {
                 sourceMap = map;
-                if (sourceMap) {
-                    this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
-                }
             }
             res += content + '\n';
             lineCount += lines + 1;
@@ -264,7 +240,6 @@ class ScopeHoistingPackager {
             }
             res += (0, utils_2.replaceScriptDependencies)(this.bundleGraph, this.bundle, code, map, this.parcelRequireName);
             if (sourceMap && map) {
-                this.addAssetBoundaryMarker(sourceMap, mainEntry, lineCount);
                 // @ts-expect-error TS2339 - addSourceMap method exists but missing from @parcel/source-map type definitions
                 sourceMap.addSourceMap(map, lineCount);
             }
@@ -541,30 +516,6 @@ class ScopeHoistingPackager {
         let { code, map } = (0, nullthrows_1.default)(this.assetOutputs.get(asset));
         return this.buildAsset(asset, code, map);
     }
-    /**
-     * Insert a single "boundary marker" mapping at the start of the line where
-     * `asset`'s source map is about to be appended. Without this marker, source
-     * map consumers (and downstream optimizers such as swc that need to compose
-     * via nearest-neighbour lookups) will attribute the columns at the start of
-     * this asset's region to the *previous* asset's last mapping, because there
-     * is no mapping anchoring the start of the new asset. This is especially
-     * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
-     * from Relay) whose first mapping may be hundreds of columns into the line.
-     *
-     * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
-     * own map provides at the same generated position will override this one
-     * (last-write-wins inside `parcel_sourcemap`).
-     */
-    addAssetBoundaryMarker(sourceMap, asset, lineOffset) {
-        if (!sourceMap)
-            return;
-        let source = this.getAssetFilePath(asset);
-        sourceMap.addIndexedMapping({
-            generated: { line: lineOffset + 1, column: 0 },
-            original: { line: 1, column: 0 },
-            source,
-        });
-    }
     getAssetFilePath(asset) {
         return path_1.default.relative(this.options.projectRoot, asset.filePath);
     }
@@ -574,13 +525,6 @@ class ScopeHoistingPackager {
         let sourceMap = this.bundle.env.sourceMap && map
             ? new source_map_1.default(this.options.projectRoot, map)
             : null;
-        // Anchor the start of this asset's region with a boundary marker so the
-        // first columns of the asset don't fall back to a previous asset's
-        // mapping during downstream source-map composition. See the
-        // addAssetBoundaryMarker JSDoc for the full rationale.
-        if (sourceMap) {
-            this.addAssetBoundaryMarker(sourceMap, asset, 0);
-        }
         // If this asset is skipped, just add dependencies and not the asset's content.
         if (this.shouldSkipAsset(asset)) {
             let depCode = '';
@@ -614,7 +558,6 @@ class ScopeHoistingPackager {
                         let [code, map, lines] = this.visitAsset(resolved);
                         depCode += code + '\n';
                         if (sourceMap && map) {
-                            this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                             sourceMap.addSourceMap(map, lineCount);
                         }
                         lineCount += lines + 1;
@@ -713,13 +656,7 @@ class ScopeHoistingPackager {
                                 }
                                 else {
                                     if (shouldWrap) {
-                                        let visited = this.visitAsset(resolved);
-                                        depContent.push([
-                                            visited[0],
-                                            visited[1],
-                                            visited[2],
-                                            resolved,
-                                        ]);
+                                        depContent.push(this.visitAsset(resolved));
                                     }
                                     else {
                                         let [depCode, depMap, depLines] = this.visitAsset(resolved);
@@ -743,7 +680,6 @@ class ScopeHoistingPackager {
                                     sourceMap.offsetLines(lineCount + 1, lines);
                                 }
                                 if (map) {
-                                    this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                                     sourceMap.addSourceMap(map, lineCount);
                                 }
                             }
@@ -783,14 +719,11 @@ ${code}
                 code = `/* ${this.getAssetFilePath(asset)} */\n` + code;
                 lineCount += 1;
             }
-            for (let [depCode, map, lines, depAsset] of depContent) {
+            for (let [depCode, map, lines] of depContent) {
                 if (!depCode)
                     continue;
                 code += depCode + '\n';
                 if (sourceMap && map) {
-                    if (depAsset) {
-                        this.addAssetBoundaryMarker(sourceMap, depAsset, lineCount);
-                    }
                     sourceMap.addSourceMap(map, lineCount);
                 }
                 lineCount += lines + 1;
@@ -1156,13 +1089,8 @@ ${code}
                 for (let val of hoistedValues) {
                     this.seenHoistedRequires.add(val);
                 }
-                // Only emit the leading `\n` and bump the line count when we
-                // actually have values to write. Otherwise `res += '\n' + ''` would
-                // emit a stray blank line and the line count would over-count by
-                // `hoisted.size` (which includes the now-filtered entries).
-                let appended = appendHoistedValues(hoistedValues);
-                res += appended.text;
-                lineCount += appended.lineCount;
+                res += '\n' + hoistedValues.join('\n');
+                lineCount += hoisted.size;
             }
             else {
                 res += '\n' + [...hoisted.values()].join('\n');

package/lib/ScopeHoistingPackager.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ScopeHoistingPackager = void 0;
-exports.appendHoistedValues = appendHoistedValues;
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -81,29 +80,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const REPLACEMENT_RE_CONDITIONAL = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require|importCond)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const BUILTINS = Object.keys(_globals().default.builtin);
-
-/**
- * Joins filtered hoisted parcelRequire values into the bundle output,
- * returning the text to append and the number of newlines it adds.
- *
- * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
- * emitting a stray leading `\n` (which would over-count lineCount and
- * desynchronise the bundle source-map offset bookkeeping).
- *
- * Exported for direct unit testing of the lineCount bookkeeping.
- */
-function appendHoistedValues(values) {
-  if (values.length === 0) {
-    return {
-      text: '',
-      lineCount: 0
-    };
-  }
-  return {
-    text: '\n' + values.join('\n'),
-    lineCount: values.length
-  };
-}
 const GLOBALS_BY_CONTEXT = {
   browser: new Set([...BUILTINS, ...Object.keys(_globals().default.browser)]),
   'web-worker': new Set([...BUILTINS, ...Object.keys(_globals().default.worker)]),
@@ -171,13 +147,9 @@ class ScopeHoistingPackager {
       this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
       if (sourceMap && map) {
-        this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
-        if (sourceMap) {
-          this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
-        }
       }
       res += content + '\n';
       lineCount += lines + 1;
@@ -285,7 +257,6 @@ class ScopeHoistingPackager {
       }
       res += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle, code, map, this.parcelRequireName);
       if (sourceMap && map) {
-        this.addAssetBoundaryMarker(sourceMap, mainEntry, lineCount);
         // @ts-expect-error TS2339 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       }
@@ -542,36 +513,6 @@ class ScopeHoistingPackager {
     } = (0, _nullthrows().default)(this.assetOutputs.get(asset));
     return this.buildAsset(asset, code, map);
   }
-
-  /**
-   * Insert a single "boundary marker" mapping at the start of the line where
-   * `asset`'s source map is about to be appended. Without this marker, source
-   * map consumers (and downstream optimizers such as swc that need to compose
-   * via nearest-neighbour lookups) will attribute the columns at the start of
-   * this asset's region to the *previous* asset's last mapping, because there
-   * is no mapping anchoring the start of the new asset. This is especially
-   * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
-   * from Relay) whose first mapping may be hundreds of columns into the line.
-   *
-   * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
-   * own map provides at the same generated position will override this one
-   * (last-write-wins inside `parcel_sourcemap`).
-   */
-  addAssetBoundaryMarker(sourceMap, asset, lineOffset) {
-    if (!sourceMap) return;
-    let source = this.getAssetFilePath(asset);
-    sourceMap.addIndexedMapping({
-      generated: {
-        line: lineOffset + 1,
-        column: 0
-      },
-      original: {
-        line: 1,
-        column: 0
-      },
-      source
-    });
-  }
   getAssetFilePath(asset) {
     return _path().default.relative(this.options.projectRoot, asset.filePath);
   }
@@ -579,13 +520,6 @@ class ScopeHoistingPackager {
     let shouldWrap = this.wrappedAssets.has(asset);
     let deps = this.bundleGraph.getDependencies(asset);
     let sourceMap = this.bundle.env.sourceMap && map ? new (_sourceMap2().default)(this.options.projectRoot, map) : null;
-    // Anchor the start of this asset's region with a boundary marker so the
-    // first columns of the asset don't fall back to a previous asset's
-    // mapping during downstream source-map composition. See the
-    // addAssetBoundaryMarker JSDoc for the full rationale.
-    if (sourceMap) {
-      this.addAssetBoundaryMarker(sourceMap, asset, 0);
-    }
 
     // If this asset is skipped, just add dependencies and not the asset's content.
     if (this.shouldSkipAsset(asset)) {
@@ -619,7 +553,6 @@ class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
-              this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -714,8 +647,7 @@ class ScopeHoistingPackager {
                   }
                 } else {
                   if (shouldWrap) {
-                    let visited = this.visitAsset(resolved);
-                    depContent.push([visited[0], visited[1], visited[2], resolved]);
+                    depContent.push(this.visitAsset(resolved));
                   } else {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
                     res = depCode + '\n' + res;
@@ -739,7 +671,6 @@ class ScopeHoistingPackager {
                   sourceMap.offsetLines(lineCount + 1, lines);
                 }
                 if (map) {
-                  this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                   sourceMap.addSourceMap(map, lineCount);
                 }
               }
@@ -781,13 +712,10 @@ ${code}
         code = `/* ${this.getAssetFilePath(asset)} */\n` + code;
         lineCount += 1;
       }
-      for (let [depCode, map, lines, depAsset] of depContent) {
+      for (let [depCode, map, lines] of depContent) {
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          if (depAsset) {
-            this.addAssetBoundaryMarker(sourceMap, depAsset, lineCount);
-          }
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -1106,14 +1034,8 @@ ${code}
         for (let val of hoistedValues) {
           this.seenHoistedRequires.add(val);
         }
-
-        // Only emit the leading `\n` and bump the line count when we
-        // actually have values to write. Otherwise `res += '\n' + ''` would
-        // emit a stray blank line and the line count would over-count by
-        // `hoisted.size` (which includes the now-filtered entries).
-        let appended = appendHoistedValues(hoistedValues);
-        res += appended.text;
-        lineCount += appended.lineCount;
+        res += '\n' + hoistedValues.join('\n');
+        lineCount += hoisted.size;
       } else {
         res += '\n' + [...hoisted.values()].join('\n');
         lineCount += hoisted.size;

package/lib/types/ScopeHoistingPackager.d.ts

@@ -1,19 +1,5 @@
 import type { Asset, BundleGraph, Dependency, PluginOptions, NamedBundle, PluginLogger } from '@atlaspack/types';
 import SourceMap from '@atlaspack/source-map';
-/**
- * Joins filtered hoisted parcelRequire values into the bundle output,
- * returning the text to append and the number of newlines it adds.
- *
- * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
- * emitting a stray leading `\n` (which would over-count lineCount and
- * desynchronise the bundle source-map offset bookkeeping).
- *
- * Exported for direct unit testing of the lineCount bookkeeping.
- */
-export declare function appendHoistedValues(values: ReadonlyArray<string>): {
-    text: string;
-    lineCount: number;
-};
 export interface OutputFormat {
     buildBundlePrelude(): [string, number];
     buildBundlePostlude(): [string, number];
@@ -70,21 +56,6 @@ export declare class ScopeHoistingPackager {
     getTopLevelName(name: string): string;
     getPropertyAccess(obj: string, property: string): string;
     visitAsset(asset: Asset): [string, SourceMap | null | undefined, number];
-    /**
-     * Insert a single "boundary marker" mapping at the start of the line where
-     * `asset`'s source map is about to be appended. Without this marker, source
-     * map consumers (and downstream optimizers such as swc that need to compose
-     * via nearest-neighbour lookups) will attribute the columns at the start of
-     * this asset's region to the *previous* asset's last mapping, because there
-     * is no mapping anchoring the start of the new asset. This is especially
-     * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
-     * from Relay) whose first mapping may be hundreds of columns into the line.
-     *
-     * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
-     * own map provides at the same generated position will override this one
-     * (last-write-wins inside `parcel_sourcemap`).
-     */
-    addAssetBoundaryMarker(sourceMap: SourceMap, asset: Asset, lineOffset: number): void;
     getAssetFilePath(asset: Asset): string;
     buildAsset(asset: Asset, code: string, map?: Buffer | null): [string, SourceMap | null | undefined, number];
     buildReplacements(asset: Asset, deps: Array<Dependency>): [Map<string, Array<Dependency>>, Map<string, string>];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.25.11-dev-fix-sourcemaps-50acc1acf.0",
+  "version": "2.25.11",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,23 +16,20 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.5-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/feature-flags": "2.31.4-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/logger": "2.14.56-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/plugin": "2.14.64-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/rust": "3.29.3-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/source-map": "3.3.8-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/types": "2.15.54-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/utils": "3.4.6-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/diagnostic": "2.14.4",
+    "@atlaspack/feature-flags": "2.31.3",
+    "@atlaspack/logger": "2.14.56",
+    "@atlaspack/plugin": "2.14.64",
+    "@atlaspack/rust": "3.30.0",
+    "@atlaspack/source-map": "3.3.8",
+    "@atlaspack/types": "2.15.54",
+    "@atlaspack/utils": "3.4.6",
     "globals": "^15.15.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.7.1"
   },
   "type": "commonjs",
   "scripts": {
-    "test": "mocha",
-    "test-ci": "mocha",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  },
-  "gitHead": "50acc1acf31d5c8415a8154841a8ed09264e665a"
+  }
 }

package/src/ScopeHoistingPackager.ts

@@ -53,29 +53,6 @@ const REPLACEMENT_RE =
   /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 
 const BUILTINS = Object.keys(globals.builtin);
-
-/**
- * Joins filtered hoisted parcelRequire values into the bundle output,
- * returning the text to append and the number of newlines it adds.
- *
- * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
- * emitting a stray leading `\n` (which would over-count lineCount and
- * desynchronise the bundle source-map offset bookkeeping).
- *
- * Exported for direct unit testing of the lineCount bookkeeping.
- */
-export function appendHoistedValues(values: ReadonlyArray<string>): {
-  text: string;
-  lineCount: number;
-} {
-  if (values.length === 0) {
-    return {text: '', lineCount: 0};
-  }
-  return {
-    text: '\n' + values.join('\n'),
-    lineCount: values.length,
-  };
-}
 const GLOBALS_BY_CONTEXT = {
   browser: new Set([...BUILTINS, ...Object.keys(globals.browser)]),
   'web-worker': new Set([...BUILTINS, ...Object.keys(globals.worker)]),
@@ -214,13 +191,9 @@ export class ScopeHoistingPackager {
       let [content, map, lines] = this.visitAsset(asset);
 
       if (sourceMap && map) {
-        this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
-        if (sourceMap) {
-          this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
-        }
       }
 
       res += content + '\n';
@@ -361,7 +334,6 @@ export class ScopeHoistingPackager {
         this.parcelRequireName,
       );
       if (sourceMap && map) {
-        this.addAssetBoundaryMarker(sourceMap, mainEntry, lineCount);
         // @ts-expect-error TS2339 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       }
@@ -724,34 +696,6 @@ export class ScopeHoistingPackager {
     return this.buildAsset(asset, code, map);
   }
 
-  /**
-   * Insert a single "boundary marker" mapping at the start of the line where
-   * `asset`'s source map is about to be appended. Without this marker, source
-   * map consumers (and downstream optimizers such as swc that need to compose
-   * via nearest-neighbour lookups) will attribute the columns at the start of
-   * this asset's region to the *previous* asset's last mapping, because there
-   * is no mapping anchoring the start of the new asset. This is especially
-   * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
-   * from Relay) whose first mapping may be hundreds of columns into the line.
-   *
-   * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
-   * own map provides at the same generated position will override this one
-   * (last-write-wins inside `parcel_sourcemap`).
-   */
-  addAssetBoundaryMarker(
-    sourceMap: SourceMap,
-    asset: Asset,
-    lineOffset: number,
-  ): void {
-    if (!sourceMap) return;
-    let source = this.getAssetFilePath(asset);
-    sourceMap.addIndexedMapping({
-      generated: {line: lineOffset + 1, column: 0},
-      original: {line: 1, column: 0},
-      source,
-    });
-  }
-
   getAssetFilePath(asset: Asset): string {
     return path.relative(this.options.projectRoot, asset.filePath);
   }
@@ -768,13 +712,6 @@ export class ScopeHoistingPackager {
       this.bundle.env.sourceMap && map
         ? new SourceMap(this.options.projectRoot, map)
         : null;
-    // Anchor the start of this asset's region with a boundary marker so the
-    // first columns of the asset don't fall back to a previous asset's
-    // mapping during downstream source-map composition. See the
-    // addAssetBoundaryMarker JSDoc for the full rationale.
-    if (sourceMap) {
-      this.addAssetBoundaryMarker(sourceMap, asset, 0);
-    }
 
     // If this asset is skipped, just add dependencies and not the asset's content.
     if (this.shouldSkipAsset(asset)) {
@@ -814,7 +751,6 @@ export class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
-              this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -852,9 +788,7 @@ export class ScopeHoistingPackager {
     code += append;
 
     let lineCount = 0;
-    let depContent: Array<
-      [string, SourceMap | null | undefined, number, Asset?]
-    > = [];
+    let depContent: Array<[string, SourceMap | null | undefined, number]> = [];
     if (depMap.size === 0 && replacements.size === 0) {
       // If there are no dependencies or replacements, use a simple function to count the number of lines.
       lineCount = countLines(code) - 1;
@@ -943,13 +877,7 @@ export class ScopeHoistingPackager {
                     }
                   } else {
                     if (shouldWrap) {
-                      let visited = this.visitAsset(resolved);
-                      depContent.push([
-                        visited[0],
-                        visited[1],
-                        visited[2],
-                        resolved,
-                      ]);
+                      depContent.push(this.visitAsset(resolved));
                     } else {
                       let [depCode, depMap, depLines] =
                         this.visitAsset(resolved);
@@ -978,7 +906,6 @@ export class ScopeHoistingPackager {
                   }
 
                   if (map) {
-                    this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                     sourceMap.addSourceMap(map, lineCount);
                   }
                 }
@@ -1032,13 +959,10 @@ ${code}
         lineCount += 1;
       }
 
-      for (let [depCode, map, lines, depAsset] of depContent) {
+      for (let [depCode, map, lines] of depContent) {
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          if (depAsset) {
-            this.addAssetBoundaryMarker(sourceMap, depAsset, lineCount);
-          }
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -1529,13 +1453,8 @@ ${code}
           this.seenHoistedRequires.add(val);
         }
 
-        // Only emit the leading `\n` and bump the line count when we
-        // actually have values to write. Otherwise `res += '\n' + ''` would
-        // emit a stray blank line and the line count would over-count by
-        // `hoisted.size` (which includes the now-filtered entries).
-        let appended = appendHoistedValues(hoistedValues);
-        res += appended.text;
-        lineCount += appended.lineCount;
+        res += '\n' + hoistedValues.join('\n');
+        lineCount += hoisted.size;
       } else {
         res += '\n' + [...hoisted.values()].join('\n');
         lineCount += hoisted.size;