@atlaspack/bundler-default 2.14.5-canary.138 → 2.14.5-canary.139

package/lib/DefaultBundler.d.ts

@@ -0,0 +1,18 @@
+import { Bundler } from '@atlaspack/plugin';
+/**
+ *
+ * The Bundler works by creating an IdealGraph, which contains a BundleGraph that models bundles
+ * connected to other bundles by what references them, and thus models BundleGroups.
+ *
+ * First, we enter `bundle({bundleGraph, config})`. Here, "bundleGraph" is actually just the
+ * assetGraph turned into a type `MutableBundleGraph`, which will then be mutated in decorate,
+ * and turned into what we expect the bundleGraph to be as per the old (default) bundler structure
+ *  & what the rest of Atlaspack expects a BundleGraph to be.
+ *
+ * `bundle({bundleGraph, config})` First gets a Mapping of target to entries, In most cases there is
+ *  only one target, and one or more entries. (Targets are pertinent in monorepos or projects where you
+ *  will have two or more distDirs, or output folders.) Then calls create IdealGraph and Decorate per target.
+ *
+ */
+declare const _default: Bundler<unknown>;
+export default _default;

package/lib/DefaultBundler.js

@@ -59,6 +59,7 @@ var _default = exports.default = new (_plugin().Bundler)({
     logger
   }) {
     let targetMap = getEntryByTarget(bundleGraph); // Organize entries by target output folder/ distDir
+    // @ts-expect-error TS2304
     let graphs = [];
     for (let entries of targetMap.values()) {
       let singleFileEntries = new Map();
@@ -75,9 +76,7 @@ var _default = exports.default = new (_plugin().Bundler)({
       }
 
       // Create separate bundleGraphs per distDir
-      graphs.push(
-      // $FlowFixMe
-      (0, _idealGraph.createIdealGraph)(bundleGraph, config, idealGraphEntries, logger));
+      graphs.push((0, _idealGraph.createIdealGraph)(bundleGraph, config, idealGraphEntries, logger));
 
       // Do this after the ideal graph so that the mutation of the bundleGraph doesn't
       // interfere with the main bundling algorithm
@@ -96,7 +95,11 @@ function getEntryByTarget(bundleGraph) {
   // Find entries from assetGraph per target
   let targets = new (_utils().DefaultMap)(() => new Map());
   bundleGraph.traverse({
-    enter(node, context, actions) {
+    enter(
+    // @ts-expect-error TS2304
+    node, context,
+    // @ts-expect-error TS2304
+    actions) {
       if (node.type !== 'asset') {
         return node;
       }

package/lib/MonolithicBundler.d.ts

@@ -0,0 +1,2 @@
+import type { Asset, Dependency, MutableBundleGraph } from '@atlaspack/types';
+export declare function addJSMonolithBundle(bundleGraph: MutableBundleGraph, entryAsset: Asset, entryDep: Dependency): void;

package/lib/bundleMerge.d.ts

@@ -0,0 +1,9 @@
+import type { NodeId } from '@atlaspack/graph';
+import type { IdealBundleGraph } from './idealGraph';
+export type MergeGroup = {
+    overlapThreshold?: number;
+    maxBundleSize?: number;
+    sourceBundles?: Array<NodeId>;
+    minBundlesInGroup?: number;
+};
+export declare function findMergeCandidates(bundleGraph: IdealBundleGraph, bundles: Array<NodeId>, config: Array<MergeGroup>): Array<Array<NodeId>>;

package/lib/bundleMerge.js

@@ -38,6 +38,7 @@ function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
   let count = 0;
   bundleGraph.traverse(nodeId => {
     var _bundleGraph$getNode;
+    // @ts-expect-error TS2339
     if (((_bundleGraph$getNode = bundleGraph.getNode(nodeId)) === null || _bundleGraph$getNode === void 0 ? void 0 : _bundleGraph$getNode.bundleBehavior) !== 'inline') {
       count++;
     }
@@ -118,9 +119,9 @@ function getPossibleMergeCandidates(bundleGraph, bundles) {
     for (let j = i + 1; j < mergeCandidates.length; j++) {
       let a = mergeCandidates[i];
       let b = mergeCandidates[j];
-      if (
-      // $FlowFixMe both bundles will always have internalizedAssets
-      a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)) {
+
+      // @ts-expect-error TS18048
+      if (a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)) {
         uniquePairs.push([a, b]);
       }
     }

package/lib/bundlerConfig.d.ts

@@ -0,0 +1,27 @@
+import type { Config, PluginOptions, PluginLogger } from '@atlaspack/types';
+type Glob = string;
+type ManualSharedBundles = Array<{
+    name: string;
+    assets: Array<Glob>;
+    types?: Array<string>;
+    root?: string;
+    split?: number;
+}>;
+export type MergeCandidates = Array<{
+    overlapThreshold?: number;
+    maxBundleSize?: number;
+    sourceBundles?: Array<string>;
+    minBundlesInGroup?: number;
+}>;
+export type ResolvedBundlerConfig = {
+    minBundles: number;
+    minBundleSize: number;
+    maxParallelRequests: number;
+    projectRoot: string;
+    disableSharedBundles: boolean;
+    manualSharedBundles: ManualSharedBundles;
+    loadConditionalBundlesInParallel?: boolean;
+    sharedBundleMerge?: MergeCandidates;
+};
+export declare function loadBundlerConfig(config: Config, options: PluginOptions, logger: PluginLogger): Promise<ResolvedBundlerConfig>;
+export {};

package/lib/bundlerConfig.js

@@ -39,14 +39,13 @@ function resolveModeConfig(config, mode) {
   for (const key of Object.keys(config)) {
     if (key === 'development' || key === 'production') {
       if (key === mode) {
+        // @ts-expect-error TS2322
         modeConfig = config[key];
       }
     } else {
       generalConfig[key] = config[key];
     }
   }
-
-  // $FlowFixMe Not sure how to convince flow here...
   return {
     ...generalConfig,
     ...modeConfig
@@ -172,6 +171,7 @@ async function loadBundlerConfig(config, options, logger) {
       ...HTTP_OPTIONS['2'],
       projectRoot: options.projectRoot
     };
+    // @ts-expect-error TS2322
     return modDefault;
   }
   (0, _assert().default)(((_conf = conf) === null || _conf === void 0 ? void 0 : _conf.contents) != null);
@@ -212,6 +212,7 @@ async function loadBundlerConfig(config, options, logger) {
     prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)('@atlaspack/bundler-default')}`
   }, '@atlaspack/bundler-default', 'Invalid config for @atlaspack/bundler-default');
   let http = modeConfig.http ?? 2;
+  // @ts-expect-error TS7053
   let defaults = HTTP_OPTIONS[http];
   return {
     minBundles: modeConfig.minBundles ?? defaults.minBundles,

package/lib/decorateLegacyGraph.d.ts

@@ -0,0 +1,3 @@
+import type { MutableBundleGraph } from '@atlaspack/types';
+import type { IdealGraph } from './idealGraph';
+export declare function decorateLegacyGraph(idealGraph: IdealGraph, bundleGraph: MutableBundleGraph): void;

package/lib/decorateLegacyGraph.js

@@ -179,6 +179,8 @@ function decorateLegacyGraph(idealGraph, bundleGraph) {
       bundleGraph.createAssetReference(dependency, asset, legacyBundle);
     }
   }
+
+  // @ts-expect-error TS2488
   for (let {
     type,
     from,
@@ -188,12 +190,14 @@ function decorateLegacyGraph(idealGraph, bundleGraph) {
     if (sourceBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     (0, _assert().default)(sourceBundle !== 'root');
     let legacySourceBundle = (0, _nullthrows().default)(idealBundleToLegacyBundle.get(sourceBundle));
     let targetBundle = (0, _nullthrows().default)(idealBundleGraph.getNode(to));
     if (targetBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     (0, _assert().default)(targetBundle !== 'root');
     let legacyTargetBundle = (0, _nullthrows().default)(idealBundleToLegacyBundle.get(targetBundle));
     if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && type === _idealGraph.idealBundleGraphEdges.conditional) {

package/lib/idealGraph.d.ts

@@ -0,0 +1,40 @@
+import { BitSet, ContentGraph, Graph, NodeId } from '@atlaspack/graph';
+import type { Asset, BundleBehavior, Dependency, Environment, MutableBundleGraph, Target, PluginLogger } from '@atlaspack/types';
+import { DefaultMap } from '@atlaspack/utils';
+import type { ResolvedBundlerConfig } from './bundlerConfig';
+export type Bundle = {
+    uniqueKey: string | null | undefined;
+    assets: Set<Asset>;
+    internalizedAssets?: BitSet;
+    bundleBehavior?: BundleBehavior | null | undefined;
+    needsStableName: boolean;
+    mainEntryAsset: Asset | null | undefined;
+    bundleRoots: Set<Asset>;
+    size: number;
+    sourceBundles: Set<NodeId>;
+    target: Target;
+    env: Environment;
+    type: string;
+    manualSharedBundle: string | null | undefined;
+};
+export type DependencyBundleGraph = ContentGraph<{
+    value: Bundle;
+    type: 'bundle';
+} | {
+    value: Dependency;
+    type: 'dependency';
+}, number>;
+export declare const idealBundleGraphEdges: Readonly<{
+    default: 1;
+    conditional: 2;
+}>;
+export type IdealBundleGraph = Graph<Bundle | 'root', (typeof idealBundleGraphEdges)[keyof typeof idealBundleGraphEdges]>;
+export type IdealGraph = {
+    assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>;
+    assets: Array<Asset>;
+    bundleGraph: IdealBundleGraph;
+    bundleGroupBundleIds: Set<NodeId>;
+    dependencyBundleGraph: DependencyBundleGraph;
+    manualAssetToBundle: Map<Asset, NodeId>;
+};
+export declare function createIdealGraph(assetGraph: MutableBundleGraph, config: ResolvedBundlerConfig, entries: Map<Asset, Dependency>, logger: PluginLogger): IdealGraph;

package/lib/idealGraph.js

@@ -50,6 +50,7 @@ function _nullthrows() {
 var _bundleMerge = require("./bundleMerge");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* BundleRoot - An asset that is the main entry of a Bundle. */
+
 const dependencyPriorityEdges = {
   sync: 1,
   parallel: 2,
@@ -126,6 +127,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
     let parentsToConfig = new (_utils().DefaultMap)(() => []);
     for (let c of config.manualSharedBundles) {
       if (c.root != null) {
+        // @ts-expect-error TS2345
         parentsToConfig.get(_path().default.join(config.projectRoot, c.root)).push(c);
       }
     }
@@ -162,6 +164,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           // We track all matching MSB's for constant modules as they are never duplicated
           // and need to be assigned to all matching bundles
           if (node.value.meta.isConstantModule === true) {
+            // @ts-expect-error TS2345
             constantModuleToMSB.get(node.value).push(c);
           }
           if (assetRegexes.some(regex => regex.test(projectRelativePath))) {
@@ -202,7 +205,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
    * adding only that asset to each bundle, not its entire subgraph.
    */
   assetGraph.traverse({
-    enter(node, context, actions) {
+    enter(node, context,
+    // @ts-expect-error TS2304
+    actions) {
       if (node.type === 'asset') {
         if ((context === null || context === void 0 ? void 0 : context.type) === 'dependency' && context !== null && context !== void 0 && context.value.isEntry && !entries.has(node.value)) {
           // Skip whole subtrees of other targets by skipping those entries
@@ -287,7 +292,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
             }), dependencyBundleGraph.addNodeByContentKeyIfNeeded(String(bundleId), {
               value: bundle,
               type: 'bundle'
-            }), dependencyPriorityEdges[dependency.priority]);
+            }),
+            // @ts-expect-error TS7053
+            dependencyPriorityEdges[dependency.priority]);
             if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && dependency.priority === 'conditional') {
               let [referencingBundleRoot, bundleGroupNodeId] = (0, _nullthrows().default)(stack[stack.length - 1]);
               let referencingBundleId = (0, _nullthrows().default)(bundleRoots.get(referencingBundleRoot))[0];
@@ -347,13 +354,16 @@ function createIdealGraph(assetGraph, config, entries, logger) {
             }
             assetReference.get(childAsset).push([dependency, bundle]);
           } else {
+            // @ts-expect-error TS2322
             bundleId = null;
           }
           if (manualSharedObject && bundleId != null) {
             // MSB Step 5:  At this point we've either created or found an existing MSB bundle
             // add the asset if it doesn't already have it and set key
 
-            (0, _assert().default)(bundle !== 'root' && bundle != null && bundleId != null);
+            (0, _assert().default)(
+            // @ts-expect-error TS2367
+            bundle !== 'root' && bundle != null && bundleId != null);
             manualAssetToBundle.set(childAsset, bundleId);
             if (!bundle.assets.has(childAsset)) {
               // Add asset to bundle
@@ -374,6 +384,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       }
       return node;
     },
+    // @ts-expect-error TS2322
     exit(node) {
       var _stack;
       if (((_stack = stack[stack.length - 1]) === null || _stack === void 0 ? void 0 : _stack[0]) === node.value) {
@@ -602,8 +613,11 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   }
   function assignInlineConstants(parentAsset, bundle) {
     for (let inlineConstant of inlineConstantDeps.get(parentAsset)) {
+      // @ts-expect-error TS2345
       if (!bundle.assets.has(inlineConstant)) {
+        // @ts-expect-error TS2345
         bundle.assets.add(inlineConstant);
+        // @ts-expect-error TS18046
         bundle.size += inlineConstant.stats.size;
       }
     }
@@ -819,8 +833,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       if (modNum != null) {
         for (let a of [...manualBundle.assets]) {
           let numRep = getBigIntFromContentKey(a.id);
-          // $FlowFixMe Flow doesn't know about BigInt
           let r = Number(numRep % BigInt(modNum));
+
+          // @ts-expect-error TS2345
           remainderMap.get(r).push(a);
         }
         for (let i = 1; i < [...remainderMap.keys()].length; i++) {
@@ -842,8 +857,10 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           }
           for (let sp of remainderMap.get(i)) {
             bundle.assets.add(sp);
+            // @ts-expect-error TS2339
             bundle.size += sp.stats.size;
             manualBundle.assets.delete(sp);
+            // @ts-expect-error TS2339
             manualBundle.size -= sp.stats.size;
           }
         }
@@ -856,12 +873,17 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   // match multiple MSB's
   for (let [asset, msbs] of constantModuleToMSB.entries()) {
     for (let manualSharedObject of msbs) {
+      // @ts-expect-error TS2339
       let bundleId = manualSharedMap.get(manualSharedObject.name + ',js');
       if (bundleId == null) continue;
       let bundle = (0, _nullthrows().default)(bundleGraph.getNode(bundleId));
       (0, _assert().default)(bundle != null && bundle !== 'root', 'We tried to use the root incorrectly');
+
+      // @ts-expect-error TS2345
       if (!bundle.assets.has(asset)) {
+        // @ts-expect-error TS2345
         bundle.assets.add(asset);
+        // @ts-expect-error TS18046
         bundle.size += asset.stats.size;
       }
     }
@@ -912,6 +934,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       // Merge all bundles with the same chunk name into the first one.
       let [firstBundleId, ...rest] = Array.from(bundleIds);
       for (let bundleId of rest) {
+        // @ts-expect-error TS2345
         mergeBundles(firstBundleId, bundleId);
       }
     }
@@ -947,6 +970,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       let numBundlesContributingToPRL = bundleIdsInGroup.reduce((count, b) => {
         let bundle = (0, _nullthrows().default)(bundleGraph.getNode(b));
         (0, _assert().default)(bundle !== 'root');
+        // @ts-expect-error TS2365
         return count + (bundle.bundleBehavior !== 'inline');
       }, 0);
       if (numBundlesContributingToPRL > config.maxParallelRequests) {
@@ -976,7 +1000,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
         // Remove bundles until the bundle group is within the parallel request limit.
         while (sharedBundlesInGroup.length > 0 && numBundlesContributingToPRL > config.maxParallelRequests) {
           let bundleTuple = sharedBundlesInGroup.pop();
+          // @ts-expect-error TS18048
           let bundleToRemove = bundleTuple.bundle;
+          // @ts-expect-error TS18048
           let bundleIdToRemove = bundleTuple.id;
           //TODO add integration test where bundles in bunlde group > max parallel request limit & only remove a couple shared bundles
           // but total # bundles still exceeds limit due to non shared bundles
@@ -1027,6 +1053,8 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       bundleToKeep.assets.add(asset);
       bundleToKeep.size += asset.stats.size;
       let newAssetReference = assetReference.get(asset).map(([dep, bundle]) => bundle === bundleToRemove ? [dep, bundleToKeep] : [dep, bundle]);
+
+      // @ts-expect-error TS2345
       assetReference.set(asset, newAssetReference);
     }
 
@@ -1161,7 +1189,6 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   function getBigIntFromContentKey(contentKey) {
     let b = Buffer.alloc(64);
     b.write(contentKey);
-    // $FlowFixMe Flow doesn't have BigInt types in this version
     return b.readBigInt64BE();
   }
   // Fix asset order in source bundles as they are likely now incorrect after shared bundle deletion

package/lib/memoize.d.ts

@@ -0,0 +1,2 @@
+export declare function clearCaches(): void;
+export declare function memoize<Args extends Array<unknown>, Return>(fn: (...args: Args) => Return): (...args: Args) => Return;

package/lib/memoize.js

@@ -13,7 +13,6 @@ function _manyKeysMap() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// $FlowFixMe
 let caches = [];
 function clearCaches() {
   for (let cache of caches) {
@@ -32,8 +31,8 @@ function memoize(fn) {
     }
 
     // Calculate the result and cache it
+    // @ts-expect-error TS2683
     const result = fn.apply(this, args);
-    // $FlowFixMe
     cache.set(args, result);
     return result;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.14.5-canary.138+eda07caaf",
+  "version": "2.14.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -10,20 +10,24 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/DefaultBundler.js",
-  "source": "src/DefaultBundler.js",
+  "main": "./lib/DefaultBundler.js",
+  "source": "./src/DefaultBundler.ts",
+  "types": "./lib/DefaultBundler.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/feature-flags": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/graph": "3.4.1-canary.206+eda07caaf",
-    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/rust": "3.2.1-canary.138+eda07caaf",
-    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/diagnostic": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/feature-flags": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/graph": "3.4.1-canary.207+d2fd84977",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/rust": "3.2.1-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
     "many-keys-map": "^1.0.3",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {Bundler} from '@atlaspack/plugin';
 import type {Asset, Dependency, MutableBundleGraph} from '@atlaspack/types';
 import {DefaultMap} from '@atlaspack/utils';
@@ -25,14 +23,15 @@ import {addJSMonolithBundle} from './MonolithicBundler';
  *  will have two or more distDirs, or output folders.) Then calls create IdealGraph and Decorate per target.
  *
  */
-export default (new Bundler({
+export default new Bundler({
   loadConfig({config, options, logger}) {
     return loadBundlerConfig(config, options, logger);
   },
 
   bundle({bundleGraph, config, logger}) {
     let targetMap = getEntryByTarget(bundleGraph); // Organize entries by target output folder/ distDir
-    let graphs = [];
+    // @ts-expect-error TS2304
+    let graphs: Array<IdealGraph> = [];
 
     for (let entries of targetMap.values()) {
       let singleFileEntries = new Map();
@@ -49,7 +48,6 @@ export default (new Bundler({
 
       // Create separate bundleGraphs per distDir
       graphs.push(
-        // $FlowFixMe
         createIdealGraph(bundleGraph, config, idealGraphEntries, logger),
       );
 
@@ -65,7 +63,7 @@ export default (new Bundler({
     }
   },
   optimize() {},
-}): Bundler<mixed>);
+}) as Bundler<unknown>;
 
 function getEntryByTarget(
   bundleGraph: MutableBundleGraph,
@@ -75,7 +73,23 @@ function getEntryByTarget(
     () => new Map(),
   );
   bundleGraph.traverse({
-    enter(node, context, actions) {
+    enter(
+      // @ts-expect-error TS2304
+      node: BundleGraphTraversable,
+      context:
+        | {
+            readonly type: 'asset';
+            value: Asset;
+          }
+        | null
+        | undefined
+        | {
+            readonly type: 'dependency';
+            value: Dependency;
+          },
+      // @ts-expect-error TS2304
+      actions: TraversalActions,
+    ) {
       if (node.type !== 'asset') {
         return node;
       }

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

@@ -1,4 +1,3 @@
-// @flow strict-local
 import type {Asset, Dependency, MutableBundleGraph} from '@atlaspack/types';
 import nullthrows from 'nullthrows';
 

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
 import {ContentGraph} from '@atlaspack/graph';
@@ -14,6 +12,7 @@ function getBundlesForBundleGroup(
 ): number {
   let count = 0;
   bundleGraph.traverse((nodeId) => {
+    // @ts-expect-error TS2339
     if (bundleGraph.getNode(nodeId)?.bundleBehavior !== 'inline') {
       count++;
     }
@@ -125,7 +124,7 @@ function getMergeClusters(
   graph: ContentGraph<NodeId, EdgeType>,
   candidates: Map<NodeId, EdgeType>,
 ): Array<Array<NodeId>> {
-  let clusters = [];
+  let clusters: Array<Array<NodeId>> = [];
 
   for (let [candidate, edgeType] of candidates.entries()) {
     let cluster: Array<NodeId> = [];
@@ -145,11 +144,11 @@ function getMergeClusters(
   return clusters;
 }
 
-type MergeCandidate = {|
-  bundle: Bundle,
-  id: NodeId,
-  contentKey: string,
-|};
+type MergeCandidate = {
+  bundle: Bundle;
+  id: NodeId;
+  contentKey: string;
+};
 function getPossibleMergeCandidates(
   bundleGraph: IdealBundleGraph,
   bundles: Array<NodeId>,
@@ -165,17 +164,15 @@ function getPossibleMergeCandidates(
     };
   });
 
-  const uniquePairs = [];
+  const uniquePairs: Array<[MergeCandidate, MergeCandidate]> = [];
 
   for (let i = 0; i < mergeCandidates.length; i++) {
     for (let j = i + 1; j < mergeCandidates.length; j++) {
       let a = mergeCandidates[i];
       let b = mergeCandidates[j];
 
-      if (
-        // $FlowFixMe both bundles will always have internalizedAssets
-        a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)
-      ) {
+      // @ts-expect-error TS18048
+      if (a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)) {
         uniquePairs.push([a, b]);
       }
     }
@@ -183,12 +180,12 @@ function getPossibleMergeCandidates(
   return uniquePairs;
 }
 
-export type MergeGroup = {|
-  overlapThreshold?: number,
-  maxBundleSize?: number,
-  sourceBundles?: Array<NodeId>,
-  minBundlesInGroup?: number,
-|};
+export type MergeGroup = {
+  overlapThreshold?: number;
+  maxBundleSize?: number;
+  sourceBundles?: Array<NodeId>;
+  minBundlesInGroup?: number;
+};
 type EdgeType = number;
 
 export function findMergeCandidates(

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import type {
   Config,
@@ -8,62 +6,62 @@ import type {
   PluginLogger,
 } from '@atlaspack/types';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
-import {type SchemaEntity, validateSchema} from '@atlaspack/utils';
+import {SchemaEntity, validateSchema} from '@atlaspack/utils';
 import invariant from 'assert';
 
 type Glob = string;
 
-type ManualSharedBundles = Array<{|
-  name: string,
-  assets: Array<Glob>,
-  types?: Array<string>,
-  root?: string,
-  split?: number,
-|}>;
+type ManualSharedBundles = Array<{
+  name: string;
+  assets: Array<Glob>;
+  types?: Array<string>;
+  root?: string;
+  split?: number;
+}>;
 
-export type MergeCandidates = Array<{|
-  overlapThreshold?: number,
-  maxBundleSize?: number,
-  sourceBundles?: Array<string>,
-  minBundlesInGroup?: number,
-|}>;
+export type MergeCandidates = Array<{
+  overlapThreshold?: number;
+  maxBundleSize?: number;
+  sourceBundles?: Array<string>;
+  minBundlesInGroup?: number;
+}>;
 
-type BaseBundlerConfig = {|
-  http?: number,
-  minBundles?: number,
-  minBundleSize?: number,
-  maxParallelRequests?: number,
-  disableSharedBundles?: boolean,
-  manualSharedBundles?: ManualSharedBundles,
-  loadConditionalBundlesInParallel?: boolean,
-  sharedBundleMerge?: MergeCandidates,
-|};
+type BaseBundlerConfig = {
+  http?: number;
+  minBundles?: number;
+  minBundleSize?: number;
+  maxParallelRequests?: number;
+  disableSharedBundles?: boolean;
+  manualSharedBundles?: ManualSharedBundles;
+  loadConditionalBundlesInParallel?: boolean;
+  sharedBundleMerge?: MergeCandidates;
+};
 
-type BundlerConfig = {|
-  [mode: BuildMode]: BaseBundlerConfig,
-|} & BaseBundlerConfig;
+type BundlerConfig = Partial<Record<BuildMode, BaseBundlerConfig>> &
+  BaseBundlerConfig;
 
-export type ResolvedBundlerConfig = {|
-  minBundles: number,
-  minBundleSize: number,
-  maxParallelRequests: number,
-  projectRoot: string,
-  disableSharedBundles: boolean,
-  manualSharedBundles: ManualSharedBundles,
-  loadConditionalBundlesInParallel?: boolean,
-  sharedBundleMerge?: MergeCandidates,
-|};
+export type ResolvedBundlerConfig = {
+  minBundles: number;
+  minBundleSize: number;
+  maxParallelRequests: number;
+  projectRoot: string;
+  disableSharedBundles: boolean;
+  manualSharedBundles: ManualSharedBundles;
+  loadConditionalBundlesInParallel?: boolean;
+  sharedBundleMerge?: MergeCandidates;
+};
 
 function resolveModeConfig(
   config: BundlerConfig,
   mode: BuildMode,
 ): BaseBundlerConfig {
-  let generalConfig = {};
-  let modeConfig = {};
+  let generalConfig: Record<string, any> = {};
+  let modeConfig: Record<string, any> = {};
 
   for (const key of Object.keys(config)) {
     if (key === 'development' || key === 'production') {
       if (key === mode) {
+        // @ts-expect-error TS2322
         modeConfig = config[key];
       }
     } else {
@@ -71,7 +69,6 @@ function resolveModeConfig(
     }
   }
 
-  // $FlowFixMe Not sure how to convince flow here...
   return {
     ...generalConfig,
     ...modeConfig,
@@ -96,7 +93,7 @@ const HTTP_OPTIONS = {
     disableSharedBundles: false,
     sharedBundleMerge: [],
   },
-};
+} as const;
 
 const CONFIG_SCHEMA: SchemaEntity = {
   type: 'object',
@@ -203,7 +200,8 @@ export async function loadBundlerConfig(
     const modDefault = {
       ...HTTP_OPTIONS['2'],
       projectRoot: options.projectRoot,
-    };
+    } as const;
+    // @ts-expect-error TS2322
     return modDefault;
   }
 
@@ -266,6 +264,7 @@ export async function loadBundlerConfig(
   );
 
   let http = modeConfig.http ?? 2;
+  // @ts-expect-error TS7053
   let defaults = HTTP_OPTIONS[http];
 
   return {

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

@@ -1,6 +1,4 @@
-// @flow strict-local
-
-import {ALL_EDGE_TYPES, type NodeId} from '@atlaspack/graph';
+import {ALL_EDGE_TYPES, NodeId} from '@atlaspack/graph';
 import type {
   Bundle as LegacyBundle,
   BundleGroup,
@@ -213,11 +211,13 @@ export function decorateLegacyGraph(
     }
   }
 
+  // @ts-expect-error TS2488
   for (let {type, from, to} of idealBundleGraph.getAllEdges()) {
     let sourceBundle = nullthrows(idealBundleGraph.getNode(from));
     if (sourceBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     invariant(sourceBundle !== 'root');
 
     let legacySourceBundle = nullthrows(
@@ -228,6 +228,7 @@ export function decorateLegacyGraph(
     if (targetBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     invariant(targetBundle !== 'root');
     let legacyTargetBundle = nullthrows(
       idealBundleToLegacyBundle.get(targetBundle),

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import path from 'path';
 
 import {getFeatureFlag} from '@atlaspack/feature-flags';
@@ -8,7 +6,7 @@ import {
   BitSet,
   ContentGraph,
   Graph,
-  type NodeId,
+  NodeId,
 } from '@atlaspack/graph';
 import type {
   Asset,
@@ -23,38 +21,38 @@ import {DefaultMap, globToRegex} from '@atlaspack/utils';
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
 
-import {findMergeCandidates, type MergeGroup} from './bundleMerge';
+import {findMergeCandidates, MergeGroup} from './bundleMerge';
 import type {ResolvedBundlerConfig, MergeCandidates} from './bundlerConfig';
 
 /* BundleRoot - An asset that is the main entry of a Bundle. */
 type BundleRoot = Asset;
 
-export type Bundle = {|
-  uniqueKey: ?string,
-  assets: Set<Asset>,
-  internalizedAssets?: BitSet,
-  bundleBehavior?: ?BundleBehavior,
-  needsStableName: boolean,
-  mainEntryAsset: ?Asset,
-  bundleRoots: Set<Asset>,
-  size: number,
-  sourceBundles: Set<NodeId>,
-  target: Target,
-  env: Environment,
-  type: string,
-  manualSharedBundle: ?string, // for naming purposes
-|};
+export type Bundle = {
+  uniqueKey: string | null | undefined;
+  assets: Set<Asset>;
+  internalizedAssets?: BitSet;
+  bundleBehavior?: BundleBehavior | null | undefined;
+  needsStableName: boolean;
+  mainEntryAsset: Asset | null | undefined;
+  bundleRoots: Set<Asset>;
+  size: number;
+  sourceBundles: Set<NodeId>;
+  target: Target;
+  env: Environment;
+  type: string;
+  manualSharedBundle: string | null | undefined; // for naming purposes;
+};
 
 export type DependencyBundleGraph = ContentGraph<
-  | {|
-      value: Bundle,
-      type: 'bundle',
-    |}
-  | {|
-      value: Dependency,
-      type: 'dependency',
-    |},
-  number,
+  | {
+      value: Bundle;
+      type: 'bundle';
+    }
+  | {
+      value: Dependency;
+      type: 'dependency';
+    },
+  number
 >;
 
 const dependencyPriorityEdges = {
@@ -62,7 +60,7 @@ const dependencyPriorityEdges = {
   parallel: 2,
   lazy: 3,
   conditional: 4,
-};
+} as const;
 
 export const idealBundleGraphEdges = Object.freeze({
   default: 1,
@@ -71,20 +69,20 @@ export const idealBundleGraphEdges = Object.freeze({
 
 export type IdealBundleGraph = Graph<
   Bundle | 'root',
-  $Values<typeof idealBundleGraphEdges>,
+  (typeof idealBundleGraphEdges)[keyof typeof idealBundleGraphEdges]
 >;
 
 // IdealGraph is the structure we will pass to decorate,
 // which mutates the assetGraph into the bundleGraph we would
 // expect from default bundler
-export type IdealGraph = {|
-  assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>,
-  assets: Array<Asset>,
-  bundleGraph: IdealBundleGraph,
-  bundleGroupBundleIds: Set<NodeId>,
-  dependencyBundleGraph: DependencyBundleGraph,
-  manualAssetToBundle: Map<Asset, NodeId>,
-|};
+export type IdealGraph = {
+  assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>;
+  assets: Array<Asset>;
+  bundleGraph: IdealBundleGraph;
+  bundleGroupBundleIds: Set<NodeId>;
+  dependencyBundleGraph: DependencyBundleGraph;
+  manualAssetToBundle: Map<Asset, NodeId>;
+};
 
 function isNonRootBundle(
   bundle?: Bundle | 'root' | null,
@@ -108,7 +106,7 @@ export function createIdealGraph(
   let dependencyBundleGraph: DependencyBundleGraph = new ContentGraph();
   let assetReference: DefaultMap<
     Asset,
-    Array<[Dependency, Bundle]>,
+    Array<[Dependency, Bundle]>
   > = new DefaultMap(() => []);
 
   // A Graph of Bundles and a root node (dummy string), which models only Bundles, and connections to their
@@ -122,8 +120,9 @@ export function createIdealGraph(
   };
   // Graph that models bundleRoots, with parallel & async deps only to inform reachability
   let bundleRootGraph: Graph<
-    number, // asset index
-    $Values<typeof bundleRootEdgeTypes>,
+    // asset index
+    number,
+    (typeof bundleRootEdgeTypes)[keyof typeof bundleRootEdgeTypes]
   > = new Graph();
   let assetToBundleRootNodeId = new Map<BundleRoot, number>();
 
@@ -157,7 +156,7 @@ export function createIdealGraph(
     bundleGroupBundleIds.add(nodeId);
   }
 
-  let assets = [];
+  let assets: Array<Asset> = [];
   let assetToIndex = new Map<Asset, number>();
 
   function makeManualAssetToConfigLookup() {
@@ -172,6 +171,7 @@ export function createIdealGraph(
 
     for (let c of config.manualSharedBundles) {
       if (c.root != null) {
+        // @ts-expect-error TS2345
         parentsToConfig.get(path.join(config.projectRoot, c.root)).push(c);
       }
     }
@@ -219,6 +219,7 @@ export function createIdealGraph(
           // We track all matching MSB's for constant modules as they are never duplicated
           // and need to be assigned to all matching bundles
           if (node.value.meta.isConstantModule === true) {
+            // @ts-expect-error TS2345
             constantModuleToMSB.get(node.value).push(c);
           }
 
@@ -252,14 +253,14 @@ export function createIdealGraph(
     makeManualAssetToConfigLookup();
   let manualBundleToInternalizedAsset: DefaultMap<
     NodeId,
-    Array<Asset>,
+    Array<Asset>
   > = new DefaultMap(() => []);
 
   let mergeSourceBundleLookup = new Map<string, NodeId>();
   let mergeSourceBundleAssets = new Set(
     config.sharedBundleMerge?.flatMap(
       (c) =>
-        c.sourceBundles?.map((assetMatch) =>
+        c.sourceBundles?.map((assetMatch: string) =>
           path.join(config.projectRoot, assetMatch),
         ) ?? [],
     ),
@@ -272,7 +273,27 @@ export function createIdealGraph(
    */
   assetGraph.traverse(
     {
-      enter(node, context, actions) {
+      enter(
+        node: // @ts-expect-error TS2304
+        | BundleGraphTraversable
+          | {
+              readonly type: 'dependency';
+              value: Dependency;
+            },
+        context:
+          | {
+              readonly type: 'asset';
+              value: Asset;
+            }
+          | null
+          | undefined
+          | {
+              readonly type: 'dependency';
+              value: Dependency;
+            },
+        // @ts-expect-error TS2304
+        actions: TraversalActions,
+      ) {
         if (node.type === 'asset') {
           if (
             context?.type === 'dependency' &&
@@ -399,6 +420,7 @@ export function createIdealGraph(
                     type: 'bundle',
                   },
                 ),
+                // @ts-expect-error TS7053
                 dependencyPriorityEdges[dependency.priority],
               );
 
@@ -510,6 +532,7 @@ export function createIdealGraph(
 
               assetReference.get(childAsset).push([dependency, bundle]);
             } else {
+              // @ts-expect-error TS2322
               bundleId = null;
             }
             if (manualSharedObject && bundleId != null) {
@@ -517,6 +540,7 @@ export function createIdealGraph(
               // add the asset if it doesn't already have it and set key
 
               invariant(
+                // @ts-expect-error TS2367
                 bundle !== 'root' && bundle != null && bundleId != null,
               );
 
@@ -543,7 +567,8 @@ export function createIdealGraph(
         }
         return node;
       },
-      exit(node) {
+      // @ts-expect-error TS2322
+      exit(node: BundleGraphTraversable) {
         if (stack[stack.length - 1]?.[0] === node.value) {
           stack.pop();
         }
@@ -592,20 +617,20 @@ export function createIdealGraph(
 
   // reachableRoots is an array of bit sets for each asset. Each bit set
   // indicates which bundle roots are reachable from that asset synchronously.
-  let reachableRoots = [];
+  let reachableRoots: Array<BitSet> = [];
   for (let i = 0; i < assets.length; i++) {
     reachableRoots.push(new BitSet(bundleRootGraph.nodes.length));
   }
 
   // reachableAssets is the inverse mapping of reachableRoots. For each bundle root,
   // it contains a bit set that indicates which assets are reachable from it.
-  let reachableAssets = [];
+  let reachableAssets: Array<BitSet> = [];
 
   // ancestorAssets maps bundle roots to the set of all assets available to it at runtime,
   // including in earlier parallel bundles. These are intersected through all paths to
   // the bundle to ensure that the available assets are always present no matter in which
   // order the bundles are loaded.
-  let ancestorAssets = [];
+  let ancestorAssets: Array<null | BitSet> = [];
 
   let inlineConstantDeps = new DefaultMap(() => new Set());
 
@@ -834,8 +859,11 @@ export function createIdealGraph(
 
   function assignInlineConstants(parentAsset: Asset, bundle: Bundle) {
     for (let inlineConstant of inlineConstantDeps.get(parentAsset)) {
+      // @ts-expect-error TS2345
       if (!bundle.assets.has(inlineConstant)) {
+        // @ts-expect-error TS2345
         bundle.assets.add(inlineConstant);
+        // @ts-expect-error TS18046
         bundle.size += inlineConstant.stats.size;
       }
     }
@@ -895,7 +923,7 @@ export function createIdealGraph(
       let bundle;
       let bundleId;
       let manualSharedBundleKey = manualSharedObject.name + ',' + asset.type;
-      let sourceBundles = [];
+      let sourceBundles: Array<NodeId> = [];
       reachable.forEach((id) => {
         sourceBundles.push(nullthrows(bundleRoots.get(assets[id]))[0]);
       });
@@ -1010,7 +1038,7 @@ export function createIdealGraph(
       });
     }
 
-    let reachableArray = [];
+    let reachableArray: Array<Asset> = [];
     reachable.forEach((id) => {
       reachableArray.push(assets[id]);
     });
@@ -1105,9 +1133,9 @@ export function createIdealGraph(
       if (modNum != null) {
         for (let a of [...manualBundle.assets]) {
           let numRep = getBigIntFromContentKey(a.id);
-          // $FlowFixMe Flow doesn't know about BigInt
           let r = Number(numRep % BigInt(modNum));
 
+          // @ts-expect-error TS2345
           remainderMap.get(r).push(a);
         }
 
@@ -1130,8 +1158,10 @@ export function createIdealGraph(
           }
           for (let sp of remainderMap.get(i)) {
             bundle.assets.add(sp);
+            // @ts-expect-error TS2339
             bundle.size += sp.stats.size;
             manualBundle.assets.delete(sp);
+            // @ts-expect-error TS2339
             manualBundle.size -= sp.stats.size;
           }
         }
@@ -1144,6 +1174,7 @@ export function createIdealGraph(
   // match multiple MSB's
   for (let [asset, msbs] of constantModuleToMSB.entries()) {
     for (let manualSharedObject of msbs) {
+      // @ts-expect-error TS2339
       let bundleId = manualSharedMap.get(manualSharedObject.name + ',js');
       if (bundleId == null) continue;
       let bundle = nullthrows(bundleGraph.getNode(bundleId));
@@ -1152,8 +1183,11 @@ export function createIdealGraph(
         'We tried to use the root incorrectly',
       );
 
+      // @ts-expect-error TS2345
       if (!bundle.assets.has(asset)) {
+        // @ts-expect-error TS2345
         bundle.assets.add(asset);
+        // @ts-expect-error TS18046
         bundle.size += asset.stats.size;
       }
     }
@@ -1227,6 +1261,7 @@ export function createIdealGraph(
       // Merge all bundles with the same chunk name into the first one.
       let [firstBundleId, ...rest] = Array.from(bundleIds);
       for (let bundleId of rest) {
+        // @ts-expect-error TS2345
         mergeBundles(firstBundleId, bundleId);
       }
     }
@@ -1267,6 +1302,7 @@ export function createIdealGraph(
       let numBundlesContributingToPRL = bundleIdsInGroup.reduce((count, b) => {
         let bundle = nullthrows(bundleGraph.getNode(b));
         invariant(bundle !== 'root');
+        // @ts-expect-error TS2365
         return count + (bundle.bundleBehavior !== 'inline');
       }, 0);
 
@@ -1302,7 +1338,9 @@ export function createIdealGraph(
           numBundlesContributingToPRL > config.maxParallelRequests
         ) {
           let bundleTuple = sharedBundlesInGroup.pop();
+          // @ts-expect-error TS18048
           let bundleToRemove = bundleTuple.bundle;
+          // @ts-expect-error TS18048
           let bundleIdToRemove = bundleTuple.id;
           //TODO add integration test where bundles in bunlde group > max parallel request limit & only remove a couple shared bundles
           // but total # bundles still exceeds limit due to non shared bundles
@@ -1374,10 +1412,11 @@ export function createIdealGraph(
 
       let newAssetReference = assetReference
         .get(asset)
-        .map(([dep, bundle]) =>
+        .map(([dep, bundle]: [any, any]) =>
           bundle === bundleToRemove ? [dep, bundleToKeep] : [dep, bundle],
         );
 
+      // @ts-expect-error TS2345
       assetReference.set(asset, newAssetReference);
     }
 
@@ -1541,20 +1580,22 @@ export function createIdealGraph(
     let clusters = findMergeCandidates(
       bundleGraph,
       Array.from(sharedBundles),
-      mergeConfig.map((config): MergeGroup => ({
-        ...config,
-        sourceBundles: config.sourceBundles?.map((assetMatch) => {
-          let sourceBundleNodeId = mergeSourceBundleLookup.get(assetMatch);
-
-          if (sourceBundleNodeId == null) {
-            throw new Error(
-              `Source bundle ${assetMatch} not found in merge source bundle lookup`,
-            );
-          }
+      mergeConfig.map(
+        (config): MergeGroup => ({
+          ...config,
+          sourceBundles: config.sourceBundles?.map((assetMatch: string) => {
+            let sourceBundleNodeId = mergeSourceBundleLookup.get(assetMatch);
+
+            if (sourceBundleNodeId == null) {
+              throw new Error(
+                `Source bundle ${assetMatch} not found in merge source bundle lookup`,
+              );
+            }
 
-          return sourceBundleNodeId;
+            return sourceBundleNodeId;
+          }),
         }),
-      })),
+      ),
     );
 
     let mergedBundles = new Set();
@@ -1574,10 +1615,9 @@ export function createIdealGraph(
     }
   }
 
-  function getBigIntFromContentKey(contentKey) {
+  function getBigIntFromContentKey(contentKey: string) {
     let b = Buffer.alloc(64);
     b.write(contentKey);
-    // $FlowFixMe Flow doesn't have BigInt types in this version
     return b.readBigInt64BE();
   }
   // Fix asset order in source bundles as they are likely now incorrect after shared bundle deletion
@@ -1604,8 +1644,8 @@ export function createIdealGraph(
       bundleRootGraph.removeNode(bundleRootId);
     }
   }
-  function getBundlesForBundleGroup(bundleGroupId) {
-    let bundlesInABundleGroup = [];
+  function getBundlesForBundleGroup(bundleGroupId: NodeId) {
+    let bundlesInABundleGroup: Array<NodeId> = [];
     bundleGraph.traverse((nodeId) => {
       bundlesInABundleGroup.push(nodeId);
     }, bundleGroupId);
@@ -1686,17 +1726,17 @@ export function createIdealGraph(
   };
 }
 
-function createBundle(opts: {|
-  asset?: Asset,
-  bundleBehavior?: ?BundleBehavior,
-  env?: Environment,
-  manualSharedBundle?: ?string,
-  needsStableName?: boolean,
-  sourceBundles?: Set<NodeId>,
-  target: Target,
-  type?: string,
-  uniqueKey?: string,
-|}): Bundle {
+function createBundle(opts: {
+  asset?: Asset;
+  bundleBehavior?: BundleBehavior | null | undefined;
+  env?: Environment;
+  manualSharedBundle?: string | null | undefined;
+  needsStableName?: boolean;
+  sourceBundles?: Set<NodeId>;
+  target: Target;
+  type?: string;
+  uniqueKey?: string;
+}): Bundle {
   if (opts.asset == null) {
     return {
       assets: new Set(),

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

@@ -1,9 +1,6 @@
-// @flow strict
-
-// $FlowFixMe
 import ManyKeysMap from 'many-keys-map';
 
-let caches = [];
+let caches: Array<any> = [];
 
 export function clearCaches() {
   for (let cache of caches) {
@@ -11,7 +8,7 @@ export function clearCaches() {
   }
 }
 
-export function memoize<Args: Array<mixed>, Return>(
+export function memoize<Args extends Array<unknown>, Return>(
   fn: (...args: Args) => Return,
 ): (...args: Args) => Return {
   let cache = new ManyKeysMap();
@@ -26,8 +23,8 @@ export function memoize<Args: Array<mixed>, Return>(
     }
 
     // Calculate the result and cache it
+    // @ts-expect-error TS2683
     const result = fn.apply(this, args);
-    // $FlowFixMe
     cache.set(args, result);
 
     return result;

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}