@atlaspack/packager-js 2.21.4-dev-optimised-prelude-6fa233c65.0 → 2.21.4-dev-export-func-removal-960dd335d.0

package/lib/ScopeHoistingPackager.js

@@ -1144,9 +1144,11 @@ ${code}
                 symbol, undefined, replacements);
                 let get = this.buildFunctionExpression([], resolvedSymbol);
                 let set = asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolvedSymbol} = v`) : '';
-                prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(symbol)}, ${get}${set});\n`;
-                this.usedHelpers.add('$parcel$export');
-                prependLineCount++;
+                // prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(
+                //   symbol,
+                // )}, ${get}${set});\n`;
+                // this.usedHelpers.add('$parcel$export');
+                append += `$${assetId}$exports[${JSON.stringify(symbol)}] = ${resolvedSymbol};\n`;
               }
             }
           }
@@ -1184,7 +1186,7 @@ ${code}
         // for the symbol so that when the value changes the object property also changes. This is
         // required to simulate ESM live bindings. It's easier to do it this way rather than inserting
         // additional assignments after each mutation of the original binding.
-        prepend += `\n${usedExports.map(exp => {
+        append += `\n${usedExports.map(exp => {
           var _asset$symbols$get2;
           let resolved = this.getSymbolResolution(asset, asset,
           // @ts-expect-error TS2345
@@ -1192,12 +1194,16 @@ ${code}
           let get = this.buildFunctionExpression([], resolved);
           let isEsmExport = !!((_asset$symbols$get2 = asset.symbols.get(exp)) !== null && _asset$symbols$get2 !== void 0 && (_asset$symbols$get2 = _asset$symbols$get2.meta) !== null && _asset$symbols$get2 !== void 0 && _asset$symbols$get2.isEsm);
           let set = !isEsmExport && asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`) : '';
-          return `$parcel$export($${assetId}$exports, ${JSON.stringify(exp)}, ${get}${set});`;
+          // return `$parcel$export($${assetId}$exports, ${JSON.stringify(
+          //   exp,
+          // )}, ${get}${set});`;
+          return `$${assetId}$exports[${JSON.stringify(exp)}] = ${resolved};\n`;
         }).join('\n')}\n`;
-        this.usedHelpers.add('$parcel$export');
-        prependLineCount += 1 + usedExports.length;
+        // this.usedHelpers.add('$parcel$export');
+        // prependLineCount += 1 + usedExports.length;
       }
     }
+
     return [prepend, prependLineCount, append];
   }
   buildBundlePrelude() {
@@ -1245,7 +1251,7 @@ ${code}
       // Conditional deps may be loaded before entrypoints on the server
       this.hasConditionalDependency();
       if (mightBeFirstJS) {
-        let preludeCode = ((0, _featureFlags().getFeatureFlag)('useNewPrelude') ? _helpers.preludeNew : _helpers.preludeOld)(this.parcelRequireName);
+        let preludeCode = (0, _helpers.prelude)(this.parcelRequireName);
         res += preludeCode;
         if (enableSourceMaps) {
           lines += (0, _utils().countLines)(preludeCode) - 1;

package/lib/helpers.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.preludeOld = exports.preludeNew = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
-const preludeOld = parcelRequireName => `
+exports.prelude = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
+const prelude = parcelRequireName => `
 var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -37,42 +37,7 @@ if (parcelRequire == null) {
 
 var parcelRegister = parcelRequire.register;
 `;
-exports.preludeOld = preludeOld;
-const preludeNew = parcelRequireName => `
-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;
-`;
-exports.preludeNew = preludeNew;
+exports.prelude = prelude;
 const fnExpr = (env, params, body) => {
   let block = `{ ${body.join(' ')} }`;
   if (env.supports('arrow-functions')) {

package/lib/types/helpers.d.ts

@@ -1,6 +1,5 @@
 import type { Environment } from '@atlaspack/types';
-export declare const preludeOld: (parcelRequireName: string) => string;
-export declare const preludeNew: (parcelRequireName: string) => string;
+export declare const prelude: (parcelRequireName: string) => string;
 export declare const fnExpr: (env: Environment, params: Array<string>, body: Array<string>) => string;
 export declare const bundleQueuePrelude: (env: Environment) => string;
 export declare const helpers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.21.4-dev-optimised-prelude-6fa233c65.0",
+  "version": "2.21.4-dev-export-func-removal-960dd335d.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,12 +16,12 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.4-dev-optimised-prelude-6fa233c65.0",
-    "@atlaspack/feature-flags": "2.23.3-dev-optimised-prelude-6fa233c65.0",
-    "@atlaspack/plugin": "2.14.28-dev-optimised-prelude-6fa233c65.0",
-    "@atlaspack/rust": "3.6.3-dev-optimised-prelude-6fa233c65.0",
-    "@atlaspack/types": "2.15.18-dev-optimised-prelude-6fa233c65.0",
-    "@atlaspack/utils": "2.18.5-dev-optimised-prelude-6fa233c65.0",
+    "@atlaspack/diagnostic": "2.14.4-dev-export-func-removal-960dd335d.0",
+    "@atlaspack/feature-flags": "2.23.3-dev-export-func-removal-960dd335d.0",
+    "@atlaspack/plugin": "2.14.28-dev-export-func-removal-960dd335d.0",
+    "@atlaspack/rust": "3.6.3-dev-export-func-removal-960dd335d.0",
+    "@atlaspack/types": "2.15.18-dev-export-func-removal-960dd335d.0",
+    "@atlaspack/utils": "2.18.5-dev-export-func-removal-960dd335d.0",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
@@ -32,5 +32,5 @@
     "check-ts": "tsc --emitDeclarationOnly --rootDir src",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "6fa233c656e8abea0878044e1fc0dc2023077a53"
+  "gitHead": "960dd335d08a04220a07b36f4bb83cd7e130903e"
 }

package/src/ScopeHoistingPackager.ts

@@ -29,13 +29,7 @@ import {outdent} from 'outdent';
 import {ESMOutputFormat} from './ESMOutputFormat';
 import {CJSOutputFormat} from './CJSOutputFormat';
 import {GlobalOutputFormat} from './GlobalOutputFormat';
-import {
-  preludeOld,
-  preludeNew,
-  helpers,
-  bundleQueuePrelude,
-  fnExpr,
-} from './helpers';
+import {prelude, helpers, bundleQueuePrelude, fnExpr} from './helpers';
 import {
   replaceScriptDependencies,
   getSpecifier,
@@ -1549,11 +1543,13 @@ ${code}
                   ? ', ' +
                     this.buildFunctionExpression(['v'], `${resolvedSymbol} = v`)
                   : '';
-                prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(
+                // prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(
+                //   symbol,
+                // )}, ${get}${set});\n`;
+                // this.usedHelpers.add('$parcel$export');
+                append += `$${assetId}$exports[${JSON.stringify(
                   symbol,
-                )}, ${get}${set});\n`;
-                this.usedHelpers.add('$parcel$export');
-                prependLineCount++;
+                )}] = ${resolvedSymbol};\n`;
               }
             }
           }
@@ -1593,7 +1589,7 @@ ${code}
         // for the symbol so that when the value changes the object property also changes. This is
         // required to simulate ESM live bindings. It's easier to do it this way rather than inserting
         // additional assignments after each mutation of the original binding.
-        prepend += `\n${usedExports
+        append += `\n${usedExports
           .map((exp) => {
             let resolved = this.getSymbolResolution(
               asset,
@@ -1609,13 +1605,16 @@ ${code}
               !isEsmExport && asset.meta.hasCJSExports
                 ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`)
                 : '';
-            return `$parcel$export($${assetId}$exports, ${JSON.stringify(
+            // return `$parcel$export($${assetId}$exports, ${JSON.stringify(
+            //   exp,
+            // )}, ${get}${set});`;
+            return `$${assetId}$exports[${JSON.stringify(
               exp,
-            )}, ${get}${set});`;
+            )}] = ${resolved};\n`;
           })
           .join('\n')}\n`;
-        this.usedHelpers.add('$parcel$export');
-        prependLineCount += 1 + usedExports.length;
+        // this.usedHelpers.add('$parcel$export');
+        // prependLineCount += 1 + usedExports.length;
       }
     }
 
@@ -1683,9 +1682,7 @@ ${code}
         this.hasConditionalDependency();
 
       if (mightBeFirstJS) {
-        let preludeCode = (
-          getFeatureFlag('useNewPrelude') ? preludeNew : preludeOld
-        )(this.parcelRequireName);
+        let preludeCode = prelude(this.parcelRequireName);
         res += preludeCode;
         if (enableSourceMaps) {
           lines += countLines(preludeCode) - 1;

package/src/helpers.ts

@@ -1,6 +1,6 @@
 import type {Environment} from '@atlaspack/types';
 
-export const preludeOld = (parcelRequireName: string): string => `
+export const prelude = (parcelRequireName: string): string => `
 var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -34,41 +34,6 @@ 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>,