@atlaspack/packager-js 2.18.3-typescript-5b4d3ad41.0 → 2.19.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaspack/packager-js
 
+## 2.19.0
+
+### Minor Changes
+
+- [#721](https://github.com/atlassian-labs/atlaspack/pull/721) [`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd) Thanks [@benjervis](https://github.com/benjervis)! - Add support for bundle merging based on `webpackChunkName` comments.
+
+  Adding a `webpackChunkName` comment to an import will allow the bundler to merge multiple imports into a single bundle.
+
+  e.g.:
+
+  ```ts
+  import(/* webpackChunkName: "my-chunk" */ './my-module');
+  import(/* webpackChunkName: "my-chunk" */ './another-module');
+  ```
+
+  This can be enabled with the feature flag `supportWebpackChunkName`.
+
+### Patch Changes
+
+- Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
+  - @atlaspack/feature-flags@2.20.0
+  - @atlaspack/types@2.15.11
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/plugin@2.14.21
+
 ## 2.18.2
 
 ### Patch Changes
@@ -110,6 +135,7 @@
 ### Patch Changes
 
 - [#632](https://github.com/atlassian-labs/atlaspack/pull/632) [`10fbcfb`](https://github.com/atlassian-labs/atlaspack/commit/10fbcfbfa49c7a83da5d7c40983e36e87f524a75) Thanks [@marcins](https://github.com/marcins)! - Added a new feature flag `inlineConstOptimisationFix` which when enabled changes the behaviour for output of constant modules. This fixes two issues with constant modules:
+
   - Previously constant modules, if they needed a namespace anywhere, would have a namespace everywhere, with this change they only have a namespace in the bundles where needed.
   - Previously in the case of wrapped assets, a constant module dependnecy of that wrapped asset would be rendered after the module - which meant the minifier would not be able to inline the constants safely. With this flag all constant modules are rendered at the top of the bundle.
 

package/lib/DevPackager.js

@@ -98,7 +98,6 @@ class DevPackager {
         // 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()) {
-          // @ts-expect-error TS2322
           script = results[i++];
           return;
         }
@@ -127,8 +126,6 @@ class DevPackager {
             }
           }
         }
-
-        // @ts-expect-error TS2339
         let {
           code,
           mapBuffer
@@ -173,16 +170,12 @@ class DevPackager {
     // runtimes with a parcelRequire call.
     if (this.bundle.env.sourceType === 'script' && script) {
       let entryMap;
-      // @ts-expect-error TS2339
       let mapBuffer = script.mapBuffer;
       if (mapBuffer) {
         entryMap = new (_sourceMap().default)(this.options.projectRoot, mapBuffer);
       }
-      contents += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle,
-      // @ts-expect-error TS2339
-      script.code, entryMap, this.parcelRequireName);
+      contents += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle, script.code, entryMap, this.parcelRequireName);
       if (this.bundle.env.sourceMap && entryMap) {
-        // @ts-expect-error TS2551
         map.addSourceMap(entryMap, lineOffset);
       }
     }

package/lib/ScopeHoistingPackager.js

@@ -77,6 +77,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // General regex used to replace imports with the resolved code, references with resolutions,
 // and count the number of newlines in the file for source maps.
+//
 // For conditional bundling the only difference in this regex is adding `importCond` where we have `importAsync` etc..
 const REPLACEMENT_RE_CONDITIONAL = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require|importCond)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
@@ -96,8 +97,6 @@ const OUTPUT_FORMATS = {
   global: _GlobalOutputFormat.GlobalOutputFormat
 };
 class ScopeHoistingPackager {
-  // @ts-expect-error TS2564
-
   exportedSymbols = new Map();
   externals = new Map();
   topLevelNames = new Map();
@@ -141,11 +140,9 @@ class ScopeHoistingPackager {
     }
     let res = '';
     let lineCount = 0;
-    // @ts-expect-error TS7034
     let sourceMap = null;
     let processAsset = asset => {
       let [content, map, lines] = this.visitAsset(asset);
-      // @ts-expect-error TS7005
       if (sourceMap && map) {
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
@@ -184,17 +181,20 @@ class ScopeHoistingPackager {
     let [prelude, preludeLines] = this.buildBundlePrelude();
     res = prelude + res;
     lineCount += preludeLines;
-    // @ts-expect-error TS2339
     (_sourceMap = sourceMap) === null || _sourceMap === void 0 || _sourceMap.offsetLines(1, preludeLines);
     let entries = this.bundle.getEntryAssets();
     let mainEntry = this.bundle.getMainEntry();
     if (this.isAsyncBundle) {
       // 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 => {
-        var _mainEntry;
-        return a.id !== ((_mainEntry = mainEntry) === null || _mainEntry === void 0 ? void 0 : _mainEntry.id);
-      });
+      if ((0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+        entries = [];
+      } else {
+        entries = entries.filter(a => {
+          var _mainEntry;
+          return a.id !== ((_mainEntry = mainEntry) === null || _mainEntry === void 0 ? void 0 : _mainEntry.id);
+        });
+      }
       mainEntry = null;
     }
     let needsBundleQueue = this.shouldBundleQueue(this.bundle);
@@ -204,14 +204,9 @@ class ScopeHoistingPackager {
       if (this.wrappedAssets.has(entry.id) && !this.isScriptEntry(entry)) {
         var _entry$symbols$get;
         let parcelRequire = `parcelRequire(${JSON.stringify(this.bundleGraph.getAssetPublicId(entry))});\n`;
-
-        // @ts-expect-error TS2345
         let entryExports = (_entry$symbols$get = entry.symbols.get('*')) === null || _entry$symbols$get === void 0 ? void 0 : _entry$symbols$get.local;
-        if (entryExports && entry === mainEntry &&
-        // @ts-expect-error TS2345
-        this.exportedSymbols.has(entryExports)) {
+        if (entryExports && entry === mainEntry && this.exportedSymbols.has(entryExports)) {
           (0, _assert().default)(!needsBundleQueue, 'Entry exports are not yet compaitble with async bundles');
-          // @ts-expect-error TS2731
           res += `\nvar ${entryExports} = ${parcelRequire}`;
         } else {
           if (needsBundleQueue) {
@@ -243,7 +238,6 @@ class ScopeHoistingPackager {
       }
       res += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle, code, map, this.parcelRequireName);
       if (sourceMap && map) {
-        // @ts-expect-error TS2339
         sourceMap.addSourceMap(map, lineCount);
       }
     }
@@ -348,8 +342,6 @@ class ScopeHoistingPackager {
         }, wrappedAssetRoot);
       }
     }
-
-    // @ts-expect-error TS2769
     this.assetOutputs = new Map(await queue.run());
     return {
       wrapped,
@@ -374,7 +366,6 @@ class ScopeHoistingPackager {
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
     if (entry && !this.wrappedAssets.has(entry.id)) {
-      // @ts-expect-error TS2345
       let hasNamespace = entry.symbols.hasExportSymbol('*');
       for (let {
         asset,
@@ -390,14 +381,11 @@ class ScopeHoistingPackager {
           if (hasNamespace && this.isAsyncBundle && exportAs !== '*') {
             continue;
           }
-          let symbols = (_this$exportedSymbols = this.exportedSymbols.get(
-          // @ts-expect-error TS2345
-          symbol === '*' ? (0, _nullthrows().default)((_entry$symbols$get2 = entry.symbols.get('*')) === null || _entry$symbols$get2 === void 0 ? void 0 : _entry$symbols$get2.local) : symbol)) === null || _this$exportedSymbols === void 0 ? void 0 : _this$exportedSymbols.exportAs;
+          let symbols = (_this$exportedSymbols = this.exportedSymbols.get(symbol === '*' ? (0, _nullthrows().default)((_entry$symbols$get2 = entry.symbols.get('*')) === null || _entry$symbols$get2 === void 0 ? void 0 : _entry$symbols$get2.local) : symbol)) === null || _this$exportedSymbols === void 0 ? void 0 : _this$exportedSymbols.exportAs;
           if (!symbols) {
             symbols = [];
             this.exportedSymbols.set(symbol, {
               asset,
-              // @ts-expect-error TS2322
               exportSymbol,
               local: symbol,
               exportAs: symbols
@@ -406,8 +394,6 @@ class ScopeHoistingPackager {
           if (exportAs === '*') {
             exportAs = 'default';
           }
-
-          // @ts-expect-error TS2345
           symbols.push(exportAs);
         } else if (symbol === null) {
           // TODO `meta.exportsIdentifier[exportSymbol]` should be exported
@@ -484,7 +470,6 @@ class ScopeHoistingPackager {
           let [code, map, lines] = this.visitAsset(resolved);
           depCode += code + '\n';
           if (sourceMap && map) {
-            // @ts-expect-error TS2551
             sourceMap.addSourceMap(map, lineCount);
           }
           lineCount += lines + 1;
@@ -510,7 +495,6 @@ class ScopeHoistingPackager {
     }
     code += append;
     let lineCount = 0;
-    // @ts-expect-error TS2552
     let depContent = [];
     if (depMap.size === 0 && replacements.size === 0) {
       // If there are no dependencies or replacements, use a simple function to count the number of lines.
@@ -592,7 +576,6 @@ class ScopeHoistingPackager {
                   sourceMap.offsetLines(lineCount + 1, lines);
                 }
                 if (map) {
-                  // @ts-expect-error TS2551
                   sourceMap.addSourceMap(map, lineCount);
                 }
               }
@@ -637,7 +620,6 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          // @ts-expect-error TS2551
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -684,12 +666,9 @@ ${code}
       for (let [imported, {
         local
       }] of dep.symbols) {
-        // @ts-expect-error TS2367
         if (local === '*') {
           continue;
         }
-
-        // @ts-expect-error TS2345
         let symbol = this.getSymbolResolution(asset, resolved, imported, dep);
         replacements.set(local,
         // If this was an internalized async asset, wrap in a Promise.resolve.
@@ -711,7 +690,6 @@ ${code}
     // which will be provided to us by the wrapper.
     if (this.wrappedAssets.has(asset.id) || this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry()) {
       var _asset$symbols$get;
-      // @ts-expect-error TS2345
       let exportsName = ((_asset$symbols$get = asset.symbols.get('*')) === null || _asset$symbols$get === void 0 ? void 0 : _asset$symbols$get.local) || `$${assetId}$exports`;
       replacements.set(exportsName, 'module.exports');
     }
@@ -744,11 +722,8 @@ ${code}
       local
     }] of dep.symbols) {
       // If already imported, just add the already renamed variable to the mapping.
-      // @ts-expect-error TS2345
       let renamed = external.get(imported);
-      // @ts-expect-error TS2367
       if (renamed && local !== '*' && replacements) {
-        // @ts-expect-error TS2345
         replacements.set(local, renamed);
         continue;
       }
@@ -761,25 +736,16 @@ ${code}
           if (referencedBundle) {
             var _entry$symbols$get3;
             let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
-            // @ts-expect-error TS2322
-            renamed =
-            // @ts-expect-error TS2345
-            ((_entry$symbols$get3 = entry.symbols.get('*')) === null || _entry$symbols$get3 === void 0 ? void 0 : _entry$symbols$get3.local) ?? `$${String(entry.meta.id)}$exports`;
+            renamed = ((_entry$symbols$get3 = entry.symbols.get('*')) === null || _entry$symbols$get3 === void 0 ? void 0 : _entry$symbols$get3.local) ?? `$${String(entry.meta.id)}$exports`;
           } else {
             renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
           }
-
-          // @ts-expect-error TS2345
           external.set('*', renamed);
         }
-
-        // @ts-expect-error TS2367
         if (local !== '*' && replacements) {
           let replacement;
-          // @ts-expect-error TS2367
           if (imported === '*') {
             replacement = renamed;
-            // @ts-expect-error TS2367
           } else if (imported === 'default') {
             let needsDefaultInterop = true;
             if (referencedBundle) {
@@ -793,41 +759,32 @@ ${code}
               replacement = `${renamed}.default`;
             }
           } else {
-            // @ts-expect-error TS2345
             replacement = this.getPropertyAccess(renamed, imported);
           }
-
-          // @ts-expect-error TS2345
           replacements.set(local, replacement);
         }
       } else {
         let property;
         if (referencedBundle) {
           let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
-          // @ts-expect-error TS2345
           if (entry.symbols.hasExportSymbol('*')) {
             // If importing * and the referenced module has a * export (e.g. CJS), use default instead.
             // This mirrors the logic in buildExportedSymbols.
             property = imported;
-            // @ts-expect-error TS2322
             imported = (referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.env.outputFormat) === 'esmodule' ? 'default' : '*';
           } else {
-            // @ts-expect-error TS2367
             if (imported === '*') {
               let exportedSymbols = this.bundleGraph.getExportedSymbols(entry);
-              // @ts-expect-error TS2367
               if (local === '*') {
                 // Re-export all symbols.
                 for (let exported of exportedSymbols) {
                   if (exported.symbol) {
-                    // @ts-expect-error TS2345
                     external.set(exported.exportSymbol, exported.symbol);
                   }
                 }
                 continue;
               }
             }
-            // @ts-expect-error TS2322
             renamed = this.bundleGraph.getSymbolResolution(entry, imported, this.bundle).symbol;
           }
         }
@@ -836,37 +793,25 @@ ${code}
         // are deduplicated. We have to prefix the imported name with the bundle id so that
         // local variables do not shadow it.
         if (!renamed) {
-          // @ts-expect-error TS2345
           if (this.exportedSymbols.has(local)) {
-            // @ts-expect-error TS2322
             renamed = local;
-            // @ts-expect-error TS2367
           } else if (imported === 'default' || imported === '*') {
             renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
           } else {
-            renamed = this.getTopLevelName(
-            // @ts-expect-error TS2731
-            `$${this.bundle.publicId}$${imported}`);
+            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${imported}`);
           }
         }
-
-        // @ts-expect-error TS2345
         external.set(imported, renamed);
-        // @ts-expect-error TS2367
         if (local !== '*' && replacements) {
           let replacement = renamed;
-          // @ts-expect-error TS2367
           if (property === '*') {
             replacement = renamed;
-            // @ts-expect-error TS2367
           } else if (property === 'default') {
             replacement = `($parcel$interopDefault(${renamed}))`;
             this.usedHelpers.add('$parcel$interopDefault');
           } else if (property) {
-            // @ts-expect-error TS2345
             replacement = this.getPropertyAccess(renamed, property);
           }
-          // @ts-expect-error TS2345
           replacements.set(local, replacement);
         }
       }
@@ -888,7 +833,6 @@ ${code}
       asset: resolvedAsset,
       exportSymbol,
       symbol
-      // @ts-expect-error TS2345
     } = this.bundleGraph.getSymbolResolution(resolved, imported, this.bundle);
     if (resolvedAsset.type !== 'js' || dep && this.bundleGraph.isDependencySkipped(dep)) {
       // Graceful fallback for non-js imports or when trying to resolve a symbol
@@ -922,13 +866,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') &&
-    // @ts-expect-error TS2345
-    resolvedAsset.symbols.hasExportSymbol('*') &&
-    // @ts-expect-error TS2345
-    resolvedAsset.symbols.hasExportSymbol('default') &&
-    // @ts-expect-error TS2345
-    !resolvedAsset.symbols.hasExportSymbol('__esModule');
+    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');
 
     // Find the namespace object for the resolved module. If wrapped and this
     // is an inline require (not top-level), use a parcelRequire call, otherwise
@@ -944,9 +882,7 @@ ${code}
       obj = `$${publicId}`;
     } else {
       var _resolvedAsset$symbol;
-      // @ts-expect-error TS2345
       obj = ((_resolvedAsset$symbol = resolvedAsset.symbols.get('*')) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local) || `$${assetId}$exports`;
-      // @ts-expect-error TS2345
       obj = (replacements === null || replacements === void 0 ? void 0 : replacements.get(obj)) || obj;
     }
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
@@ -955,7 +891,6 @@ ${code}
         // Directly use module.exports for wrapped assets importing themselves.
         return 'module.exports';
       } else {
-        // @ts-expect-error TS2322
         return obj;
       }
     } else if ((!staticExports || isWrapped || !symbol || isExternalCommonJS) && resolvedAsset !== parentAsset) {
@@ -964,20 +899,15 @@ ${code}
       // 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' &&
-      // @ts-expect-error TS2345
-      resolvedAsset.symbols.hasExportSymbol('*') && this.needsDefaultInterop(resolvedAsset)) {
+      if ((!dep || kind === 'Import' || kind === 'Export') && exportSymbol === 'default' && resolvedAsset.symbols.hasExportSymbol('*') && this.needsDefaultInterop(resolvedAsset)) {
         this.usedHelpers.add('$parcel$interopDefault');
-        // @ts-expect-error TS2731
         return `(/*@__PURE__*/$parcel$interopDefault(${obj}))`;
       } else {
-        // @ts-expect-error TS2345
         return this.getPropertyAccess(obj, exportSymbol);
       }
     } else if (!symbol) {
       (0, _assert().default)(false, 'Asset was skipped or not found.');
     } else {
-      // @ts-expect-error TS2322
       return (replacements === null || replacements === void 0 ? void 0 : replacements.get(symbol)) || symbol;
     }
   }
@@ -1017,32 +947,20 @@ ${code}
     // If the asset has a namespace export symbol, it is CommonJS.
     // If there's no __esModule flag, and default is a used symbol, we need
     // to insert an interop helper.
-    let defaultInterop =
-    // @ts-expect-error TS2345
-    asset.symbols.hasExportSymbol('*') &&
-    // @ts-expect-error TS2345
-    usedSymbols.has('default') &&
-    // @ts-expect-error TS2345
-    !asset.symbols.hasExportSymbol('__esModule');
+    let defaultInterop = asset.symbols.hasExportSymbol('*') && usedSymbols.has('default') && !asset.symbols.hasExportSymbol('__esModule');
     let usedNamespace;
     if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') && asset.meta.isConstantModule) {
       // Only set usedNamespace if there is an incoming dependency in the current bundle that uses '*'
-      usedNamespace = this.bundleGraph.getIncomingDependencies(asset).some(dep => this.bundle.hasDependency(dep) &&
-      // @ts-expect-error TS2345
-      (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'));
+      usedNamespace = this.bundleGraph.getIncomingDependencies(asset).some(dep => this.bundle.hasDependency(dep) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'));
     } else {
       usedNamespace =
       // If the asset has * in its used symbols, we might need the exports namespace.
       // The one case where this isn't true is in ESM library entries, where the only
       // dependency on * is the entry dependency. In this case, we will use ESM exports
       // instead of the namespace object.
-      // @ts-expect-error TS2345
-      usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && this.bundle.hasDependency(dep) &&
-      // @ts-expect-error TS2345
-      (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
+      usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && this.bundle.hasDependency(dep) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
       // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
       // we fallback on the namespace object.
-      // @ts-expect-error TS2345
       asset.symbols.hasExportSymbol('*') && [...usedSymbols].some(s => !asset.symbols.hasExportSymbol(s)) ||
       // If the exports has this asset's namespace (e.g. ESM output from CJS input),
       // include the namespace object for the default export.
@@ -1067,7 +985,6 @@ ${code}
       // Insert the __esModule interop flag for this module if it has a `default` export
       // and the namespace symbol is used.
       // TODO: only if required by CJS?
-      // @ts-expect-error TS2345
       if (asset.symbols.hasExportSymbol('default') && usedSymbols.has('*')) {
         prepend += `\n$parcel$defineInteropFlag($${assetId}$exports);\n`;
         prependLineCount += 2;
@@ -1086,7 +1003,6 @@ ${code}
         for (let [imported, {
           local
         }] of dep.symbols) {
-          // @ts-expect-error TS2367
           if (imported === '*' && local === '*') {
             if (!resolved) {
               // Re-exporting an external module. This should have already been handled in buildReplacements.
@@ -1099,29 +1015,20 @@ ${code}
             // If the resolved asset has an exports object, use the $parcel$exportWildcard helper
             // to re-export all symbols. Otherwise, if there's no namespace object available, add
             // $parcel$export calls for each used symbol of the dependency.
-            if (isWrapped || resolved.meta.staticExports === false ||
-            // @ts-expect-error TS2345
-            (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(resolved)).has('*') ||
+            if (isWrapped || resolved.meta.staticExports === false || (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(resolved)).has('*') ||
             // an empty asset
-            !resolved.meta.hasCJSExports &&
-            // @ts-expect-error TS2345
-            resolved.symbols.hasExportSymbol('*')) {
+            !resolved.meta.hasCJSExports && resolved.symbols.hasExportSymbol('*')) {
               let obj = this.getSymbolResolution(asset, resolved, '*', dep, replacements);
               append += `$parcel$exportWildcard($${assetId}$exports, ${obj});\n`;
               this.usedHelpers.add('$parcel$exportWildcard');
             } else {
               for (let symbol of (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep))) {
-                if (
-                // @ts-expect-error TS2367
-                symbol === 'default' ||
+                if (symbol === 'default' ||
                 // `export * as ...` does not include the default export
-                // @ts-expect-error TS2367
                 symbol === '__esModule') {
                   continue;
                 }
-                let resolvedSymbol = this.getSymbolResolution(asset, resolved,
-                // @ts-expect-error TS2345
-                symbol, undefined, replacements);
+                let resolvedSymbol = this.getSymbolResolution(asset, resolved, 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`;
@@ -1138,7 +1045,6 @@ ${code}
       // re-exported symbols rather than only symbols declared in this asset.
       let incomingDeps = this.bundleGraph.getIncomingDependencies(asset);
       let usedExports = [...asset.symbols.exportSymbols()].filter(symbol => {
-        // @ts-expect-error TS2367
         if (symbol === '*') {
           return false;
         }
@@ -1153,8 +1059,6 @@ ${code}
 
           // No used symbols available for the asset, make sure we keep all of them
           if (!symbols) return false;
-
-          // @ts-expect-error TS2345
           return !symbols.has(symbol) && !symbols.has('*');
         });
         return !unused;
@@ -1166,9 +1070,7 @@ ${code}
         // additional assignments after each mutation of the original binding.
         prepend += `\n${usedExports.map(exp => {
           var _asset$symbols$get2;
-          let resolved = this.getSymbolResolution(asset, asset,
-          // @ts-expect-error TS2345
-          exp, undefined, replacements);
+          let resolved = this.getSymbolResolution(asset, asset, exp, undefined, replacements);
           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`) : '';
@@ -1206,10 +1108,8 @@ ${code}
       this.usedHelpers.add('$parcel$global');
     }
     for (let helper of this.usedHelpers) {
-      // @ts-expect-error TS7053
       let currentHelper = _helpers.helpers[helper];
       if (typeof currentHelper === 'function') {
-        // @ts-expect-error TS7053
         currentHelper = _helpers.helpers[helper](this.bundle.env);
       }
       res += currentHelper;
@@ -1265,11 +1165,7 @@ ${code}
     return [res, lines];
   }
   needsDefaultInterop(asset) {
-    if (
-    // @ts-expect-error TS2345
-    asset.symbols.hasExportSymbol('*') &&
-    // @ts-expect-error TS2345
-    !asset.symbols.hasExportSymbol('default')) {
+    if (asset.symbols.hasExportSymbol('*') && !asset.symbols.hasExportSymbol('default')) {
       return true;
     }
     return false;

package/lib/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/lib/index.js

@@ -77,10 +77,8 @@ 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)
     };
   },
   async package({
@@ -103,7 +101,15 @@ 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,
+      // $FlowFixMe
+      // $FlowFixMe
+      (0, _nullthrows().default)(config).parcelRequireName,
+      // $FlowFixMe
+      (0, _nullthrows().default)(config).unstable_asyncBundleRuntime, logger) : new _DevPackager.DevPackager(options, bundleGraph, bundle,
+      // $FlowFixMe
+      // $FlowFixMe
+      (0, _nullthrows().default)(config).parcelRequireName);
       ({
         contents,
         map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.18.3-typescript-5b4d3ad41.0",
+  "version": "2.19.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,27 +9,22 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "./lib/index.js",
-  "source": "./src/index.ts",
-  "types": "./lib/index.d.ts",
+  "main": "lib/index.js",
+  "source": "src/index.js",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.2-typescript-5b4d3ad41.0",
-    "@atlaspack/feature-flags": "2.19.3-typescript-5b4d3ad41.0",
-    "@atlaspack/plugin": "2.14.21-typescript-5b4d3ad41.0",
-    "@atlaspack/rust": "3.4.2-typescript-5b4d3ad41.0",
-    "@atlaspack/types": "2.15.11-typescript-5b4d3ad41.0",
-    "@atlaspack/utils": "2.17.3-typescript-5b4d3ad41.0",
+    "@atlaspack/diagnostic": "2.14.1",
+    "@atlaspack/feature-flags": "2.20.0",
+    "@atlaspack/plugin": "2.14.21",
+    "@atlaspack/rust": "3.4.1",
     "@parcel/source-map": "^2.1.1",
+    "@atlaspack/types": "2.15.11",
+    "@atlaspack/utils": "2.17.3",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.8.0"
   },
-  "type": "commonjs",
-  "scripts": {
-    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
-  },
-  "gitHead": "5b4d3ad41ffa002b989ba77271bb3010a1f05b2a"
-}
+  "type": "commonjs"
+}

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

@@ -1,3 +1,4 @@
+// @flow
 import type {
   ScopeHoistingPackager,
   OutputFormat,