@parcel/packager-js 2.0.0-beta.3.1 → 2.0.0-nightly.1006

package/lib/dev-prelude.js

@@ -6,7 +6,7 @@
 // anything defined in a previous bundle is accessed via the
 // orig method which is the require for previous bundles
 
-(function(modules, entry, mainEntry, parcelRequireName, globalName) {
+(function (modules, entry, mainEntry, parcelRequireName, globalName) {
   /* eslint-disable no-undef */
   var globalObject =
     typeof globalThis !== 'undefined'
@@ -73,18 +73,20 @@
         localRequire,
         module,
         module.exports,
-        this,
+        this
       );
     }
 
     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;
     }
   }
 
@@ -99,9 +101,9 @@
   newRequire.modules = modules;
   newRequire.cache = cache;
   newRequire.parent = previousRequire;
-  newRequire.register = function(id, exports) {
+  newRequire.register = function (id, exports) {
     modules[id] = [
-      function(require, module) {
+      function (require, module) {
         module.exports = exports;
       },
       {},
@@ -109,7 +111,7 @@
   };
 
   Object.defineProperty(newRequire, 'root', {
-    get: function() {
+    get: function () {
       return globalObject[parcelRequireName];
     },
   });
@@ -131,7 +133,7 @@
 
       // RequireJS
     } else if (typeof define === 'function' && define.amd) {
-      define(function() {
+      define(function () {
         return mainExports;
       });
 

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 = {};
@@ -15,9 +15,9 @@ if (parcelRequire == null) {
       return $parcel$modules[id].exports;
     }
     if (id in $parcel$inits) {
-      let init = $parcel$inits[id];
+      var init = $parcel$inits[id];
       delete $parcel$inits[id];
-      let module = {id, exports: {}};
+      var module = {id: id, exports: {}};
       $parcel$modules[id] = module;
       init.call(module.exports, module, module.exports);
       return module.exports;
@@ -43,7 +43,7 @@ const helpers = {
 `,
   $parcel$exportWildcard: `function $parcel$exportWildcard(dest, source) {
   Object.keys(source).forEach(function(key) {
-    if (key === 'default' || key === '__esModule') {
+    if (key === 'default' || key === '__esModule' || dest.hasOwnProperty(key)) {
       return;
     }
 
@@ -51,7 +51,7 @@ const helpers = {
       enumerable: true,
       get: function get() {
         return source[key];
-      },
+      }
     });
   });
 

package/lib/index.js

@@ -25,63 +25,55 @@ function _utils() {
   return data;
 }
 
-function _path() {
-  const data = _interopRequireDefault(require("path"));
+function _hash() {
+  const data = require("@parcel/hash");
 
-  _path = function () {
+  _hash = function () {
     return data;
   };
 
   return data;
 }
 
-function _nullthrows() {
-  const data = _interopRequireDefault(require("nullthrows"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
 
-  _nullthrows = function () {
+  _path = function () {
     return data;
   };
 
   return data;
 }
 
-function _DevPackager() {
-  const data = require("./DevPackager");
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
 
-  _DevPackager = function () {
+  _nullthrows = function () {
     return data;
   };
 
   return data;
 }
 
-function _ScopeHoistingPackager() {
-  const data = require("./ScopeHoistingPackager");
+var _DevPackager = require("./DevPackager");
 
-  _ScopeHoistingPackager = function () {
-    return data;
-  };
-
-  return data;
-}
+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$config$name, _pkg$files;
+    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 (0, _utils().loadConfig)(options.inputFS, _path().default.join(options.entryRoot, 'index'), ['package.json'], options.projectRoot);
-    let name = (_pkg$config$name = pkg === null || pkg === void 0 ? void 0 : pkg.config.name) !== null && _pkg$config$name !== void 0 ? _pkg$config$name : '';
+    let pkg = await config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['package.json']);
+    let name = (_pkg$contents$name = pkg === null || pkg === void 0 ? void 0 : (_pkg$contents = pkg.contents) === null || _pkg$contents === void 0 ? void 0 : _pkg$contents.name) !== null && _pkg$contents$name !== void 0 ? _pkg$contents$name : '';
     return {
-      config: {
-        parcelRequireName: 'parcelRequire' + (0, _utils().md5FromString)(name).slice(-4)
-      },
-      files: (_pkg$files = pkg === null || pkg === void 0 ? void 0 : pkg.files) !== null && _pkg$files !== void 0 ? _pkg$files : []
+      parcelRequireName: 'parcelRequire' + (0, _hash().hashString)(name).slice(-4)
     };
   },
 
@@ -93,12 +85,42 @@ var _default = new (_plugin().Packager)({
     config,
     options
   }) {
-    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);
-    let {
-      contents,
-      map
-    } = await packager.package();
-    contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map));
+    // 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);
+      ({
+        contents,
+        map
+      } = await packager.package());
+    }
+
+    contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map)); // 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,
+        map
+      } = (0, _utils().replaceURLReferences)({
+        bundle,
+        bundleGraph,
+        contents,
+        map
+      }));
+    }
+
     return (0, _utils().replaceInlineReferences)({
       bundle,
       bundleGraph,

package/lib/utils.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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.
+function replaceScriptDependencies(bundleGraph, bundle, code, map, parcelRequireName) {
+  let entry = (0, _nullthrows().default)(bundle.getMainEntry());
+  let dependencies = bundleGraph.getDependencies(entry);
+  let lineCount = 0;
+  let offset = 0;
+  let columnStartIndex = 0;
+  code = code.replace(/\n|__parcel__require__\(['"](.*?)['"]\)/g, (m, s, i) => {
+    if (m === '\n') {
+      columnStartIndex = i + offset + 1;
+      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.0.0-beta.3.1",
+  "version": "2.0.0-nightly.1006+18b038d5",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,15 +17,16 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "2.0.0-nightly.1004+18b038d5"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.3.1",
-    "@parcel/plugin": "2.0.0-beta.3.1",
-    "@parcel/source-map": "2.0.0-rc.1.0",
-    "@parcel/utils": "2.0.0-beta.3.1",
+    "@parcel/diagnostic": "2.0.0-nightly.1006+18b038d5",
+    "@parcel/hash": "2.3.3-nightly.2629+18b038d5",
+    "@parcel/plugin": "2.0.0-nightly.1006+18b038d5",
+    "@parcel/source-map": "^2.0.0",
+    "@parcel/utils": "2.0.0-nightly.1006+18b038d5",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "gitHead": "18b038d57043965afb31077db1f46dadb11a6a78"
 }

package/src/.eslintrc.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@parcel/eslint-config",
+  "overrides": [
+    {
+      "files": ["dev-prelude.js"],
+      "parser": "espree",
+      "parserOptions": {
+        "ecmaVersion": 5,
+        "sourceType": "script"
+      }
+    }
+  ]
+}

package/src/CJSOutputFormat.js

@@ -4,19 +4,6 @@ import type {
   OutputFormat,
 } from './ScopeHoistingPackager';
 
-// List of engines that support object destructuring syntax
-const DESTRUCTURING_ENGINES = {
-  chrome: '51',
-  edge: '15',
-  firefox: '53',
-  safari: '10',
-  node: '6.5',
-  ios: '10',
-  samsung: '5',
-  opera: '38',
-  electron: '1.2',
-};
-
 export class CJSOutputFormat implements OutputFormat {
   packager: ScopeHoistingPackager;
 
@@ -29,70 +16,12 @@ export class CJSOutputFormat implements OutputFormat {
     let lines = 0;
 
     for (let [source, specifiers] of this.packager.externals) {
-      let properties = [];
-      let categories = new Set();
-      for (let [imported, symbol] of specifiers) {
-        if (imported === '*') {
-          categories.add('namespace');
-        } else if (imported === 'default') {
-          categories.add('default');
-        } else {
-          categories.add('named');
-          properties.push({
-            key: imported,
-            value: symbol,
-          });
-        }
-      }
-
-      let specifiersWildcard = specifiers.get('*');
-      let specifiersDefault = specifiers.get('default');
-
-      // Attempt to combine require calls as much as possible. Namespace, default, and named specifiers
-      // cannot be combined, so in the case where we have more than one type, assign the require() result
-      // to a variable first and then create additional variables for each specifier based on that.
-      // Otherwise, if just one category is imported, just assign and require all at once.
-      if (categories.size > 1) {
-        let name = specifiersWildcard || this.packager.getTopLevelName(source);
-        res += `var ${name} = require(${JSON.stringify(source)});\n`;
-        lines++;
-
-        if (specifiersDefault) {
-          res += `var ${specifiersDefault} = $parcel$interopDefault(${name});\n`;
-          lines++;
-          this.packager.usedHelpers.add('$parcel$interopDefault');
-        }
-
-        if (properties.length > 0) {
-          let [r, l] = this.generateDestructuringAssignment(
-            properties,
-            name,
-            true,
-          );
-
-          res += r;
-          lines += l;
-        }
-      } else if (specifiersDefault) {
-        res += `var ${specifiersDefault} = $parcel$interopDefault(require(${JSON.stringify(
-          source,
-        )}));\n`;
-        lines++;
-        this.packager.usedHelpers.add('$parcel$interopDefault');
-      } else if (specifiersWildcard) {
-        res += `var ${specifiersWildcard} = require(${JSON.stringify(
-          source,
-        )});\n`;
+      // CJS only supports the namespace symbol. This ensures that all accesses
+      // are live and the `this` binding is correct.
+      let namespace = specifiers.get('*');
+      if (namespace) {
+        res += `var ${namespace} = require(${JSON.stringify(source)});\n`;
         lines++;
-      } else if (properties.length > 0) {
-        let [r, l] = this.generateDestructuringAssignment(
-          properties,
-          `require(${JSON.stringify(source)})`,
-          false,
-        );
-
-        res += r;
-        lines += l;
       } else {
         res += `require(${JSON.stringify(source)});\n`;
         lines++;
@@ -107,48 +36,7 @@ export class CJSOutputFormat implements OutputFormat {
     return [res, lines];
   }
 
-  generateDestructuringAssignment(
-    specifiers: Array<{|key: string, value: string|}>,
-    value: string,
-    isIdentifier: boolean,
-  ): [string, number] {
-    let res = '';
-    let lines = 0;
-
-    // If destructuring is not supported, generate a series of variable declarations
-    // with member expressions for each property.
-    if (!this.packager.bundle.env.matchesEngines(DESTRUCTURING_ENGINES)) {
-      if (!isIdentifier && specifiers.length > 1) {
-        let name = this.packager.getTopLevelName('temp');
-        res += `var ${name} = ${value};\n`;
-        lines++;
-        value = name;
-      }
-
-      for (let specifier of specifiers) {
-        res += `var ${specifier.value} = ${value}.${specifier.key};\n`;
-        lines++;
-      }
-
-      return [res, lines];
-    }
-
-    let s = specifiers.map(specifier => {
-      let s = specifier.key;
-      if (specifier.value !== specifier.key) {
-        s += `: ${specifier.value}`;
-      }
-
-      return s;
-    });
-
-    res += `var {${s.join(', ')}} = ${value};\n`;
-    lines++;
-
-    return [res, lines];
-  }
-
-  buildBundlePostlude(): string {
-    return '';
+  buildBundlePostlude(): [string, number] {
+    return ['', 0];
   }
 }

package/src/DevPackager.js

@@ -6,6 +6,7 @@ import SourceMap from '@parcel/source-map';
 import invariant from 'assert';
 import path from 'path';
 import fs from 'fs';
+import {replaceScriptDependencies, getSpecifier} from './utils';
 
 const PRELUDE = fs
   .readFileSync(path.join(__dirname, 'dev-prelude.js'), 'utf8')
@@ -54,12 +55,13 @@ export class DevPackager {
 
     let prefix = this.getPrefix();
     let lineOffset = countLines(prefix);
+    let script: ?{|code: string, mapBuffer: ?Buffer|} = null;
 
     this.bundle.traverse(node => {
       let wrapped = first ? '' : ',';
 
       if (node.type === 'dependency') {
-        let resolved = this.bundleGraph.getDependencyResolution(
+        let resolved = this.bundleGraph.getResolvedAsset(
           node.value,
           this.bundle,
         );
@@ -82,17 +84,25 @@ export class DevPackager {
           'all assets in a js bundle must be js assets',
         );
 
+        // If this is the main entry of a script rather than a module, we need to hoist it
+        // outside the bundle wrapper function so that its variables are exposed as globals.
+        if (
+          this.bundle.env.sourceType === 'script' &&
+          asset === this.bundle.getMainEntry()
+        ) {
+          script = results[i++];
+          return;
+        }
+
         let deps = {};
         let dependencies = this.bundleGraph.getDependencies(asset);
         for (let dep of dependencies) {
-          let resolved = this.bundleGraph.getDependencyResolution(
-            dep,
-            this.bundle,
-          );
-          if (resolved) {
-            deps[dep.moduleSpecifier] = this.bundleGraph.getAssetPublicId(
-              resolved,
-            );
+          let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
+          if (this.bundleGraph.isDependencySkipped(dep)) {
+            deps[getSpecifier(dep)] = false;
+          } else if (resolved) {
+            deps[getSpecifier(dep)] =
+              this.bundleGraph.getAssetPublicId(resolved);
           }
         }
 
@@ -130,7 +140,10 @@ export class DevPackager {
 
     let entries = this.bundle.getEntryAssets();
     let mainEntry = this.bundle.getMainEntry();
-    if (!this.isEntry() && this.bundle.env.outputFormat === 'global') {
+    if (
+      (!this.isEntry() && this.bundle.env.outputFormat === 'global') ||
+      this.bundle.env.sourceType === 'script'
+    ) {
       // In async bundles we don't want the main entry to execute until we require it
       // as there might be dependencies in a sibling bundle that hasn't loaded yet.
       entries = entries.filter(a => a.id !== mainEntry?.id);
@@ -154,6 +167,27 @@ export class DevPackager {
       ')' +
       '\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.
+    if (this.bundle.env.sourceType === 'script' && script) {
+      let entryMap;
+      let mapBuffer = script.mapBuffer;
+      if (mapBuffer) {
+        entryMap = new SourceMap(this.options.projectRoot, mapBuffer);
+      }
+      contents += replaceScriptDependencies(
+        this.bundleGraph,
+        this.bundle,
+        script.code,
+        entryMap,
+        this.parcelRequireName,
+      );
+      if (this.bundle.env.sourceMap && entryMap) {
+        map.addSourceMap(entryMap, lineOffset);
+      }
+    }
+
     return {
       contents,
       map,
@@ -192,7 +226,7 @@ export class DevPackager {
     return (
       !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') ||
       this.bundle.env.isIsolated() ||
-      !!this.bundle.getMainEntry()?.isIsolated
+      this.bundle.bundleBehavior === 'isolated'
     );
   }
 }

package/src/ESMOutputFormat.js

@@ -70,14 +70,31 @@ export class ESMOutputFormat implements OutputFormat {
     return [res, lines];
   }
 
-  buildBundlePostlude(): string {
+  buildBundlePostlude(): [string, number] {
     let res = '';
+    let lines = 0;
     let exportSpecifiers = [];
-    for (let exported of this.packager.exportedSymbols.values()) {
-      for (let {exportAs, local} of exported) {
+    for (let {
+      asset,
+      exportSymbol,
+      local,
+      exportAs,
+    } of this.packager.exportedSymbols.values()) {
+      if (this.packager.wrappedAssets.has(asset.id)) {
+        let obj = `parcelRequire("${this.packager.bundleGraph.getAssetPublicId(
+          asset,
+        )}")`;
+        res += `\nvar ${local} = ${this.packager.getPropertyAccess(
+          obj,
+          exportSymbol,
+        )};`;
+        lines++;
+      }
+
+      for (let as of exportAs) {
         let specifier = local;
         if (exportAs !== local) {
-          specifier += ` as ${exportAs}`;
+          specifier += ` as ${as}`;
         }
 
         exportSpecifiers.push(specifier);
@@ -86,8 +103,9 @@ export class ESMOutputFormat implements OutputFormat {
 
     if (exportSpecifiers.length > 0) {
       res += `\nexport {${exportSpecifiers.join(', ')}};`;
+      lines++;
     }
 
-    return res;
+    return [res, lines];
   }
 }

package/src/GlobalOutputFormat.js

@@ -12,10 +12,13 @@ export class GlobalOutputFormat implements OutputFormat {
   }
 
   buildBundlePrelude(): [string, number] {
-    return ['(function () {\n', 1];
+    let prelude = this.packager.bundle.env.supports('arrow-functions', true)
+      ? '(() => {\n'
+      : '(function () {\n';
+    return [prelude, 1];
   }
 
-  buildBundlePostlude(): string {
-    return '})();';
+  buildBundlePostlude(): [string, number] {
+    return ['})();', 0];
   }
 }