@parcel/packager-js 2.0.0-beta.3 → 2.0.0-dev.1510

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,21 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.helpers = exports.prelude = void 0;
-
-const prelude = parcelRequireName => `var $parcel$modules = {};
+exports.prelude = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
+const prelude = parcelRequireName => `
+var $parcel$modules = {};
 var $parcel$inits = {};
 
 var parcelRequire = $parcel$global[${JSON.stringify(parcelRequireName)}];
+
 if (parcelRequire == null) {
   parcelRequire = function(id) {
     if (id in $parcel$modules) {
       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;
@@ -33,17 +34,49 @@ if (parcelRequire == null) {
 
   $parcel$global[${JSON.stringify(parcelRequireName)}] = parcelRequire;
 }
-`;
 
+var parcelRegister = parcelRequire.register;
+`;
 exports.prelude = prelude;
-const helpers = {
-  $parcel$export: `function $parcel$export(e, n, v, s) {
+const fnExpr = (env, params, body) => {
+  let block = `{ ${body.join(' ')} }`;
+  if (env.supports('arrow-functions')) {
+    return `(${params.join(', ')}) => ${block}`;
+  }
+  return `function (${params.join(', ')}) ${block}`;
+};
+exports.fnExpr = fnExpr;
+const bundleQueuePrelude = env => `
+if (!$parcel$global.lb) {
+  // Set of loaded bundles
+  $parcel$global.lb = new Set();
+  // Queue of bundles to execute once they're dep bundles are loaded
+  $parcel$global.bq = [];
+
+  // Register loaded bundle
+  $parcel$global.rlb = ${fnExpr(env, ['bundle'], ['$parcel$global.lb.add(bundle);', '$parcel$global.pq();'])}
+
+  // Run when ready
+  $parcel$global.rwr = ${fnExpr(env,
+// b = bundle public id
+// r = run function to execute the bundle entry
+// d = list of dependent bundles this bundle requires before executing
+['b', 'r', 'd'], ['$parcel$global.bq.push({b, r, d});', '$parcel$global.pq();'])}
+
+  // Process queue
+  $parcel$global.pq = ${fnExpr(env, [], [`var runnableEntry = $parcel$global.bq.find(${fnExpr(env, ['i'], [`return i.d.every(${fnExpr(env, ['dep'], ['return $parcel$global.lb.has(dep);'])});`])});`, 'if (runnableEntry) {', `$parcel$global.bq = $parcel$global.bq.filter(${fnExpr(env, ['i'], ['return i.b !== runnableEntry.b;'])});`, 'runnableEntry.r();', '$parcel$global.pq();', '}'])}
+}
+`;
+exports.bundleQueuePrelude = bundleQueuePrelude;
+const $parcel$export = `
+function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
-`,
-  $parcel$exportWildcard: `function $parcel$exportWildcard(dest, source) {
+`;
+const $parcel$exportWildcard = `
+function $parcel$exportWildcard(dest, source) {
   Object.keys(source).forEach(function(key) {
-    if (key === 'default' || key === '__esModule') {
+    if (key === 'default' || key === '__esModule' || Object.prototype.hasOwnProperty.call(dest, key)) {
       return;
     }
 
@@ -51,31 +84,46 @@ const helpers = {
       enumerable: true,
       get: function get() {
         return source[key];
-      },
+      }
     });
   });
 
   return dest;
 }
-`,
-  $parcel$interopDefault: `function $parcel$interopDefault(a) {
+`;
+const $parcel$interopDefault = `
+function $parcel$interopDefault(a) {
   return a && a.__esModule ? a.default : a;
 }
-`,
-  $parcel$global: `var $parcel$global =
-typeof globalThis !== 'undefined'
-  ? globalThis
-  : typeof self !== 'undefined'
-  ? self
-  : typeof window !== 'undefined'
-  ? window
-  : typeof global !== 'undefined'
-  ? global
-  : {};
-`,
-  $parcel$defineInteropFlag: `function $parcel$defineInteropFlag(a) {
+`;
+const $parcel$global = env => {
+  if (env.supports('global-this')) {
+    return `
+      var $parcel$global = globalThis;
+    `;
+  }
+  return `
+      var $parcel$global =
+        typeof globalThis !== 'undefined'
+          ? globalThis
+          : typeof self !== 'undefined'
+          ? self
+          : typeof window !== 'undefined'
+          ? window
+          : typeof global !== 'undefined'
+          ? global
+          : {};
+  `;
+};
+const $parcel$defineInteropFlag = `
+function $parcel$defineInteropFlag(a) {
   Object.defineProperty(a, '__esModule', {value: true, configurable: true});
 }
-`
-};
-exports.helpers = helpers;
+`;
+const helpers = exports.helpers = {
+  $parcel$export,
+  $parcel$exportWildcard,
+  $parcel$interopDefault,
+  $parcel$global,
+  $parcel$defineInteropFlag
+};

package/lib/index.js

@@ -4,87 +4,84 @@ 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 _path() {
-  const data = _interopRequireDefault(require("path"));
-
-  _path = function () {
+function _diagnostic() {
+  const data = require("@parcel/diagnostic");
+  _diagnostic = function () {
     return data;
   };
-
   return data;
 }
-
-function _nullthrows() {
-  const data = _interopRequireDefault(require("nullthrows"));
-
-  _nullthrows = function () {
+function _rust() {
+  const data = require("@parcel/rust");
+  _rust = function () {
     return data;
   };
-
   return data;
 }
-
-function _DevPackager() {
-  const data = require("./DevPackager");
-
-  _DevPackager = function () {
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
     return data;
   };
-
   return data;
 }
-
-function _ScopeHoistingPackager() {
-  const data = require("./ScopeHoistingPackager");
-
-  _ScopeHoistingPackager = function () {
+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)({
+const CONFIG_SCHEMA = {
+  type: 'object',
+  properties: {
+    unstable_asyncBundleRuntime: {
+      type: 'boolean'
+    }
+  },
+  additionalProperties: false
+};
+var _default = exports.default = new (_plugin().Packager)({
   async loadConfig({
+    config,
     options
   }) {
-    var _pkg$config$name, _pkg$files;
-
+    var _pkg$contents$name, _pkg$contents, _pkg$contents$package;
     // 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 packageKey = '@parcel/packager-js';
+    if (pkg !== null && pkg !== void 0 && pkg.contents[packageKey]) {
+      _utils().validateSchema.diagnostic(CONFIG_SCHEMA, {
+        data: pkg === null || pkg === void 0 ? void 0 : pkg.contents[packageKey],
+        source: await options.inputFS.readFile(pkg.filePath, 'utf8'),
+        filePath: pkg.filePath,
+        prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)(packageKey)}`
+      }, packageKey, `Invalid config for ${packageKey}`);
+    }
+    let name = (_pkg$contents$name = pkg === null || pkg === 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, _rust().hashString)(name).slice(-4),
+      unstable_asyncBundleRuntime: Boolean(pkg === null || pkg === void 0 || (_pkg$contents$package = pkg.contents[packageKey]) === null || _pkg$contents$package === void 0 ? void 0 : _pkg$contents$package.unstable_asyncBundleRuntime)
     };
   },
-
   async package({
     bundle,
     bundleGraph,
@@ -93,12 +90,39 @@ 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();
+    // 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, (0, _nullthrows().default)(config).unstable_asyncBundleRuntime) : 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,
+        getReplacement: s => JSON.stringify(s).slice(1, -1)
+      }));
+    }
     return (0, _utils().replaceInlineReferences)({
       bundle,
       bundleGraph,
@@ -111,14 +135,9 @@ 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

@@ -0,0 +1,51 @@
+"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",
+  "version": "2.0.0-dev.1510+a9bb85adf",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,15 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "^2.0.0-dev.1508+a9bb85adf"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.3",
-    "@parcel/plugin": "2.0.0-beta.3",
-    "@parcel/source-map": "2.0.0-rc.1.0",
-    "@parcel/utils": "2.0.0-beta.3",
+    "@parcel/diagnostic": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/plugin": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/rust": "2.11.1-dev.3133+a9bb85adf",
+    "@parcel/source-map": "^2.1.1",
+    "@parcel/types": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/utils": "2.0.0-dev.1510+a9bb85adf",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "bf03f018093f8c7ca4c3a544524e15065a637b3b"
+  "gitHead": "a9bb85adf8f3b38631e178b3aacaa30c78696e36"
 }

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];
   }
 }