@parcel/packager-js 2.8.4-nightly.0 → 2.9.1

package/lib/helpers.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.prelude = exports.helpers = void 0;
-
 const prelude = parcelRequireName => `var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -34,7 +33,6 @@ if (parcelRequire == null) {
   $parcel$global[${JSON.stringify(parcelRequireName)}] = parcelRequire;
 }
 `;
-
 exports.prelude = prelude;
 const helpers = {
   $parcel$export: `function $parcel$export(e, n, v, s) {

package/lib/index.js

@@ -4,70 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _plugin() {
   const data = require("@parcel/plugin");
-
   _plugin = function () {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@parcel/utils");
-
   _utils = function () {
     return data;
   };
-
   return data;
 }
-
 function _hash() {
   const data = require("@parcel/hash");
-
   _hash = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 var _DevPackager = require("./DevPackager");
-
 var _ScopeHoistingPackager = require("./ScopeHoistingPackager");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = new (_plugin().Packager)({
   async loadConfig({
     config,
     options
   }) {
     var _pkg$contents$name, _pkg$contents;
-
     // Generate a name for the global parcelRequire function that is unique to this project.
     // This allows multiple parcel builds to coexist on the same page.
     let pkg = await config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['package.json']);
@@ -76,7 +56,6 @@ var _default = new (_plugin().Packager)({
       parcelRequireName: 'parcelRequire' + (0, _hash().hashString)(name).slice(-4)
     };
   },
-
   async package({
     bundle,
     bundleGraph,
@@ -88,16 +67,13 @@ var _default = new (_plugin().Packager)({
     // If this is a non-module script, and there is only one asset with no dependencies,
     // then we don't need to package at all and can pass through the original code un-wrapped.
     let contents, map;
-
     if (bundle.env.sourceType === 'script') {
       let entries = bundle.getEntryAssets();
-
       if (entries.length === 1 && bundleGraph.getDependencies(entries[0]).length === 0) {
         contents = await entries[0].getCode();
         map = await entries[0].getMap();
       }
     }
-
     if (contents == null) {
       let packager = bundle.env.shouldScopeHoist ? new _ScopeHoistingPackager.ScopeHoistingPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName) : new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
       ({
@@ -105,10 +81,10 @@ var _default = new (_plugin().Packager)({
         map
       } = await packager.package());
     }
+    contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map));
 
-    contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map)); // For library builds, we need to replace URL references with their final resolved paths.
+    // For library builds, we need to replace URL references with their final resolved paths.
     // For non-library builds, this is handled in the JS runtime.
-
     if (bundle.env.isLibrary) {
       ({
         contents,
@@ -121,7 +97,6 @@ var _default = new (_plugin().Packager)({
         getReplacement: s => JSON.stringify(s).slice(1, -1)
       }));
     }
-
     return (0, _utils().replaceInlineReferences)({
       bundle,
       bundleGraph,
@@ -134,14 +109,10 @@ var _default = new (_plugin().Packager)({
       map
     });
   }
-
 });
-
 exports.default = _default;
-
 async function getSourceMapSuffix(getSourceMapReference, map) {
   let sourcemapReference = await getSourceMapReference(map);
-
   if (sourcemapReference != null) {
     return '//# sourceMappingURL=' + sourcemapReference + '\n';
   } else {

package/lib/utils.js

@@ -5,19 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSpecifier = getSpecifier;
 exports.replaceScriptDependencies = replaceScriptDependencies;
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // This replaces __parcel__require__ references left by the transformer with
 // parcelRequire calls of the resolved asset id. This lets runtimes work within
 // script bundles, which must be outside the bundle wrapper so their variables are global.
@@ -33,30 +28,24 @@ function replaceScriptDependencies(bundleGraph, bundle, code, map, parcelRequire
       lineCount++;
       return '\n';
     }
-
     let dep = (0, _nullthrows().default)(dependencies.find(d => getSpecifier(d) === s));
     let resolved = (0, _nullthrows().default)(bundleGraph.getResolvedAsset(dep, bundle));
     let publicId = bundleGraph.getAssetPublicId(resolved);
     let replacement = `${parcelRequireName}("${publicId}")`;
-
     if (map) {
       let lengthDifference = replacement.length - m.length;
-
       if (lengthDifference !== 0) {
         map.offsetColumns(lineCount + 1, i + offset - columnStartIndex + m.length, lengthDifference);
         offset += lengthDifference;
       }
     }
-
     return replacement;
   });
   return code;
 }
-
 function getSpecifier(dep) {
   if (typeof dep.meta.placeholder === 'string') {
     return dep.meta.placeholder;
   }
-
   return dep.specifier;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.8.4-nightly.0+7b79c6d",
+  "version": "2.9.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "2.8.4-nightly.0+7b79c6d"
+    "parcel": "^2.9.1"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.8.4-nightly.0+7b79c6d",
-    "@parcel/hash": "2.8.4-nightly.0+7b79c6d",
-    "@parcel/plugin": "2.8.4-nightly.0+7b79c6d",
+    "@parcel/diagnostic": "2.9.1",
+    "@parcel/hash": "2.9.1",
+    "@parcel/plugin": "2.9.1",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/utils": "2.8.4-nightly.0+7b79c6d",
+    "@parcel/utils": "2.9.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "7b79c6d69ffabef89810a8db61e9abdeb70d6990"
+  "gitHead": "5c5dc302b559f0b0d8c57b4d638aac521c879b70"
 }

package/src/ScopeHoistingPackager.js

@@ -18,7 +18,9 @@ import {
 import SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
 import invariant from 'assert';
-import ThrowableDiagnostic from '@parcel/diagnostic';
+import ThrowableDiagnostic, {
+  convertSourceLocationToHighlight,
+} from '@parcel/diagnostic';
 import globals from 'globals';
 import path from 'path';
 
@@ -682,12 +684,7 @@ ${code}
             {
               filePath: nullthrows(dep.sourcePath),
               codeHighlights: dep.loc
-                ? [
-                    {
-                      start: dep.loc.start,
-                      end: dep.loc.end,
-                    },
-                  ]
+                ? [convertSourceLocationToHighlight(dep.loc)]
                 : [],
             },
           ],