@atlaspack/packager-js 2.23.3 → 2.23.5-dev-af891f2f6.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaspack/packager-js
 
+## 2.23.4
+
+### Patch Changes
+
+- [#814](https://github.com/atlassian-labs/atlaspack/pull/814) [`4fe7211`](https://github.com/atlassian-labs/atlaspack/commit/4fe7211301085c3e118d69a192e190e5ac343b42) Thanks [@JakeLane](https://github.com/JakeLane)! - Experimental config option to manually specify static export bindings as a performance optimisation. Requires the "exportsRebindingOptimisation" flag to be enabled.
+
+- Updated dependencies [[`662d3c6`](https://github.com/atlassian-labs/atlaspack/commit/662d3c627888b16bf27df15cfac5a9094509e93d)]:
+  - @atlaspack/feature-flags@2.25.4
+  - @atlaspack/types@2.15.24
+  - @atlaspack/utils@3.0.2
+  - @atlaspack/plugin@2.14.34
+
 ## 2.23.3
 
 ### Patch Changes

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2024 Atlassian US., Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/DevPackager.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DevPackager = void 0;
 const utils_1 = require("@atlaspack/utils");
-const source_map_1 = __importDefault(require("@parcel/source-map"));
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const feature_flags_1 = require("@atlaspack/feature-flags");
 const assert_1 = __importDefault(require("assert"));
 const path_1 = __importDefault(require("path"));
@@ -162,7 +162,6 @@ class DevPackager {
             // @ts-expect-error TS2339
             script.code, entryMap, this.parcelRequireName);
             if (this.bundle.env.sourceMap && entryMap) {
-                // @ts-expect-error TS2551
                 map.addSourceMap(entryMap, lineOffset);
             }
         }

package/dist/ScopeHoistingPackager.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScopeHoistingPackager = void 0;
 const utils_1 = require("@atlaspack/utils");
-const source_map_1 = __importDefault(require("@parcel/source-map"));
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
 const assert_1 = __importStar(require("assert"));
 const diagnostic_1 = __importStar(require("@atlaspack/diagnostic"));
@@ -80,7 +80,7 @@ const OUTPUT_FORMATS = {
     global: GlobalOutputFormat_1.GlobalOutputFormat,
 };
 class ScopeHoistingPackager {
-    constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, logger) {
+    constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, manualStaticBindingExports, logger) {
         this.assetOutputs = new Map();
         this.exportedSymbols = new Map();
         this.externals = new Map();
@@ -100,6 +100,8 @@ class ScopeHoistingPackager {
         this.bundle = bundle;
         this.parcelRequireName = parcelRequireName;
         this.useAsyncBundleRuntime = useAsyncBundleRuntime;
+        this.manualStaticBindingExports =
+            manualStaticBindingExports?.map((glob) => (0, utils_1.globToRegex)(glob)) ?? null;
         this.logger = logger;
         let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
         this.outputFormat = new OutputFormat(this);
@@ -133,7 +135,6 @@ class ScopeHoistingPackager {
             this.seenHoistedRequires.clear();
             let [content, map, lines] = this.visitAsset(asset);
             if (sourceMap && map) {
-                // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                 sourceMap.addSourceMap(map, lineCount);
             }
             else if (this.bundle.env.sourceMap) {
@@ -518,7 +519,6 @@ class ScopeHoistingPackager {
                         let [code, map, lines] = this.visitAsset(resolved);
                         depCode += code + '\n';
                         if (sourceMap && map) {
-                            // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                             sourceMap.addSourceMap(map, lineCount);
                         }
                         lineCount += lines + 1;
@@ -641,7 +641,6 @@ class ScopeHoistingPackager {
                                     sourceMap.offsetLines(lineCount + 1, lines);
                                 }
                                 if (map) {
-                                    // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                                     sourceMap.addSourceMap(map, lineCount);
                                 }
                             }
@@ -685,7 +684,6 @@ ${code}
                     continue;
                 code += depCode + '\n';
                 if (sourceMap && map) {
-                    // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                     sourceMap.addSourceMap(map, lineCount);
                 }
                 lineCount += lines + 1;
@@ -1214,7 +1212,8 @@ ${code}
                     let resolved = this.getSymbolResolution(asset, asset, exp, undefined, replacements);
                     const meta = asset.symbols.get(exp)?.meta;
                     if ((0, feature_flags_1.getFeatureFlag)('exportsRebindingOptimisation') &&
-                        meta?.isStaticBindingSafe) {
+                        (meta?.isStaticBindingSafe ||
+                            this.manualStaticBindingExports?.some((regex) => regex.test(asset.filePath)))) {
                         append += `$${assetId}$exports[${JSON.stringify(exp)}] = ${resolved};\n`;
                     }
                     else {

package/dist/index.js

@@ -16,6 +16,12 @@ const CONFIG_SCHEMA = {
         unstable_asyncBundleRuntime: {
             type: 'boolean',
         },
+        unstable_manualStaticBindingExports: {
+            type: 'array',
+            items: {
+                type: 'string',
+            },
+        },
     },
     additionalProperties: false,
 };
@@ -40,11 +46,9 @@ exports.default = new plugin_1.Packager({
         });
         let name = packageName?.contents ?? '';
         return {
-            // @ts-expect-error TS2345
             parcelRequireName: 'parcelRequire' + (0, rust_1.hashString)(name).slice(-4),
-            unstable_asyncBundleRuntime: Boolean(
-            // @ts-expect-error TS2339
-            conf?.contents?.unstable_asyncBundleRuntime),
+            unstable_asyncBundleRuntime: Boolean(conf?.contents?.unstable_asyncBundleRuntime),
+            unstable_manualStaticBindingExports: conf?.contents?.unstable_manualStaticBindingExports ?? null,
         };
     },
     async package({ bundle, bundleGraph, getInlineBundleContents, getSourceMapReference, config, options, logger, }) {
@@ -61,7 +65,7 @@ exports.default = new plugin_1.Packager({
         }
         if (contents == null) {
             let packager = bundle.env.shouldScopeHoist
-                ? new ScopeHoistingPackager_1.ScopeHoistingPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName, (0, nullthrows_1.default)(config).unstable_asyncBundleRuntime, logger)
+                ? new ScopeHoistingPackager_1.ScopeHoistingPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName, (0, nullthrows_1.default)(config).unstable_asyncBundleRuntime, (0, nullthrows_1.default)(config).unstable_manualStaticBindingExports, logger)
                 : new DevPackager_1.DevPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName);
             ({ contents, map } = await packager.package());
         }

package/lib/DevPackager.js

@@ -12,7 +12,7 @@ function _utils() {
   return data;
 }
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@parcel/source-map"));
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap = function () {
     return data;
   };
@@ -182,7 +182,6 @@ class DevPackager {
       // @ts-expect-error TS2339
       script.code, entryMap, this.parcelRequireName);
       if (this.bundle.env.sourceMap && entryMap) {
-        // @ts-expect-error TS2551
         map.addSourceMap(entryMap, lineOffset);
       }
     }

package/lib/ScopeHoistingPackager.js

@@ -12,7 +12,7 @@ function _utils() {
   return data;
 }
 function _sourceMap2() {
-  const data = _interopRequireDefault(require("@parcel/source-map"));
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap2 = function () {
     return data;
   };
@@ -110,12 +110,13 @@ class ScopeHoistingPackager {
   usedHelpers = new Set();
   externalAssets = new Set();
   useBothScopeHoistingImprovements = (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2') || (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement');
-  constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, logger) {
+  constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, manualStaticBindingExports, logger) {
     this.options = options;
     this.bundleGraph = bundleGraph;
     this.bundle = bundle;
     this.parcelRequireName = parcelRequireName;
     this.useAsyncBundleRuntime = useAsyncBundleRuntime;
+    this.manualStaticBindingExports = (manualStaticBindingExports === null || manualStaticBindingExports === void 0 ? void 0 : manualStaticBindingExports.map(glob => (0, _utils().globToRegex)(glob))) ?? null;
     this.logger = logger;
     let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
     this.outputFormat = new OutputFormat(this);
@@ -146,7 +147,6 @@ class ScopeHoistingPackager {
       this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
       if (sourceMap && map) {
-        // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
@@ -506,7 +506,6 @@ class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
-              // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -625,7 +624,6 @@ class ScopeHoistingPackager {
                   sourceMap.offsetLines(lineCount + 1, lines);
                 }
                 if (map) {
-                  // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                   sourceMap.addSourceMap(map, lineCount);
                 }
               }
@@ -670,7 +668,6 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -1133,10 +1130,10 @@ ${code}
         // 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.
         for (let exp of usedExports) {
-          var _asset$symbols$get2;
+          var _asset$symbols$get2, _this$manualStaticBin;
           let resolved = this.getSymbolResolution(asset, asset, exp, undefined, replacements);
           const meta = (_asset$symbols$get2 = asset.symbols.get(exp)) === null || _asset$symbols$get2 === void 0 ? void 0 : _asset$symbols$get2.meta;
-          if ((0, _featureFlags().getFeatureFlag)('exportsRebindingOptimisation') && meta !== null && meta !== void 0 && meta.isStaticBindingSafe) {
+          if ((0, _featureFlags().getFeatureFlag)('exportsRebindingOptimisation') && (meta !== null && meta !== void 0 && meta.isStaticBindingSafe || (_this$manualStaticBin = this.manualStaticBindingExports) !== null && _this$manualStaticBin !== void 0 && _this$manualStaticBin.some(regex => regex.test(asset.filePath)))) {
             append += `$${assetId}$exports[${JSON.stringify(exp)}] = ${resolved};\n`;
           } else {
             var _asset$symbols$get3;

package/lib/index.js

@@ -47,6 +47,12 @@ const CONFIG_SCHEMA = {
   properties: {
     unstable_asyncBundleRuntime: {
       type: 'boolean'
+    },
+    unstable_manualStaticBindingExports: {
+      type: 'array',
+      items: {
+        type: 'string'
+      }
     }
   },
   additionalProperties: false
@@ -56,7 +62,7 @@ var _default = exports.default = new (_plugin().Packager)({
     config,
     options
   }) {
-    var _conf$contents;
+    var _conf$contents, _conf$contents2;
     let packageKey = '@atlaspack/packager-js';
     let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
       packageKey
@@ -77,10 +83,9 @@ var _default = exports.default = new (_plugin().Packager)({
     });
     let name = (packageName === null || packageName === void 0 ? void 0 : packageName.contents) ?? '';
     return {
-      // @ts-expect-error TS2345
       parcelRequireName: 'parcelRequire' + (0, _rust().hashString)(name).slice(-4),
-      unstable_asyncBundleRuntime: Boolean( // @ts-expect-error TS2339
-      conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.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),
+      unstable_manualStaticBindingExports: (conf === null || conf === void 0 || (_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.unstable_manualStaticBindingExports) ?? null
     };
   },
   async package({
@@ -103,7 +108,7 @@ var _default = exports.default = new (_plugin().Packager)({
       }
     }
     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, logger) : new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
+      let packager = bundle.env.shouldScopeHoist ? new _ScopeHoistingPackager.ScopeHoistingPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName, (0, _nullthrows().default)(config).unstable_asyncBundleRuntime, (0, _nullthrows().default)(config).unstable_manualStaticBindingExports, logger) : new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
       ({
         contents,
         map

package/lib/types/DevPackager.d.ts

@@ -1,5 +1,5 @@
 import type { BundleGraph, PluginOptions, NamedBundle } from '@atlaspack/types';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 export declare class DevPackager {
     options: PluginOptions;
     bundleGraph: BundleGraph<NamedBundle>;

package/lib/types/ScopeHoistingPackager.d.ts

@@ -1,5 +1,5 @@
 import type { Asset, BundleGraph, Dependency, PluginOptions, NamedBundle, PluginLogger } from '@atlaspack/types';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 export interface OutputFormat {
     buildBundlePrelude(): [string, number];
     buildBundlePostlude(): [string, number];
@@ -13,6 +13,7 @@ export declare class ScopeHoistingPackager {
     outputFormat: OutputFormat;
     isAsyncBundle: boolean;
     globalNames: ReadonlySet<string>;
+    manualStaticBindingExports: RegExp[] | null;
     assetOutputs: Map<Asset, {
         code: string;
         map: Buffer | null | undefined;
@@ -35,7 +36,7 @@ export declare class ScopeHoistingPackager {
     externalAssets: Set<Asset>;
     logger: PluginLogger;
     useBothScopeHoistingImprovements: boolean;
-    constructor(options: PluginOptions, bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, parcelRequireName: string, useAsyncBundleRuntime: boolean, logger: PluginLogger);
+    constructor(options: PluginOptions, bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, parcelRequireName: string, useAsyncBundleRuntime: boolean, manualStaticBindingExports: string[] | null, logger: PluginLogger);
     package(): Promise<{
         contents: string;
         map: SourceMap | null | undefined;

package/lib/types/utils.d.ts

@@ -1,5 +1,5 @@
 import type { BundleGraph, Dependency, NamedBundle } from '@atlaspack/types';
-import type SourceMap from '@parcel/source-map';
+import type SourceMap from '@atlaspack/source-map';
 export declare function replaceScriptDependencies(bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, code: string, map: SourceMap | null | undefined, parcelRequireName: string): string;
 export declare function getSpecifier(dep: Dependency): string;
 export declare function isValidIdentifier(id: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.23.3",
+  "version": "2.23.5-dev-af891f2f6.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,13 +16,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.4",
-    "@atlaspack/feature-flags": "2.25.3",
-    "@atlaspack/plugin": "2.14.33",
-    "@atlaspack/rust": "3.8.2",
-    "@parcel/source-map": "^2.1.1",
-    "@atlaspack/types": "2.15.23",
-    "@atlaspack/utils": "3.0.1",
+    "@atlaspack/diagnostic": "2.14.5-dev-af891f2f6.0",
+    "@atlaspack/feature-flags": "2.25.5-dev-af891f2f6.0",
+    "@atlaspack/plugin": "2.14.35-dev-af891f2f6.0",
+    "@atlaspack/rust": "3.8.3-dev-af891f2f6.0",
+    "@atlaspack/source-map": "3.0.1-dev-af891f2f6.0",
+    "@atlaspack/types": "2.15.25-dev-af891f2f6.0",
+    "@atlaspack/utils": "3.0.3-dev-af891f2f6.0",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.8.0"
@@ -30,5 +30,6 @@
   "type": "commonjs",
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  }
+  },
+  "gitHead": "af891f2f68edf62c81b19d349331cf4a07ac458d"
 }

package/src/DevPackager.ts

@@ -6,7 +6,7 @@ import {
   countLines,
   normalizeSeparators,
 } from '@atlaspack/utils';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import invariant from 'assert';
 import path from 'path';
@@ -229,7 +229,6 @@ export class DevPackager {
         this.parcelRequireName,
       );
       if (this.bundle.env.sourceMap && entryMap) {
-        // @ts-expect-error TS2551
         map.addSourceMap(entryMap, lineOffset);
       }
     }

package/src/ScopeHoistingPackager.ts

@@ -14,8 +14,9 @@ import {
   countLines,
   normalizeSeparators,
   debugTools,
+  globToRegex,
 } from '@atlaspack/utils';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import nullthrows from 'nullthrows';
 import invariant, {AssertionError} from 'assert';
 import ThrowableDiagnostic, {
@@ -90,6 +91,7 @@ export class ScopeHoistingPackager {
   outputFormat: OutputFormat;
   isAsyncBundle: boolean;
   globalNames: ReadonlySet<string>;
+  manualStaticBindingExports: RegExp[] | null;
   assetOutputs: Map<
     Asset,
     {
@@ -127,6 +129,7 @@ export class ScopeHoistingPackager {
     bundle: NamedBundle,
     parcelRequireName: string,
     useAsyncBundleRuntime: boolean,
+    manualStaticBindingExports: string[] | null,
     logger: PluginLogger,
   ) {
     this.options = options;
@@ -134,6 +137,8 @@ export class ScopeHoistingPackager {
     this.bundle = bundle;
     this.parcelRequireName = parcelRequireName;
     this.useAsyncBundleRuntime = useAsyncBundleRuntime;
+    this.manualStaticBindingExports =
+      manualStaticBindingExports?.map((glob) => globToRegex(glob)) ?? null;
     this.logger = logger;
 
     let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
@@ -179,7 +184,6 @@ export class ScopeHoistingPackager {
       let [content, map, lines] = this.visitAsset(asset);
 
       if (sourceMap && map) {
-        // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
@@ -683,7 +687,6 @@ export class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
-              // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -839,7 +842,6 @@ export class ScopeHoistingPackager {
                   }
 
                   if (map) {
-                    // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                     sourceMap.addSourceMap(map, lineCount);
                   }
                 }
@@ -896,7 +898,6 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -1609,7 +1610,10 @@ ${code}
           const meta = asset.symbols.get(exp)?.meta;
           if (
             getFeatureFlag('exportsRebindingOptimisation') &&
-            meta?.isStaticBindingSafe
+            (meta?.isStaticBindingSafe ||
+              this.manualStaticBindingExports?.some((regex) =>
+                regex.test(asset.filePath),
+              ))
           ) {
             append += `$${assetId}$exports[${JSON.stringify(
               exp,