@atlaspack/packager-js 2.14.5-canary.35 → 2.14.5-canary.350

package/src/dev-prelude.js

@@ -12,12 +12,12 @@
     typeof globalThis !== 'undefined'
       ? globalThis
       : typeof self !== 'undefined'
-      ? self
-      : typeof window !== 'undefined'
-      ? window
-      : typeof global !== 'undefined'
-      ? global
-      : {};
+        ? self
+        : typeof window !== 'undefined'
+          ? window
+          : typeof global !== 'undefined'
+            ? global
+            : {};
   /* eslint-enable no-undef */
 
   // Save the require from previous bundle to this closure if any

package/src/{helpers.js → helpers.ts}

@@ -1,7 +1,6 @@
-// @flow strict-local
 import type {Environment} from '@atlaspack/types';
 
-export const prelude = (parcelRequireName: string): string => `
+export const preludeOld = (parcelRequireName: string): string => `
 var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -35,6 +34,41 @@ if (parcelRequire == null) {
 var parcelRegister = parcelRequire.register;
 `;
 
+export const preludeNew = (parcelRequireName: string): string => `
+var $parcel$modules = {};
+var $parcel$inits = {};
+
+var parcelRequire = $parcel$global[${JSON.stringify(parcelRequireName)}];
+
+if (parcelRequire == null) {
+  parcelRequire = function(id) {
+    var mod = $parcel$modules[id];
+    if (mod !== undefined) {
+      return mod.exports;
+    }
+    var init = $parcel$inits[id];
+    if (init !== undefined) {
+      delete $parcel$inits[id];
+      var module = {id: id, exports: {}};
+      $parcel$modules[id] = module;
+      init.call(module.exports, module, module.exports);
+      return module.exports;
+    }
+    var err = new Error("Cannot find module '" + id + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
+  };
+
+  parcelRequire.register = function register(id, init) {
+    $parcel$inits[id] = init;
+  };
+
+  $parcel$global[${JSON.stringify(parcelRequireName)}] = parcelRequire;
+}
+
+var parcelRegister = parcelRequire.register;
+`;
+
 export const fnExpr = (
   env: Environment,
   params: Array<string>,
@@ -166,4 +200,4 @@ export const helpers = {
   $parcel$interopDefault,
   $parcel$global,
   $parcel$defineInteropFlag,
-};
+} as const;

package/src/{index.js → index.ts}

@@ -1,24 +1,28 @@
-// @flow strict-local
-import type {Async} from '@atlaspack/types';
-import type SourceMap from '@parcel/source-map';
+import type {Async, BundleResult} from '@atlaspack/types';
+import type SourceMap from '@atlaspack/source-map';
 import {Packager} from '@atlaspack/plugin';
 import {
   replaceInlineReferences,
   replaceURLReferences,
   validateSchema,
-  type SchemaEntity,
+  SchemaEntity,
+  debugTools,
 } from '@atlaspack/utils';
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import {hashString} from '@atlaspack/rust';
 import nullthrows from 'nullthrows';
 import {DevPackager} from './DevPackager';
-import {ScopeHoistingPackager} from './ScopeHoistingPackager';
+import {
+  type PackageResult as ScopeHoistingPackageResult,
+  ScopeHoistingPackager,
+} from './ScopeHoistingPackager';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
-type JSPackagerConfig = {|
-  parcelRequireName: string,
-  unstable_asyncBundleRuntime: boolean,
-  unstable_forceSkipWrapAssets: Array<string>,
-|};
+type JSPackagerConfig = {
+  parcelRequireName: string;
+  unstable_asyncBundleRuntime: boolean;
+  unstable_manualStaticBindingExports: string[] | null;
+};
 
 const CONFIG_SCHEMA: SchemaEntity = {
   type: 'object',
@@ -26,7 +30,7 @@ const CONFIG_SCHEMA: SchemaEntity = {
     unstable_asyncBundleRuntime: {
       type: 'boolean',
     },
-    unstable_forceSkipWrapAssets: {
+    unstable_manualStaticBindingExports: {
       type: 'array',
       items: {
         type: 'string',
@@ -36,10 +40,13 @@ const CONFIG_SCHEMA: SchemaEntity = {
   additionalProperties: false,
 };
 
-export default (new Packager({
+export default new Packager({
   async loadConfig({config, options}): Promise<JSPackagerConfig> {
     let packageKey = '@atlaspack/packager-js';
-    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+    let conf = await config.getConfigFrom<{
+      unstable_asyncBundleRuntime?: boolean;
+      unstable_manualStaticBindingExports?: string[];
+    }>(options.projectRoot + '/index', [], {
       packageKey,
     });
 
@@ -48,7 +55,7 @@ export default (new Packager({
         CONFIG_SCHEMA,
         {
           data: conf?.contents,
-          source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+          source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
           filePath: conf.filePath,
           prependKey: `/${encodeJSONKeyComponent(packageKey)}`,
         },
@@ -59,7 +66,7 @@ export default (new Packager({
 
     // 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(
+    let packageName = await config.getConfigFrom<string>(
       options.projectRoot + '/index',
       [],
       {
@@ -73,8 +80,8 @@ export default (new Packager({
       unstable_asyncBundleRuntime: Boolean(
         conf?.contents?.unstable_asyncBundleRuntime,
       ),
-      unstable_forceSkipWrapAssets:
-        conf?.contents?.unstable_forceSkipWrapAssets ?? [],
+      unstable_manualStaticBindingExports:
+        conf?.contents?.unstable_manualStaticBindingExports ?? null,
     };
   },
   async package({
@@ -89,6 +96,8 @@ export default (new Packager({
     // 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;
+    let scopeHoistingStats: ScopeHoistingPackageResult['scopeHoistingStats'];
+
     if (bundle.env.sourceType === 'script') {
       let entries = bundle.getEntryAssets();
       if (
@@ -101,24 +110,31 @@ export default (new Packager({
     }
 
     if (contents == null) {
-      let packager = bundle.env.shouldScopeHoist
-        ? new ScopeHoistingPackager(
-            options,
-            bundleGraph,
-            bundle,
-            nullthrows(config).parcelRequireName,
-            nullthrows(config).unstable_asyncBundleRuntime,
-            nullthrows(config).unstable_forceSkipWrapAssets,
-            logger,
-          )
-        : new DevPackager(
-            options,
-            bundleGraph,
-            bundle,
-            nullthrows(config).parcelRequireName,
-          );
-
-      ({contents, map} = await packager.package());
+      if (bundle.env.shouldScopeHoist) {
+        let packager = new ScopeHoistingPackager(
+          options,
+          bundleGraph,
+          bundle,
+          nullthrows(config).parcelRequireName,
+          nullthrows(config).unstable_asyncBundleRuntime,
+          nullthrows(config).unstable_manualStaticBindingExports,
+          logger,
+        );
+
+        let packageResult = await packager.package();
+        ({contents, map} = packageResult);
+        scopeHoistingStats = packageResult.scopeHoistingStats;
+      } else {
+        let packager = new DevPackager(
+          options,
+          bundleGraph,
+          bundle,
+          nullthrows(config).parcelRequireName,
+        );
+
+        let packageResult = await packager.package();
+        ({contents, map} = packageResult);
+      }
     }
 
     contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map));
@@ -135,7 +151,7 @@ export default (new Packager({
       }));
     }
 
-    return replaceInlineReferences({
+    let result = await replaceInlineReferences({
       bundle,
       bundleGraph,
       contents,
@@ -146,12 +162,20 @@ export default (new Packager({
       getInlineBundleContents,
       map,
     });
+
+    if (debugTools['scope-hoisting-stats']) {
+      return {...result, scopeHoistingStats};
+    }
+
+    return result;
   },
-}): Packager);
+}) as Packager<unknown, unknown>;
 
 async function getSourceMapSuffix(
-  getSourceMapReference: (?SourceMap) => Async<?string>,
-  map: ?SourceMap,
+  getSourceMapReference: (
+    arg1?: SourceMap | null | undefined,
+  ) => Async<string | null | undefined>,
+  map?: SourceMap | null,
 ): Promise<string> {
   let sourcemapReference = await getSourceMapReference(map);
   if (sourcemapReference != null) {

package/src/{utils.js → utils.ts}

@@ -1,6 +1,5 @@
-// @flow
 import type {BundleGraph, Dependency, NamedBundle} from '@atlaspack/types';
-import type SourceMap from '@parcel/source-map';
+import type SourceMap from '@atlaspack/source-map';
 import nullthrows from 'nullthrows';
 
 // This replaces __parcel__require__ references left by the transformer with
@@ -10,7 +9,7 @@ export function replaceScriptDependencies(
   bundleGraph: BundleGraph<NamedBundle>,
   bundle: NamedBundle,
   code: string,
-  map: ?SourceMap,
+  map: SourceMap | null | undefined,
   parcelRequireName: string,
 ): string {
   let entry = nullthrows(bundle.getMainEntry());

package/tsconfig.json

@@ -0,0 +1,30 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../../core/feature-flags/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/rust/tsconfig.json"
+    },
+    {
+      "path": "../../core/types/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    },
+    {
+      "path": "../../core/source-map/tsconfig.json"
+    }
+  ]
+}