@atlaspack/runtime-js 2.14.5-canary.138 → 2.14.5-canary.139

package/lib/JSRuntime.d.ts

@@ -0,0 +1,9 @@
+import { Runtime } from '@atlaspack/plugin';
+type JSRuntimeConfig = {
+    splitManifestThreshold: number;
+    domainSharding?: {
+        maxShards: number;
+    };
+};
+declare const _default: Runtime<JSRuntimeConfig>;
+export default _default;

package/lib/JSRuntime.js

@@ -76,8 +76,10 @@ const LOADERS = {
   }
 };
 function getLoaders(ctx) {
+  // @ts-expect-error TS2322
   if (ctx.isWorker()) return LOADERS.worker;
   if (ctx.isBrowser()) return LOADERS.browser;
+  // @ts-expect-error TS2322
   if (ctx.isNode()) return LOADERS.node;
   return null;
 }
@@ -208,6 +210,8 @@ var _default = exports.default = new (_plugin().Runtime)({
       const conditions = bundleGraph.getConditionsForDependencies(conditionalDependencies, bundle);
       for (const cond of conditions) {
         const requireName = (0, _featureFlags().getFeatureFlag)('hmrImprovements') || bundle.env.shouldScopeHoist ? 'parcelRequire' : '__parcel__require__';
+
+        // @ts-expect-error TS7006
         const fallbackUrls = cond => {
           return `[${[...cond.ifTrueBundles, ...cond.ifFalseBundles].map(target => {
             let relativePathExpr = getRelativePathExpr(bundle, target, options);
@@ -280,9 +284,7 @@ var _default = exports.default = new (_plugin().Runtime)({
       }
 
       // URL dependency or not, fall back to including a runtime that exports the url
-      assets.push(getURLRuntime(dependency, bundle, mainBundle, options,
-      // $FlowFixMe
-      config.domainSharding));
+      assets.push(getURLRuntime(dependency, bundle, mainBundle, options, config.domainSharding));
     }
 
     // In development, bundles can be created lazily. This means that the parent bundle may not
@@ -300,9 +302,7 @@ var _default = exports.default = new (_plugin().Runtime)({
           continue;
         }
         let relativePathExpr = getRelativePathExpr(bundle, referencedBundle, options);
-        let loaderCode = `require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(relativePathExpr, bundle,
-        // $FlowFixMe
-        config.domainSharding)})`;
+        let loaderCode = `require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(relativePathExpr, bundle, config.domainSharding)})`;
         assets.push({
           filePath: __filename,
           code: loaderCode,
@@ -321,9 +321,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         env: {
           sourceType: 'module'
         },
-        priority: getManifestBundlePriority(bundleGraph, bundle,
-        // $FlowFixMe
-        config.splitManifestThreshold)
+        priority: getManifestBundlePriority(bundleGraph, bundle, config.splitManifestThreshold)
       });
     }
     return assets;
@@ -409,6 +407,7 @@ function getLoaderRuntime({
   let needsEsmLoadPrelude = false;
   let loaderModules = [];
   function getLoaderForBundle(bundle, to, shardingConfig) {
+    // @ts-expect-error TS18049
     let loader = loaders[to.type];
     if (!loader) {
       return;
@@ -424,7 +423,11 @@ function getLoaderRuntime({
       if (!needsDynamicImportPolyfill) {
         return `__parcel__import__("./" + ${relativePathExpr})`;
       }
-      loader = (0, _nullthrows().default)(loaders.IMPORT_POLYFILL, `No import() polyfill available for context '${bundle.env.context}'`);
+
+      // @ts-expect-error TS2322
+      loader = (0, _nullthrows().default)(
+      // @ts-expect-error TS18049
+      loaders.IMPORT_POLYFILL, `No import() polyfill available for context '${bundle.env.context}'`);
     } else if (to.type === 'js' && to.env.outputFormat === 'commonjs') {
       return `Promise.resolve(__parcel__require__("./" + ${relativePathExpr}))`;
     }
@@ -458,8 +461,16 @@ function getLoaderRuntime({
     const loaders = [];
     for (const cond of conditions) {
       // This bundle has a conditional dependency, we need to load the bundle group
-      const ifTrueLoaders = cond.ifTrueBundles.flatMap(targetBundle => getConditionalLoadersForCondition(getDependencies(targetBundle).conditionalDependencies, targetBundle)).concat(cond.ifTrueBundles.map(targetBundle => getLoaderForBundle(sourceBundle, targetBundle)));
-      const ifFalseLoaders = cond.ifFalseBundles.flatMap(targetBundle => getConditionalLoadersForCondition(getDependencies(targetBundle).conditionalDependencies, targetBundle)).concat(cond.ifFalseBundles.map(targetBundle => getLoaderForBundle(sourceBundle, targetBundle)));
+      const ifTrueLoaders = cond.ifTrueBundles.flatMap(targetBundle => getConditionalLoadersForCondition(getDependencies(targetBundle).conditionalDependencies, targetBundle)).concat(
+      // @ts-expect-error TS2769
+      cond.ifTrueBundles.map(targetBundle =>
+      // @ts-expect-error TS2554
+      getLoaderForBundle(sourceBundle, targetBundle)));
+      const ifFalseLoaders = cond.ifFalseBundles.flatMap(targetBundle => getConditionalLoadersForCondition(getDependencies(targetBundle).conditionalDependencies, targetBundle)).concat(
+      // @ts-expect-error TS2769
+      cond.ifFalseBundles.map(targetBundle =>
+      // @ts-expect-error TS2554
+      getLoaderForBundle(sourceBundle, targetBundle)));
       if (ifTrueLoaders.length > 0 || ifFalseLoaders.length > 0) {
         // Load conditional bundles with helper (and a dev mode with additional hints)
         loaders.push(`require('./helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return Promise.all([${ifTrueLoaders.join(',')}]);}, function (){return Promise.all([${ifFalseLoaders.join(',')}]);})`);
@@ -545,14 +556,16 @@ function getHintedBundleGroups(bundleGraph, bundle) {
     var _dependency$meta;
     let attributes = (_dependency$meta = dependency.meta) === null || _dependency$meta === void 0 ? void 0 : _dependency$meta.importAttributes;
     if (typeof attributes === 'object' && attributes != null && (
-    // $FlowFixMe
+    // @ts-expect-error TS2339
     attributes.preload || attributes.prefetch)) {
       let resolved = bundleGraph.resolveAsyncDependency(dependency, bundle);
       if ((resolved === null || resolved === void 0 ? void 0 : resolved.type) === 'bundle_group') {
         // === true for flow
+        // @ts-expect-error TS2339
         if (attributes.preload === true) {
           preload.push(resolved.value);
         }
+        // @ts-expect-error TS2339
         if (attributes.prefetch === true) {
           prefetch.push(resolved.value);
         }
@@ -570,8 +583,11 @@ function getHintLoaders(bundleGraph, from, bundleGroups, loader, options) {
     let bundlesToPreload = bundleGraph.getBundlesInBundleGroup(bundleGroupToPreload);
     for (let bundleToPreload of bundlesToPreload) {
       let relativePathExpr = getRelativePathExpr(from, bundleToPreload, options);
+      // @ts-expect-error TS7053
       let priority = TYPE_TO_RESOURCE_PRIORITY[bundleToPreload.type];
-      hintLoaders.push(`require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(relativePathExpr, from)}, ${priority ? JSON.stringify(priority) : 'null'}, ${JSON.stringify(bundleToPreload.target.env.outputFormat === 'esmodule')})`);
+      hintLoaders.push(
+      // @ts-expect-error TS2554
+      `require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(relativePathExpr, from)}, ${priority ? JSON.stringify(priority) : 'null'}, ${JSON.stringify(bundleToPreload.target.env.outputFormat === 'esmodule')})`);
     }
   }
   return hintLoaders;
@@ -615,6 +631,7 @@ function getURLRuntime(dependency, from, to, options, shardingConfig) {
   };
 }
 function getRegisterCode(entryBundle, bundleGraph) {
+  // @ts-expect-error TS2304
   let mappings = [];
   bundleGraph.traverseBundles((bundle, _, actions) => {
     if (bundle.bundleBehavior === 'inline') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.14.5-canary.138+eda07caaf",
+  "version": "2.14.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,19 +9,23 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/JSRuntime.js",
-  "source": "src/JSRuntime.js",
+  "main": "./lib/JSRuntime.js",
+  "source": "./src/JSRuntime.ts",
+  "types": "./lib/JSRuntime.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/domain-sharding": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/feature-flags": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/diagnostic": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/domain-sharding": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/feature-flags": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,4 +1,3 @@
-// @flow strict-local
 import type {
   BundleGraph,
   BundleGroup,
@@ -13,7 +12,7 @@ import {Runtime} from '@atlaspack/plugin';
 import {
   relativeBundlePath,
   validateSchema,
-  type SchemaEntity,
+  SchemaEntity,
 } from '@atlaspack/utils';
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import path from 'path';
@@ -24,7 +23,7 @@ import {getFeatureFlag} from '@atlaspack/feature-flags';
 const TYPE_TO_RESOURCE_PRIORITY = {
   css: 'style',
   js: 'script',
-};
+} as const;
 
 const BROWSER_PRELOAD_LOADER = './helpers/browser/preload-loader';
 const BROWSER_PREFETCH_LOADER = './helpers/browser/prefetch-loader';
@@ -49,13 +48,20 @@ const LOADERS = {
     wasm: './helpers/node/wasm-loader',
     IMPORT_POLYFILL: null,
   },
-};
+} as const;
 
-function getLoaders(
-  ctx: Environment,
-): ?{[string]: string, IMPORT_POLYFILL: null | false | string, ...} {
+function getLoaders(ctx: Environment):
+  | {
+      // @ts-expect-error TS2411
+      IMPORT_POLYFILL: null | false | string;
+      [key: string]: string;
+    }
+  | null
+  | undefined {
+  // @ts-expect-error TS2322
   if (ctx.isWorker()) return LOADERS.worker;
   if (ctx.isBrowser()) return LOADERS.browser;
+  // @ts-expect-error TS2322
   if (ctx.isNode()) return LOADERS.node;
   return null;
 }
@@ -64,19 +70,19 @@ function getLoaders(
 // This can happen when we reuse the BundleGraph between subsequent builds
 let bundleDependencies = new WeakMap<
   NamedBundle,
-  {|
-    asyncDependencies: Array<Dependency>,
-    conditionalDependencies: Array<Dependency>,
-    otherDependencies: Array<Dependency>,
-  |},
+  {
+    asyncDependencies: Array<Dependency>;
+    conditionalDependencies: Array<Dependency>;
+    otherDependencies: Array<Dependency>;
+  }
 >();
 
-type JSRuntimeConfig = {|
-  splitManifestThreshold: number,
-  domainSharding?: {|
-    maxShards: number,
-  |},
-|};
+type JSRuntimeConfig = {
+  splitManifestThreshold: number;
+  domainSharding?: {
+    maxShards: number;
+  };
+};
 
 let defaultConfig: JSRuntimeConfig = {
   splitManifestThreshold: 100000,
@@ -102,7 +108,7 @@ const CONFIG_SCHEMA: SchemaEntity = {
   additionalProperties: false,
 };
 
-export default (new Runtime({
+export default new Runtime({
   async loadConfig({config, options}): Promise<JSRuntimeConfig> {
     let packageKey = '@atlaspack/runtime-js';
     let conf = await config.getConfig<JSRuntimeConfig>([], {
@@ -144,7 +150,7 @@ export default (new Runtime({
     let {asyncDependencies, conditionalDependencies, otherDependencies} =
       getDependencies(bundle);
 
-    let assets = [];
+    let assets: Array<RuntimeAsset> = [];
     for (let dependency of asyncDependencies) {
       let resolved = bundleGraph.resolveAsyncDependency(dependency, bundle);
       if (resolved == null) {
@@ -221,6 +227,7 @@ export default (new Runtime({
             ? 'parcelRequire'
             : '__parcel__require__';
 
+        // @ts-expect-error TS7006
         const fallbackUrls = (cond) => {
           return `[${[...cond.ifTrueBundles, ...cond.ifFalseBundles]
             .map((target) => {
@@ -329,7 +336,6 @@ export default (new Runtime({
           bundle,
           mainBundle,
           options,
-          // $FlowFixMe
           config.domainSharding,
         ),
       );
@@ -361,7 +367,6 @@ export default (new Runtime({
         )})(${getAbsoluteUrlExpr(
           relativePathExpr,
           bundle,
-          // $FlowFixMe
           config.domainSharding,
         )})`;
         assets.push({
@@ -388,7 +393,6 @@ export default (new Runtime({
         priority: getManifestBundlePriority(
           bundleGraph,
           bundle,
-          // $FlowFixMe
           config.splitManifestThreshold,
         ),
       });
@@ -396,21 +400,21 @@ export default (new Runtime({
 
     return assets;
   },
-}): Runtime<JSRuntimeConfig>);
+}) as Runtime<JSRuntimeConfig>;
 
-function getDependencies(bundle: NamedBundle): {|
-  asyncDependencies: Array<Dependency>,
-  conditionalDependencies: Array<Dependency>,
-  otherDependencies: Array<Dependency>,
-|} {
+function getDependencies(bundle: NamedBundle): {
+  asyncDependencies: Array<Dependency>;
+  conditionalDependencies: Array<Dependency>;
+  otherDependencies: Array<Dependency>;
+} {
   let cachedDependencies = bundleDependencies.get(bundle);
 
   if (cachedDependencies) {
     return cachedDependencies;
   } else {
-    let asyncDependencies = [];
-    let otherDependencies = [];
-    let conditionalDependencies = [];
+    let asyncDependencies: Array<Dependency> = [];
+    let otherDependencies: Array<Dependency> = [];
+    let conditionalDependencies: Array<Dependency> = [];
     bundle.traverse((node) => {
       if (node.type !== 'dependency') {
         return;
@@ -444,14 +448,14 @@ function getLoaderRuntime({
   bundleGraph,
   options,
   shardingConfig,
-}: {|
-  bundle: NamedBundle,
-  dependency: Dependency,
-  bundleGroup: BundleGroup,
-  bundleGraph: BundleGraph<NamedBundle>,
-  options: PluginOptions,
-  shardingConfig: JSRuntimeConfig['domainSharding'],
-|}): ?RuntimeAsset {
+}: {
+  bundle: NamedBundle;
+  dependency: Dependency;
+  bundleGroup: BundleGroup;
+  bundleGraph: BundleGraph<NamedBundle>;
+  options: PluginOptions;
+  shardingConfig: JSRuntimeConfig['domainSharding'];
+}): RuntimeAsset | null | undefined {
   let loaders = getLoaders(bundle.env);
   if (loaders == null) {
     return;
@@ -503,7 +507,8 @@ function getLoaderRuntime({
     bundle: NamedBundle,
     to: NamedBundle,
     shardingConfig: JSRuntimeConfig['domainSharding'],
-  ): string | void {
+  ): string | undefined {
+    // @ts-expect-error TS18049
     let loader = loaders[to.type];
     if (!loader) {
       return;
@@ -527,7 +532,9 @@ function getLoaderRuntime({
         return `__parcel__import__("./" + ${relativePathExpr})`;
       }
 
+      // @ts-expect-error TS2322
       loader = nullthrows(
+        // @ts-expect-error TS18049
         loaders.IMPORT_POLYFILL,
         `No import() polyfill available for context '${bundle.env.context}'`,
       );
@@ -580,7 +587,7 @@ function getLoaderRuntime({
       sourceBundle,
     );
 
-    const loaders = [];
+    const loaders: Array<string> = [];
     for (const cond of conditions) {
       // This bundle has a conditional dependency, we need to load the bundle group
       const ifTrueLoaders = cond.ifTrueBundles
@@ -591,7 +598,9 @@ function getLoaderRuntime({
           ),
         )
         .concat(
+          // @ts-expect-error TS2769
           cond.ifTrueBundles.map((targetBundle) =>
+            // @ts-expect-error TS2554
             getLoaderForBundle(sourceBundle, targetBundle),
           ),
         );
@@ -604,7 +613,9 @@ function getLoaderRuntime({
           ),
         )
         .concat(
+          // @ts-expect-error TS2769
           cond.ifFalseBundles.map((targetBundle) =>
+            // @ts-expect-error TS2554
             getLoaderForBundle(sourceBundle, targetBundle),
           ),
         );
@@ -713,7 +724,7 @@ function getLoaderRuntime({
     };
   }
 
-  let code = [];
+  let code: Array<string> = [];
 
   if (needsEsmLoadPrelude) {
     let preludeLoad = shardingConfig
@@ -736,24 +747,29 @@ function getLoaderRuntime({
 function getHintedBundleGroups(
   bundleGraph: BundleGraph<NamedBundle>,
   bundle: NamedBundle,
-): {|preload: Array<BundleGroup>, prefetch: Array<BundleGroup>|} {
-  let preload = [];
-  let prefetch = [];
+): {
+  preload: Array<BundleGroup>;
+  prefetch: Array<BundleGroup>;
+} {
+  let preload: Array<BundleGroup> = [];
+  let prefetch: Array<BundleGroup> = [];
   let {asyncDependencies} = getDependencies(bundle);
   for (let dependency of asyncDependencies) {
     let attributes = dependency.meta?.importAttributes;
     if (
       typeof attributes === 'object' &&
       attributes != null &&
-      // $FlowFixMe
+      // @ts-expect-error TS2339
       (attributes.preload || attributes.prefetch)
     ) {
       let resolved = bundleGraph.resolveAsyncDependency(dependency, bundle);
       if (resolved?.type === 'bundle_group') {
         // === true for flow
+        // @ts-expect-error TS2339
         if (attributes.preload === true) {
           preload.push(resolved.value);
         }
+        // @ts-expect-error TS2339
         if (attributes.prefetch === true) {
           prefetch.push(resolved.value);
         }
@@ -771,7 +787,7 @@ function getHintLoaders(
   loader: string,
   options: PluginOptions,
 ): Array<string> {
-  let hintLoaders = [];
+  let hintLoaders: Array<string> = [];
   for (let bundleGroupToPreload of bundleGroups) {
     let bundlesToPreload =
       bundleGraph.getBundlesInBundleGroup(bundleGroupToPreload);
@@ -782,8 +798,10 @@ function getHintLoaders(
         bundleToPreload,
         options,
       );
+      // @ts-expect-error TS7053
       let priority = TYPE_TO_RESOURCE_PRIORITY[bundleToPreload.type];
       hintLoaders.push(
+        // @ts-expect-error TS2554
         `require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(
           relativePathExpr,
           from,
@@ -870,7 +888,8 @@ function getRegisterCode(
   entryBundle: NamedBundle,
   bundleGraph: BundleGraph<NamedBundle>,
 ): string {
-  let mappings = [];
+  // @ts-expect-error TS2304
+  let mappings: Array<FilePath | string> = [];
   bundleGraph.traverseBundles((bundle, _, actions) => {
     if (bundle.bundleBehavior === 'inline') {
       return;
@@ -972,7 +991,7 @@ function getManifestBundlePriority(
   bundleGraph: BundleGraph<NamedBundle>,
   bundle: NamedBundle,
   threshold: number,
-): $PropertyType<RuntimeAsset, 'priority'> {
+): RuntimeAsset['priority'] {
   let bundleSize = 0;
 
   bundle.traverseAssets((asset, _, actions) => {

package/src/helpers/browser/preload-loader.js

@@ -15,5 +15,4 @@ module.exports = cacheLoader(function preloadJSBundle(
 
   document.getElementsByTagName('head')[0].appendChild(link);
   return Promise.resolve();
-},
-'preload');
+}, 'preload');

package/test/{bundle-url.test.js → bundle-url.test.ts}

@@ -1,9 +1,8 @@
-// @flow
 import assert from 'assert';
 
 import {getBaseURL, getBundleURL} from '../src/helpers/bundle-url';
 
-const createErrorStack = (url) => {
+const createErrorStack = (url: any) => {
   // This error stack is copied from a local dev, with a bunch
   // of lines trimmed off the end so it's not unnecessarily long
   return `

package/tsconfig.json

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

package/src/helpers/browser/analytics/analytics.js.flow

@@ -1,10 +0,0 @@
-// @flow
-
-export type AtlaspackAnalyticsEvent = {|
-  action: string,
-  attributes?: {[key: string]: string | number | boolean},
-|};
-
-declare export function sendAnalyticsEvent(
-  event: AtlaspackAnalyticsEvent,
-): void;