@parcel/packager-js 2.14.2 → 2.14.4

package/lib/DevPackager.js

@@ -72,6 +72,7 @@ class DevPackager {
     let prefix = this.getPrefix();
     let lineOffset = (0, _utils().countLines)(prefix);
     let script = null;
+    let externals = new Set();
     let usedHelpers = 0;
     this.bundle.traverse(node => {
       let wrapped = first ? '' : ',';
@@ -111,6 +112,9 @@ class DevPackager {
           } else {
             // An external module - map placeholder to original specifier.
             deps[specifier] = dep.specifier;
+            if (this.bundle.env.outputFormat === 'esmodule') {
+              externals.add(dep.specifier);
+            }
           }
         }
 
@@ -178,7 +182,16 @@ class DevPackager {
       // Remove newlines to avoid messing up source maps
       prefix = prefix.replace('// INSERT_LOAD_HERE', load.replace(/\n/g, ''));
     }
-    let contents = prefix + '({' + assets + '},' + JSON.stringify(entries.map(asset => this.bundleGraph.getAssetPublicId(asset))) + ', ' + JSON.stringify(mainEntry ? this.bundleGraph.getAssetPublicId(mainEntry) : null) + ', ' + JSON.stringify(this.parcelRequireName);
+    let externalImports = '';
+    let externalMap = '{';
+    let e = 0;
+    for (let external of externals) {
+      let name = `__parcelExternal${e++}`;
+      externalImports += `import * as ${name} from ${JSON.stringify(external)};\n`;
+      externalMap += `${JSON.stringify(external)}: ${name},`;
+    }
+    externalMap += '}';
+    let contents = externalImports + prefix + '({' + assets + '},' + JSON.stringify(entries.map(asset => this.bundleGraph.getAssetPublicId(asset))) + ', ' + JSON.stringify(mainEntry ? this.bundleGraph.getAssetPublicId(mainEntry) : null) + ', ' + JSON.stringify(this.parcelRequireName) + ', ' + externalMap;
     if (usedHelpers & 1) {
       // Generate a relative path from this bundle to the root of the dist dir.
       let distDir = (0, _utils().relativePath)(_path().default.dirname(this.bundle.name), '');
@@ -205,6 +218,53 @@ class DevPackager {
     }
     contents += ')\n';
 
+    // Add ES module exports from the entry asset.
+    if (this.bundle.env.outputFormat === 'esmodule' && mainEntry && (this.bundle.env.isLibrary || !this.bundle.env.isBrowser())) {
+      let hasNamespace = mainEntry.symbols.hasExportSymbol('*');
+      let importedSymbols = new Map();
+      let exportedSymbols = new Map();
+      for (let {
+        exportAs,
+        symbol,
+        exportSymbol
+      } of this.bundleGraph.getExportedSymbols(mainEntry)) {
+        if (typeof symbol === 'string') {
+          if (hasNamespace && exportAs !== '*') {
+            continue;
+          }
+          if (exportAs === '*') {
+            exportAs = 'default';
+          }
+          let id = (0, _utils2.makeValidIdentifier)(exportSymbol);
+          if (id === 'default') {
+            id = '_default';
+          }
+          importedSymbols.set(exportSymbol, id);
+          exportedSymbols.set(exportAs, id);
+        }
+      }
+      contents += 'let {';
+      for (let [key, value] of importedSymbols) {
+        contents += (0, _utils2.isValidIdentifier)(key) ? key : JSON.stringify(key);
+        if (value !== key) {
+          contents += ': ';
+          contents += value;
+        }
+        contents += ', ';
+      }
+      contents += '} = ' + this.parcelRequireName + '(' + JSON.stringify(this.bundleGraph.getAssetPublicId(mainEntry)) + ');\n';
+      contents += 'export {';
+      for (let [exportAs, ident] of exportedSymbols) {
+        contents += ident;
+        if (exportAs !== ident) {
+          contents += ' as ';
+          contents += (0, _utils2.isValidIdentifier)(exportAs) ? exportAs : JSON.stringify(exportAs);
+        }
+        contents += ', ';
+      }
+      contents += '};\n';
+    }
+
     // The entry asset of a script bundle gets hoisted outside the bundle wrapper function
     // so that its variables become globals. We need to replace any require calls for
     // runtimes with a parcelRequire call.

package/lib/ScopeHoistingPackager.js

@@ -273,7 +273,7 @@ class ScopeHoistingPackager {
     return wrapped;
   }
   buildExportedSymbols() {
-    if (!this.bundle.env.isLibrary || this.bundle.env.outputFormat !== 'esmodule') {
+    if (!this.bundle.env.isLibrary && this.bundle.env.isBrowser() || this.bundle.env.outputFormat !== 'esmodule') {
       return;
     }
 

package/lib/dev-prelude.js

@@ -11,6 +11,7 @@
   entry,
   mainEntry,
   parcelRequireName,
+  externals,
   distDir,
   publicUrl,
   devServer
@@ -44,6 +45,9 @@
   function newRequire(name, jumped) {
     if (!cache[name]) {
       if (!modules[name]) {
+        if (externals[name]) {
+          return externals[name];
+        }
         // if we cannot find the module within our internal map or
         // cache jump to the current global require ie. the last bundle
         // that was added to the page.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.14.2",
+  "version": "2.14.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,17 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.14.2"
+    "parcel": "^2.14.4"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.14.2",
-    "@parcel/plugin": "2.14.2",
-    "@parcel/rust": "2.14.2",
+    "@parcel/diagnostic": "2.14.4",
+    "@parcel/plugin": "2.14.4",
+    "@parcel/rust": "2.14.4",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.14.2",
-    "@parcel/utils": "2.14.2",
+    "@parcel/types": "2.14.4",
+    "@parcel/utils": "2.14.4",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "5fc9ddce4557abd007442154cb1c42d55e5cf4fc"
+  "gitHead": "c09fee751b61e2f9d52164f88248b9c668614134"
 }

package/src/DevPackager.js

@@ -12,7 +12,12 @@ import SourceMap from '@parcel/source-map';
 import invariant from 'assert';
 import path from 'path';
 import fs from 'fs';
-import {replaceScriptDependencies, getSpecifier} from './utils';
+import {
+  replaceScriptDependencies,
+  getSpecifier,
+  makeValidIdentifier,
+  isValidIdentifier,
+} from './utils';
 import {helpers} from './helpers';
 
 const PRELUDE = fs
@@ -61,6 +66,7 @@ export class DevPackager {
     let prefix = this.getPrefix();
     let lineOffset = countLines(prefix);
     let script: ?{|code: string, mapBuffer: ?Buffer|} = null;
+    let externals = new Set();
 
     let usedHelpers = 0;
     this.bundle.traverse(node => {
@@ -116,6 +122,9 @@ export class DevPackager {
           } else {
             // An external module - map placeholder to original specifier.
             deps[specifier] = dep.specifier;
+            if (this.bundle.env.outputFormat === 'esmodule') {
+              externals.add(dep.specifier);
+            }
           }
         }
 
@@ -209,7 +218,20 @@ export class DevPackager {
       prefix = prefix.replace('// INSERT_LOAD_HERE', load.replace(/\n/g, ''));
     }
 
+    let externalImports = '';
+    let externalMap = '{';
+    let e = 0;
+    for (let external of externals) {
+      let name = `__parcelExternal${e++}`;
+      externalImports += `import * as ${name} from ${JSON.stringify(
+        external,
+      )};\n`;
+      externalMap += `${JSON.stringify(external)}: ${name},`;
+    }
+    externalMap += '}';
+
     let contents =
+      externalImports +
       prefix +
       '({' +
       assets +
@@ -222,7 +244,9 @@ export class DevPackager {
         mainEntry ? this.bundleGraph.getAssetPublicId(mainEntry) : null,
       ) +
       ', ' +
-      JSON.stringify(this.parcelRequireName);
+      JSON.stringify(this.parcelRequireName) +
+      ', ' +
+      externalMap;
 
     if (usedHelpers & 1) {
       // Generate a relative path from this bundle to the root of the dist dir.
@@ -258,6 +282,70 @@ export class DevPackager {
 
     contents += ')\n';
 
+    // Add ES module exports from the entry asset.
+    if (
+      this.bundle.env.outputFormat === 'esmodule' &&
+      mainEntry &&
+      (this.bundle.env.isLibrary || !this.bundle.env.isBrowser())
+    ) {
+      let hasNamespace = mainEntry.symbols.hasExportSymbol('*');
+      let importedSymbols = new Map();
+      let exportedSymbols = new Map();
+      for (let {
+        exportAs,
+        symbol,
+        exportSymbol,
+      } of this.bundleGraph.getExportedSymbols(mainEntry)) {
+        if (typeof symbol === 'string') {
+          if (hasNamespace && exportAs !== '*') {
+            continue;
+          }
+
+          if (exportAs === '*') {
+            exportAs = 'default';
+          }
+
+          let id = makeValidIdentifier(exportSymbol);
+          if (id === 'default') {
+            id = '_default';
+          }
+          importedSymbols.set(exportSymbol, id);
+          exportedSymbols.set(exportAs, id);
+        }
+      }
+
+      contents += 'let {';
+      for (let [key, value] of importedSymbols) {
+        contents += isValidIdentifier(key) ? key : JSON.stringify(key);
+        if (value !== key) {
+          contents += ': ';
+          contents += value;
+        }
+        contents += ', ';
+      }
+
+      contents +=
+        '} = ' +
+        this.parcelRequireName +
+        '(' +
+        JSON.stringify(this.bundleGraph.getAssetPublicId(mainEntry)) +
+        ');\n';
+      contents += 'export {';
+
+      for (let [exportAs, ident] of exportedSymbols) {
+        contents += ident;
+        if (exportAs !== ident) {
+          contents += ' as ';
+          contents += isValidIdentifier(exportAs)
+            ? exportAs
+            : JSON.stringify(exportAs);
+        }
+        contents += ', ';
+      }
+
+      contents += '};\n';
+    }
+
     // The entry asset of a script bundle gets hoisted outside the bundle wrapper function
     // so that its variables become globals. We need to replace any require calls for
     // runtimes with a parcelRequire call.

package/src/ScopeHoistingPackager.js

@@ -363,7 +363,7 @@ export class ScopeHoistingPackager {
 
   buildExportedSymbols() {
     if (
-      !this.bundle.env.isLibrary ||
+      (!this.bundle.env.isLibrary && this.bundle.env.isBrowser()) ||
       this.bundle.env.outputFormat !== 'esmodule'
     ) {
       return;

package/src/dev-prelude.js

@@ -11,6 +11,7 @@
   entry,
   mainEntry,
   parcelRequireName,
+  externals,
   distDir,
   publicUrl,
   devServer
@@ -44,6 +45,9 @@
   function newRequire(name, jumped) {
     if (!cache[name]) {
       if (!modules[name]) {
+        if (externals[name]) {
+          return externals[name];
+        }
         // if we cannot find the module within our internal map or
         // cache jump to the current global require ie. the last bundle
         // that was added to the page.