@parcel/packager-js 2.0.0-canary.1543 → 2.0.0-dev.1425

package/lib/ScopeHoistingPackager.js

@@ -520,7 +520,7 @@ ${code}
     let replacements = new Map();
     for (let dep of deps) {
       let specifierType = dep.specifierType === 'esm' ? `:${dep.specifierType}` : '';
-      depMap.get(`${assetId}:${(0, _utils2.getSpecifier)(dep)}${!dep.meta.placeholder ? specifierType : ''}`).push(dep);
+      depMap.get(`${assetId}:${(0, _utils2.getSpecifier)(dep)}${dep.meta.isESM ? specifierType : ''}`).push(dep);
       let asyncResolution = this.bundleGraph.resolveAsyncDependency(dep, this.bundle);
       let resolved = (asyncResolution === null || asyncResolution === void 0 ? void 0 : asyncResolution.type) === 'asset' ?
       // Prefer the underlying asset over a runtime to load it. It will
@@ -732,7 +732,7 @@ ${code}
 
     // If this is an ESM default import of a CJS module with a `default` symbol,
     // and no __esModule flag, we need to resolve to the namespace instead.
-    let isDefaultInterop = exportSymbol === 'default' && staticExports && !isWrapped && ((dep === null || dep === void 0 ? void 0 : dep.meta.kind) === 'Import' || (dep === null || dep === void 0 ? void 0 : dep.meta.kind) === 'Export') && resolvedAsset.symbols.hasExportSymbol('*') && resolvedAsset.symbols.hasExportSymbol('default') && !resolvedAsset.symbols.hasExportSymbol('__esModule');
+    let isDefaultInterop = exportSymbol === 'default' && staticExports && !isWrapped && (dep === null || dep === void 0 ? void 0 : dep.meta.isESM) && resolvedAsset.symbols.hasExportSymbol('*') && resolvedAsset.symbols.hasExportSymbol('default') && !resolvedAsset.symbols.hasExportSymbol('__esModule');
 
     // Find the namespace object for the resolved module. If wrapped and this
     // is an inline require (not top-level), use a parcelRequire call, otherwise
@@ -760,12 +760,12 @@ ${code}
         return obj;
       }
     } else if ((!staticExports || isWrapped || !symbol || isExternalCommonJS) && resolvedAsset !== parentAsset) {
+      var _dep$meta;
       // If the resolved asset is wrapped or has non-static exports,
       // we need to use a member access off the namespace object rather
       // than a direct reference. If importing default from a CJS module,
       // use a helper to check the __esModule flag at runtime.
-      let kind = dep === null || dep === void 0 ? void 0 : dep.meta.kind;
-      if ((!dep || kind === 'Import' || kind === 'Export') && exportSymbol === 'default' && resolvedAsset.symbols.hasExportSymbol('*') && this.needsDefaultInterop(resolvedAsset)) {
+      if ((!dep || (_dep$meta = dep.meta) !== null && _dep$meta !== void 0 && _dep$meta.isESM) && exportSymbol === 'default' && resolvedAsset.symbols.hasExportSymbol('*') && this.needsDefaultInterop(resolvedAsset)) {
         this.usedHelpers.add('$parcel$interopDefault');
         return `(/*@__PURE__*/$parcel$interopDefault(${obj}))`;
       } else {

package/lib/index.js

@@ -32,13 +32,6 @@ function _rust() {
   };
   return data;
 }
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -63,23 +56,29 @@ var _default = exports.default = new (_plugin().Packager)({
     config,
     options
   }) {
-    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 config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['package.json']);
+    var _packageName$contents, _packageName$contents2, _conf$contents;
     let packageKey = '@parcel/packager-js';
-    if (pkg !== null && pkg !== void 0 && pkg.contents[packageKey]) {
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey
+    });
+    if (conf !== null && conf !== void 0 && conf.contents) {
       _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,
+        data: conf === null || conf === void 0 ? void 0 : conf.contents,
+        source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+        filePath: conf.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 : '';
+
+    // 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 packageName = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey: 'name'
+    });
+    let name = (_packageName$contents = packageName === null || packageName === void 0 || (_packageName$contents2 = packageName.contents) === null || _packageName$contents2 === void 0 ? void 0 : _packageName$contents2.name) !== null && _packageName$contents !== void 0 ? _packageName$contents : '';
     return {
       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)
+      unstable_asyncBundleRuntime: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.unstable_asyncBundleRuntime)
     };
   },
   async package({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-canary.1543+ec3f4a5fb",
+  "version": "2.0.0-dev.1425+8b1749694",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,17 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-canary.1541+ec3f4a5fb"
+    "parcel": "^2.0.0-dev.1423+8b1749694"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-canary.1543+ec3f4a5fb",
-    "@parcel/plugin": "2.0.0-canary.1543+ec3f4a5fb",
-    "@parcel/rust": "2.12.1-canary.3166+ec3f4a5fb",
+    "@parcel/diagnostic": "2.0.0-dev.1425+8b1749694",
+    "@parcel/plugin": "2.0.0-dev.1425+8b1749694",
+    "@parcel/rust": "2.12.1-dev.3262+8b1749694",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.0.0-canary.1543+ec3f4a5fb",
-    "@parcel/utils": "2.0.0-canary.1543+ec3f4a5fb",
+    "@parcel/types": "2.0.0-dev.1425+8b1749694",
+    "@parcel/utils": "2.0.0-dev.1425+8b1749694",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "ec3f4a5fbfad05bd3b645e02b90ff9c5abc738dc"
+  "gitHead": "8b1749694c0ef79cefdacad40bb90c869a93993a"
 }

package/src/ScopeHoistingPackager.js

@@ -672,7 +672,7 @@ ${code}
       depMap
         .get(
           `${assetId}:${getSpecifier(dep)}${
-            !dep.meta.placeholder ? specifierType : ''
+            dep.meta.isESM ? specifierType : ''
           }`,
         )
         .push(dep);
@@ -985,7 +985,7 @@ ${code}
       exportSymbol === 'default' &&
       staticExports &&
       !isWrapped &&
-      (dep?.meta.kind === 'Import' || dep?.meta.kind === 'Export') &&
+      dep?.meta.isESM &&
       resolvedAsset.symbols.hasExportSymbol('*') &&
       resolvedAsset.symbols.hasExportSymbol('default') &&
       !resolvedAsset.symbols.hasExportSymbol('__esModule');
@@ -1026,9 +1026,8 @@ ${code}
       // we need to use a member access off the namespace object rather
       // than a direct reference. If importing default from a CJS module,
       // use a helper to check the __esModule flag at runtime.
-      let kind = dep?.meta.kind;
       if (
-        (!dep || kind === 'Import' || kind === 'Export') &&
+        (!dep || dep.meta?.isESM) &&
         exportSymbol === 'default' &&
         resolvedAsset.symbols.hasExportSymbol('*') &&
         this.needsDefaultInterop(resolvedAsset)

package/src/index.js

@@ -10,7 +10,6 @@ import {
 } from '@parcel/utils';
 import {encodeJSONKeyComponent} from '@parcel/diagnostic';
 import {hashString} from '@parcel/rust';
-import path from 'path';
 import nullthrows from 'nullthrows';
 import {DevPackager} from './DevPackager';
 import {ScopeHoistingPackager} from './ScopeHoistingPackager';
@@ -32,22 +31,18 @@ const CONFIG_SCHEMA: SchemaEntity = {
 
 export default (new Packager({
   async loadConfig({config, options}): Promise<JSPackagerConfig> {
-    // 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 config.getConfigFrom(
-      path.join(options.projectRoot, 'index'),
-      ['package.json'],
-    );
-
     let packageKey = '@parcel/packager-js';
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey,
+    });
 
-    if (pkg?.contents[packageKey]) {
+    if (conf?.contents) {
       validateSchema.diagnostic(
         CONFIG_SCHEMA,
         {
-          data: pkg?.contents[packageKey],
-          source: await options.inputFS.readFile(pkg.filePath, 'utf8'),
-          filePath: pkg.filePath,
+          data: conf?.contents,
+          source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+          filePath: conf.filePath,
           prependKey: `/${encodeJSONKeyComponent(packageKey)}`,
         },
         packageKey,
@@ -55,11 +50,21 @@ export default (new Packager({
       );
     }
 
-    let name = pkg?.contents?.name ?? '';
+    // 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 packageName = await config.getConfigFrom(
+      options.projectRoot + '/index',
+      [],
+      {
+        packageKey: 'name',
+      },
+    );
+
+    let name = packageName?.contents?.name ?? '';
     return {
       parcelRequireName: 'parcelRequire' + hashString(name).slice(-4),
       unstable_asyncBundleRuntime: Boolean(
-        pkg?.contents[packageKey]?.unstable_asyncBundleRuntime,
+        conf?.contents?.unstable_asyncBundleRuntime,
       ),
     };
   },