@parcel/packager-js 2.0.1 → 2.2.1

package/lib/DevPackager.js

@@ -125,7 +125,9 @@ class DevPackager {
         for (let dep of dependencies) {
           let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
 
-          if (resolved) {
+          if (this.bundleGraph.isDependencySkipped(dep)) {
+            deps[(0, _utils2.getSpecifier)(dep)] = false;
+          } else if (resolved) {
             deps[(0, _utils2.getSpecifier)(dep)] = this.bundleGraph.getAssetPublicId(resolved);
           }
         }

package/lib/ESMOutputFormat.js

@@ -23,8 +23,8 @@ class ESMOutputFormat {
         if (imported === 'default'
         /* || isCommonJS*/
         ) {
-            defaultSpecifier = symbol;
-          } else if (imported === '*') {
+          defaultSpecifier = symbol;
+        } else if (imported === '*') {
           namespaceSpecifier = `* as ${symbol}`;
         } else {
           let specifier = imported;

package/lib/ScopeHoistingPackager.js

@@ -124,7 +124,7 @@ class ScopeHoistingPackager {
   async package() {
     var _sourceMap;
 
-    await this.loadAssets();
+    let wrappedAssets = await this.loadAssets();
     this.buildExportedSymbols(); // If building a library, the target is actually another bundler rather
     // than the final output that could be loaded in a browser. So, loader
     // runtimes are excluded, and instead we add imports into the entry bundle
@@ -137,19 +137,13 @@ class ScopeHoistingPackager {
       for (let b of bundles) {
         this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), new Map());
       }
-    } // Add each asset that is directly connected to the bundle. Dependencies will be handled
-    // by replacing `import` statements in the code.
-
+    }
 
     let res = '';
     let lineCount = 0;
     let sourceMap = null;
-    this.bundle.traverseAssets((asset, _, actions) => {
-      if (this.seenAssets.has(asset.id)) {
-        actions.skipChildren();
-        return;
-      }
 
+    let processAsset = asset => {
       let [content, map, lines] = this.visitAsset(asset);
 
       if (sourceMap && map) {
@@ -160,6 +154,25 @@ class ScopeHoistingPackager {
 
       res += content + '\n';
       lineCount += lines + 1;
+    }; // Hoist wrapped asset to the top of the bundle to ensure that they are registered
+    // before they are used.
+
+
+    for (let asset of wrappedAssets) {
+      if (!this.seenAssets.has(asset.id)) {
+        processAsset(asset);
+      }
+    } // Add each asset that is directly connected to the bundle. Dependencies will be handled
+    // by replacing `import` statements in the code.
+
+
+    this.bundle.traverseAssets((asset, _, actions) => {
+      if (this.seenAssets.has(asset.id)) {
+        actions.skipChildren();
+        return;
+      }
+
+      processAsset(asset);
       actions.skipChildren();
     });
     let [prelude, preludeLines] = this.buildBundlePrelude();
@@ -235,6 +248,7 @@ class ScopeHoistingPackager {
     let queue = new (_utils().PromiseQueue)({
       maxConcurrent: 32
     });
+    let wrapped = [];
     this.bundle.traverseAssets((asset, shouldWrap) => {
       queue.add(async () => {
         let [code, map] = await Promise.all([asset.getCode(), this.bundle.env.sourceMap ? asset.getMapBuffer() : null]);
@@ -246,10 +260,12 @@ class ScopeHoistingPackager {
 
       if (shouldWrap || asset.meta.shouldWrap || this.isAsyncBundle || this.bundle.env.sourceType === 'script' || this.bundleGraph.isAssetReferenced(this.bundle, asset) || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')) {
         this.wrappedAssets.add(asset.id);
+        wrapped.push(asset);
         return true;
       }
     });
     this.assetOutputs = new Map(await queue.run());
+    return wrapped;
   }
 
   buildExportedSymbols() {

package/lib/dev-prelude.js

@@ -80,11 +80,13 @@
     return cache[name].exports;
 
     function localRequire(x) {
-      return newRequire(localRequire.resolve(x));
+      var res = localRequire.resolve(x);
+      return res === false ? {} : newRequire(res);
     }
 
     function resolve(x) {
-      return modules[name][1][x] || x;
+      var id = modules[name][1][x];
+      return id != null ? id : x;
     }
   }
 

package/lib/helpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.helpers = exports.prelude = void 0;
+exports.prelude = exports.helpers = void 0;
 
 const prelude = parcelRequireName => `var $parcel$modules = {};
 var $parcel$inits = {};

package/lib/utils.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.replaceScriptDependencies = replaceScriptDependencies;
 exports.getSpecifier = getSpecifier;
+exports.replaceScriptDependencies = replaceScriptDependencies;
 
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.1",
+  "version": "2.2.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.1"
+    "parcel": "^2.2.1"
   },
   "dependencies": {
-    "@parcel/diagnostic": "^2.0.1",
-    "@parcel/hash": "^2.0.1",
-    "@parcel/plugin": "^2.0.1",
+    "@parcel/diagnostic": "^2.2.1",
+    "@parcel/hash": "^2.2.1",
+    "@parcel/plugin": "^2.2.1",
     "@parcel/source-map": "^2.0.0",
-    "@parcel/utils": "^2.0.1",
+    "@parcel/utils": "^2.2.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "28b47e6bdca7de2a06b7cc39a4a0b1df89f3fe15"
+  "gitHead": "74fcc3fbe80cea993bff10e158df3d0f701973c7"
 }

package/src/DevPackager.js

@@ -98,7 +98,9 @@ export class DevPackager {
         let dependencies = this.bundleGraph.getDependencies(asset);
         for (let dep of dependencies) {
           let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
-          if (resolved) {
+          if (this.bundleGraph.isDependencySkipped(dep)) {
+            deps[getSpecifier(dep)] = false;
+          } else if (resolved) {
             deps[getSpecifier(dep)] =
               this.bundleGraph.getAssetPublicId(resolved);
           }

package/src/ScopeHoistingPackager.js

@@ -109,7 +109,7 @@ export class ScopeHoistingPackager {
   }
 
   async package(): Promise<{|contents: string, map: ?SourceMap|}> {
-    await this.loadAssets();
+    let wrappedAssets = await this.loadAssets();
     this.buildExportedSymbols();
 
     // If building a library, the target is actually another bundler rather
@@ -127,17 +127,10 @@ export class ScopeHoistingPackager {
       }
     }
 
-    // Add each asset that is directly connected to the bundle. Dependencies will be handled
-    // by replacing `import` statements in the code.
     let res = '';
     let lineCount = 0;
     let sourceMap = null;
-    this.bundle.traverseAssets((asset, _, actions) => {
-      if (this.seenAssets.has(asset.id)) {
-        actions.skipChildren();
-        return;
-      }
-
+    let processAsset = asset => {
       let [content, map, lines] = this.visitAsset(asset);
       if (sourceMap && map) {
         sourceMap.addSourceMap(map, lineCount);
@@ -147,6 +140,25 @@ export class ScopeHoistingPackager {
 
       res += content + '\n';
       lineCount += lines + 1;
+    };
+
+    // Hoist wrapped asset to the top of the bundle to ensure that they are registered
+    // before they are used.
+    for (let asset of wrappedAssets) {
+      if (!this.seenAssets.has(asset.id)) {
+        processAsset(asset);
+      }
+    }
+
+    // Add each asset that is directly connected to the bundle. Dependencies will be handled
+    // by replacing `import` statements in the code.
+    this.bundle.traverseAssets((asset, _, actions) => {
+      if (this.seenAssets.has(asset.id)) {
+        actions.skipChildren();
+        return;
+      }
+
+      processAsset(asset);
       actions.skipChildren();
     });
 
@@ -226,8 +238,9 @@ export class ScopeHoistingPackager {
     };
   }
 
-  async loadAssets() {
+  async loadAssets(): Promise<Array<Asset>> {
     let queue = new PromiseQueue({maxConcurrent: 32});
+    let wrapped = [];
     this.bundle.traverseAssets((asset, shouldWrap) => {
       queue.add(async () => {
         let [code, map] = await Promise.all([
@@ -248,11 +261,13 @@ export class ScopeHoistingPackager {
           .some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')
       ) {
         this.wrappedAssets.add(asset.id);
+        wrapped.push(asset);
         return true;
       }
     });
 
     this.assetOutputs = new Map(await queue.run());
+    return wrapped;
   }
 
   buildExportedSymbols() {

package/src/dev-prelude.js

@@ -80,11 +80,13 @@
     return cache[name].exports;
 
     function localRequire(x) {
-      return newRequire(localRequire.resolve(x));
+      var res = localRequire.resolve(x);
+      return res === false ? {} : newRequire(res);
     }
 
     function resolve(x) {
-      return modules[name][1][x] || x;
+      var id = modules[name][1][x];
+      return id != null ? id : x;
     }
   }