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

package/lib/CJSOutputFormat.js

@@ -5,25 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CJSOutputFormat = void 0;
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-// 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'
-};
-
 class CJSOutputFormat {
   constructor(packager) {
-    _defineProperty(this, "packager", void 0);
-
     this.packager = packager;
   }
 
@@ -32,56 +15,13 @@ class CJSOutputFormat {
     let lines = 0;
 
     for (let [source, specifiers] of this.packager.externals) {
-      let properties = [];
-      let categories = new Set();
+      // CJS only supports the namespace symbol. This ensures that all accesses
+      // are live and the `this` binding is correct.
+      let namespace = specifiers.get('*');
 
-      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`;
+      if (namespace) {
+        res += `var ${namespace} = 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`;
-        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++;
@@ -96,43 +36,8 @@ class CJSOutputFormat {
     return [res, lines];
   }
 
-  generateDestructuringAssignment(specifiers, value, isIdentifier) {
-    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() {
-    return '';
+    return ['', 0];
   }
 
 }

package/lib/DevPackager.js

@@ -55,22 +55,14 @@ function _fs() {
   return data;
 }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _utils2 = require("./utils");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const PRELUDE = _fs().default.readFileSync(_path().default.join(__dirname, 'dev-prelude.js'), 'utf8').trim().replace(/;$/, '');
 
 class DevPackager {
   constructor(options, bundleGraph, bundle, parcelRequireName) {
-    _defineProperty(this, "options", void 0);
-
-    _defineProperty(this, "bundleGraph", void 0);
-
-    _defineProperty(this, "bundle", void 0);
-
-    _defineProperty(this, "parcelRequireName", void 0);
-
     this.options = options;
     this.bundleGraph = bundleGraph;
     this.bundle = bundle;
@@ -100,11 +92,12 @@ class DevPackager {
     let map = new (_sourceMap().default)(this.options.projectRoot);
     let prefix = this.getPrefix();
     let lineOffset = (0, _utils().countLines)(prefix);
+    let script = null;
     this.bundle.traverse(node => {
       let wrapped = first ? '' : ',';
 
       if (node.type === 'dependency') {
-        let resolved = this.bundleGraph.getDependencyResolution(node.value, this.bundle);
+        let resolved = this.bundleGraph.getResolvedAsset(node.value, this.bundle);
 
         if (resolved && resolved.type !== 'js') {
           // if this is a reference to another javascript asset, we should not include
@@ -118,15 +111,24 @@ class DevPackager {
 
       if (node.type === 'asset') {
         let asset = node.value;
-        (0, _assert().default)(asset.type === 'js', 'all assets in a js bundle must be js assets');
+        (0, _assert().default)(asset.type === 'js', '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);
+          let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
 
-          if (resolved) {
-            deps[dep.moduleSpecifier] = this.bundleGraph.getAssetPublicId(resolved);
+          if (this.bundleGraph.isDependencySkipped(dep)) {
+            deps[(0, _utils2.getSpecifier)(dep)] = false;
+          } else if (resolved) {
+            deps[(0, _utils2.getSpecifier)(dep)] = this.bundleGraph.getAssetPublicId(resolved);
           }
         }
 
@@ -158,7 +160,7 @@ 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 => {
@@ -169,7 +171,25 @@ class DevPackager {
       mainEntry = null;
     }
 
-    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) + ')' + '\n';
+    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) + ')' + '\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().default)(this.options.projectRoot, mapBuffer);
+      }
+
+      contents += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle, script.code, entryMap, this.parcelRequireName);
+
+      if (this.bundle.env.sourceMap && entryMap) {
+        map.addSourceMap(entryMap, lineOffset);
+      }
+    }
+
     return {
       contents,
       map
@@ -202,9 +222,7 @@ class DevPackager {
   }
 
   isEntry() {
-    var _this$bundle$getMainE;
-
-    return !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') || this.bundle.env.isIsolated() || !!((_this$bundle$getMainE = this.bundle.getMainEntry()) !== null && _this$bundle$getMainE !== void 0 && _this$bundle$getMainE.isIsolated);
+    return !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated';
   }
 
 }

package/lib/ESMOutputFormat.js

@@ -5,12 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ESMOutputFormat = void 0;
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class ESMOutputFormat {
   constructor(packager) {
-    _defineProperty(this, "packager", void 0);
-
     this.packager = packager;
   }
 
@@ -27,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;
@@ -82,17 +78,26 @@ class ESMOutputFormat {
 
   buildBundlePostlude() {
     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);
@@ -101,9 +106,10 @@ class ESMOutputFormat {
 
     if (exportSpecifiers.length > 0) {
       res += `\nexport {${exportSpecifiers.join(', ')}};`;
+      lines++;
     }
 
-    return res;
+    return [res, lines];
   }
 
 }

package/lib/GlobalOutputFormat.js

@@ -5,21 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GlobalOutputFormat = void 0;
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class GlobalOutputFormat {
   constructor(packager) {
-    _defineProperty(this, "packager", void 0);
-
     this.packager = packager;
   }
 
   buildBundlePrelude() {
-    return ['(function () {\n', 1];
+    let prelude = this.packager.bundle.env.supports('arrow-functions', true) ? '(() => {\n' : '(function () {\n';
+    return [prelude, 1];
   }
 
   buildBundlePostlude() {
-    return '})();';
+    return ['})();', 0];
   }
 
 }