@mui/internal-code-infra 0.0.4-canary.99 → 0.1.1-canary.1

package/src/cli/cmdBuild.mjs

@@ -1,20 +1,20 @@
 /* eslint-disable no-console */
 import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
-import { $ } from 'execa';
 import { globby } from 'globby';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { sep as posixSep } from 'node:path/posix';
 import * as semver from 'semver';
+import { mapAsync } from 'es-toolkit/array';
 
 import {
   createPackageBin,
   createPackageExports,
   createPackageImports,
   getOutExtension,
-  mapConcurrently,
   validatePkgJson,
 } from '../utils/build.mjs';
+import { readPnpmConfig } from '../utils/pnpm.mjs';
 
 /**
  * @typedef {Object} Args
@@ -30,7 +30,7 @@ import {
  * @property {string[]} ignore - Globs to be ignored by Babel.
  * @property {string[]} [copy] - Files/Directories to be copied. Can be a glob pattern.
  * @property {boolean} [enableReactCompiler] - Whether to use the React compiler.
- * @property {boolean} [tsgo] - Whether to build types using typescript native (tsgo).
+ * @property {boolean} [tsgo] - Whether to build types using the native TypeScript compiler.
  * @property {boolean} [flat] - Deprecated no-op; flat builds are always used.
  * @property {boolean} expand - Whether to enumerate glob patterns in exports/imports into concrete entries.
  */
@@ -229,9 +229,9 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       })
       .option('tsgo', {
         type: 'boolean',
-        default: process.env.MUI_USE_TSGO,
+        default: false,
         description:
-          'Uses tsgo cli instead of tsc for type generation. Can also be set via env var "MUI_USE_TSGO"',
+          'Use the native TypeScript compiler instead of the TS6 JS compiler for type generation',
       })
       .option('flat', {
         type: 'boolean',
@@ -279,8 +279,7 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     if (babelRuntimeVersion === 'catalog:') {
       // resolve the version from the given package
       // outputs the pnpm-workspace.yaml config as json
-      const { stdout: configStdout } = await $`pnpm config list --json`;
-      const pnpmWorkspaceConfig = JSON.parse(configStdout);
+      const pnpmWorkspaceConfig = await readPnpmConfig();
       babelRuntimeVersion = pnpmWorkspaceConfig.catalog['@babel/runtime'];
     }
 
@@ -479,7 +478,7 @@ async function copyHandler({ cwd, globs = [], buildDir, verbose = false }) {
       console.log('⓿ No files to copy.');
     }
   }
-  await mapConcurrently(
+  await mapAsync(
     defaultFiles,
     async (file) => {
       if (typeof file === 'string') {
@@ -492,7 +491,7 @@ async function copyHandler({ cwd, globs = [], buildDir, verbose = false }) {
         await recursiveCopy({ source: file.sourcePath, target: file.targetPath, verbose });
       }
     },
-    20,
+    { concurrency: 20 },
   );
   console.log(`📋 Copied ${defaultFiles.length} files.`);
 }

package/src/cli/cmdCopyFiles.mjs

@@ -2,7 +2,7 @@ import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
 import { globby } from 'globby';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
 
 /**
  * @typedef {Object} Args
@@ -106,12 +106,12 @@ async function processGlobs({ globs, cwd, silent = true, buildDir }) {
     });
   });
 
-  await mapConcurrently(
+  await mapAsync(
     filesToProcess,
     async (file) => {
       await recursiveCopy({ source: file.sourcePath, target: file.targetPath, silent });
     },
-    50,
+    { concurrency: 50 },
   );
   return filesToProcess.length;
 }

package/src/cli/cmdListWorkspaces.mjs

@@ -6,14 +6,12 @@
  * @typedef {import('../utils/pnpm.mjs').PublicPackage} PublicPackage
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import { getWorkspacePackages } from '../utils/pnpm.mjs';
 
 /**
  * @typedef {Object} Args
  * @property {boolean} [publicOnly] - Whether to filter to only public packages
- * @property {'json'|'path'|'name'|'publish-dir'} [output] - Output format (name, path, or json)
+ * @property {'json'|'path'|'name'} [output] - Output format (name, path, or json)
  * @property {string} [sinceRef] - Git reference to filter changes since
  * @property {string[]} [filter] - Same as filtering packages with --filter in pnpm. Only include packages matching the filter. See https://pnpm.io/filtering.
  */
@@ -30,10 +28,10 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       })
       .option('output', {
         type: 'string',
-        choices: ['json', 'path', 'name', 'publish-dir'],
+        choices: ['json', 'path', 'name'],
         default: 'path',
         description:
-          'Output format: name (package names), path (package paths), publish-dir (publish directories), or json (full JSON)',
+          'Output format: name (package names), path (package paths), or json (full JSON)',
       })
       .option('since-ref', {
         type: 'string',
@@ -60,32 +58,6 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       packages.forEach((pkg) => {
         console.log(pkg.path);
       });
-    } else if (output === 'publish-dir') {
-      // Works around https://github.com/stackblitz-labs/pkg.pr.new/issues/389: pkg-pr-new rewrites
-      // workspace:* deps to its URLs in the source package.json, but `pnpm pack` honors
-      // publishConfig.directory and packs the build package.json, whose workspace:* deps are left to
-      // resolve to plain versions. Pointing pkg-pr-new at the build dir makes both act on the same file.
-      // Note: #389 was closed by pkg-pr-new#499, but that only fixed the tarball location, not the dep
-      // resolution — verified still broken on 0.0.78. Do not remove until the packed deps are URLs
-      // without this. Removing it prematurely regressed publishing once (see mui-public#1354).
-      // Print publish directories (package.json publishConfig.directory or package path)
-      const publishDirs = await Promise.all(
-        packages.map(async (pkg) => {
-          const packageJsonPath = path.join(pkg.path, 'package.json');
-          const packageJsonContent = await fs.readFile(packageJsonPath, 'utf8');
-          const packageJson = JSON.parse(packageJsonContent);
-
-          if (packageJson.publishConfig?.directory) {
-            return path.join(pkg.path, packageJson.publishConfig.directory);
-          }
-
-          return pkg.path;
-        }),
-      );
-
-      publishDirs.forEach((dir) => {
-        console.log(dir);
-      });
     } else if (output === 'name') {
       // Print package names (default)
       packages.forEach((pkg) => {

package/src/cli/cmdPublish.mjs

@@ -20,6 +20,7 @@ import * as semver from 'semver';
 import { persistentAuthStrategy } from '../utils/github.mjs';
 import {
   getPackagesNeedingManualPublish,
+  getReleaseVersion,
   getWorkspacePackages,
   publishPackages,
   validatePublishDependencies,
@@ -42,19 +43,6 @@ function getOctokit() {
  * @property {string[]} [filter] Same as filtering packages with --filter in pnpm. Only publish packages matching the filter. See https://pnpm.io/filtering.
  */
 
-/**
- * Get the version to release from the root package.json
- * @returns {Promise<string | null>} Version string
- */
-async function getReleaseVersion() {
-  // `--json` is required: pnpm 11 returns the raw value (e.g. `9.4.0`) for a
-  // single field without it, which is not valid JSON. The flag forces quoted
-  // output (`"9.4.0"`) across pnpm 9/10/11.
-  const result = await $`pnpm pkg get version --json`;
-  const version = JSON.parse(result.stdout.trim());
-  return semver.valid(version);
-}
-
 /**
  * Parse changelog to extract content for a specific version
  * @param {string} changelogPath - Path to CHANGELOG.md
@@ -510,6 +498,8 @@ async function determineGitSha(octokit, repoInfo) {
     await octokit.search.issuesAndPullRequests({
       advanced_search: 'true',
       q: `is:pr is:merged label:release repo:${repoInfo.owner}/${repoInfo.repo}`,
+      sort: 'created',
+      order: 'desc',
       per_page: 1,
     })
   ).data.items;
@@ -522,29 +512,33 @@ async function determineGitSha(octokit, repoInfo) {
     `🫆  Found the latest merged release PR: ${chalk.bold(pulls[0].title)} (${pulls[0].html_url})`,
   );
 
-  const commits = (
-    await octokit.search.commits({
-      q: `repo:${repoInfo.owner}/${repoInfo.repo} author:${pulls[0].user?.login} [release]`,
-      per_page: 100,
-    })
-  ).data.items;
-
-  if (!commits.length) {
-    console.error(
-      `❌🚨 Could not find any commits associated with the release PR: ${pulls[0].html_url}`,
-    );
+  const pull = (await octokit.pulls.get({ ...repoInfo, pull_number: pulls[0].number })).data;
+  const mergeCommitSha = pull.merge_commit_sha;
+  if (!mergeCommitSha) {
+    console.error(`❌🚨 Could not determine the merge commit of ${pulls[0].html_url}.`);
     return undefined;
   }
-  const relevantData = commits.map((commit) => ({
+
+  // Recent commits on the PR's target branch, to allow releasing from a different commit.
+  const commits = (
+    await octokit.repos.listCommits({ ...repoInfo, sha: pull.base.ref, per_page: 20 })
+  ).data;
+
+  const toChoice = (/** @type {(typeof commits)[number]} */ commit) => ({
     value: commit.sha,
     name: `(${commit.sha.slice(0, 7)}) ${commit.commit.message.split('\n')[0]} by ${commit.author?.login ?? 'no author'} on ${new Date(commit.commit.committer?.date ?? '').toISOString()}`,
-    desciption: commit.commit.message,
-  }));
+    description: commit.commit.message,
+  });
+  const choices = commits.map(toChoice);
+  if (!choices.some((choice) => choice.value === mergeCommitSha)) {
+    const mergeCommit = (await octokit.repos.getCommit({ ...repoInfo, ref: mergeCommitSha })).data;
+    choices.unshift(toChoice(mergeCommit));
+  }
 
   const result = await select({
     message: 'Select the commit to release from:',
-    choices: relevantData,
-    default: relevantData[0].value,
+    choices,
+    default: mergeCommitSha,
     pageSize: 10,
   });
   return result;

package/src/cli/cmdRenameScope.mjs

@@ -69,7 +69,8 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
 
     console.log(
       chalk.yellow(
-        '\n⚠️  Workspace manifests were rewritten in place and are not restored. Discard them before committing.',
+        '\n⚠️  Workspace manifests were rewritten in place and are not restored. The next install\n' +
+          'rewrites pnpm-lock.yaml to match. Discard both before committing.',
       ),
     );
   },

package/src/cli/cmdSetVersionOverrides.mjs

@@ -3,7 +3,9 @@
 import * as semver from 'semver';
 import { $ } from 'execa';
 import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
+import { parseWantedDependency } from '@pnpm/parse-wanted-dependency';
 import {
+  getMinimumReleaseAgePolicy,
   resolveVersion,
   findDependencyVersionFromSpec,
   writeOverridesToWorkspace,
@@ -17,61 +19,62 @@ import {
 /**
  * Process a single package override
  * @param {string} packageSpec - Package specifier in format "package@version"
+ * @param {import('@pnpm/config.version-policy').PublishedByPolicy} policy - Registry cooldown to resolve within
  * @returns {Promise<Record<string, string>>} Overrides object for this package
  */
-async function processPackageOverride(packageSpec) {
+async function processPackageOverride(packageSpec, policy) {
   /** @type {Record<string, string>} */
   const overrides = {};
 
-  // Extract package name to check for special cases
-  const lastAtIndex = packageSpec.lastIndexOf('@');
-  if (lastAtIndex === -1) {
+  const { alias: packageName, bareSpecifier: version } = parseWantedDependency(packageSpec);
+  if (!packageName || version === undefined) {
     throw new Error(`Invalid package specifier: ${packageSpec}`);
   }
 
-  const packageName = packageSpec.slice(0, lastAtIndex);
-  const version = packageSpec.slice(lastAtIndex + 1);
-
-  if (!packageName || !version || version === 'stable') {
+  // An empty version is distinct from a missing one: CI interpolates a matrix
+  // value into `--pkg pkg@<version>`, and the leg that leaves it unset must skip
+  // the override rather than fail the job.
+  if (!version || version === 'stable') {
     return overrides;
   }
 
   // eslint-disable-next-line no-console
   console.log(`Resolving overrides for ${packageName} version: ${version}`);
 
+  /** @param {string} spec */
+  const resolve = (spec) => resolveVersion(spec, policy);
+
   if (packageName === 'react') {
     // Special case for React - also override related packages
-    overrides.react = await resolveVersion(packageSpec);
-    overrides['react-dom'] = await resolveVersion(`react-dom@${version}`);
-    overrides['react-is'] = await resolveVersion(`react-is@${version}`);
+    overrides.react = await resolve(packageSpec);
+    overrides['react-dom'] = await resolve(`react-dom@${version}`);
+    overrides['react-is'] = await resolve(`react-is@${version}`);
     overrides.scheduler = await findDependencyVersionFromSpec(
       `react-dom@${overrides['react-dom']}`,
       'scheduler',
+      policy,
     );
 
     const reactMajor = semver.major(overrides.react);
     if (reactMajor === 17) {
-      overrides['@testing-library/react'] = await resolveVersion('@testing-library/react@^12.1.0');
+      overrides['@testing-library/react'] = await resolve('@testing-library/react@^12.1.0');
     }
   } else if (packageName === '@mui/material') {
     // Special case for MUI - also override related packages
-    overrides['@mui/material'] = await resolveVersion(`@mui/material@${version}`);
-    overrides['@mui/system'] = await resolveVersion(`@mui/system@${version}`);
-    overrides['@mui/icons-material'] = await resolveVersion(`@mui/icons-material@${version}`);
-    overrides['@mui/utils'] = await resolveVersion(`@mui/utils@${version}`);
-    overrides['@mui/material-nextjs'] = await resolveVersion(`@mui/material-nextjs@${version}`);
+    overrides['@mui/material'] = await resolve(`@mui/material@${version}`);
+    overrides['@mui/system'] = await resolve(`@mui/system@${version}`);
+    overrides['@mui/icons-material'] = await resolve(`@mui/icons-material@${version}`);
+    overrides['@mui/utils'] = await resolve(`@mui/utils@${version}`);
+    overrides['@mui/material-nextjs'] = await resolve(`@mui/material-nextjs@${version}`);
 
-    const latest = await resolveVersion(`@mui/material@latest`);
+    const latest = await resolve(`@mui/material@latest`);
     const latestMajor = semver.major(latest);
     const muiMajor = semver.major(overrides['@mui/material']);
-    if (muiMajor < latestMajor) {
-      overrides['@mui/lab'] = await resolveVersion(`@mui/lab@latest-v${muiMajor}`);
-    } else {
-      overrides['@mui/lab'] = await resolveVersion(`@mui/lab@latest`);
-    }
+    const labTag = muiMajor < latestMajor ? `latest-v${muiMajor}` : 'latest';
+    overrides['@mui/lab'] = await resolve(`@mui/lab@${labTag}`);
   } else {
     // Generic case for other packages
-    overrides[packageName] = await resolveVersion(packageSpec);
+    overrides[packageName] = await resolve(packageSpec);
   }
 
   return overrides;
@@ -89,8 +92,12 @@ async function handler(args) {
     return;
   }
 
+  // Read once and thread through: every override must land on a version that
+  // clears the same cooldown the following `pnpm dedupe` enforces.
+  const policy = await getMinimumReleaseAgePolicy();
+
   const packageOverridePromises = args.pkg.map((packageSpec) =>
-    processPackageOverride(packageSpec),
+    processPackageOverride(packageSpec, policy),
   );
   const packageOverrideResults = await Promise.all(packageOverridePromises);
 

package/src/cli/cmdVale.mjs

@@ -7,7 +7,7 @@ import * as path from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
 import { $ } from 'execa';
-import { mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
 
 const LATEST_RELEASE_URL = 'https://api.github.com/repos/vale-cli/vale/releases/latest';
 
@@ -342,7 +342,7 @@ export function getReplacementText(alert) {
 export async function applyFixes(results, fixLevel) {
   const entries = Object.entries(results);
 
-  const perFileResults = await mapConcurrently(
+  const perFileResults = await mapAsync(
     entries,
     async ([filePath, alerts]) => {
       const content = await fs.readFile(filePath, 'utf-8');
@@ -406,15 +406,12 @@ export async function applyFixes(results, fixLevel) {
 
       return { fixed: fileFixed, skipped: alerts.length - fixableAlerts.length };
     },
-    10,
+    { concurrency: 10 },
   );
 
   let fixed = 0;
   let skipped = 0;
   for (const result of perFileResults) {
-    if (result instanceof Error) {
-      throw result;
-    }
     fixed += result.fixed;
     skipped += result.skipped;
   }

package/src/cli/cmdValidateBuiltTypes.mjs

@@ -2,8 +2,7 @@
 import { globby } from 'globby';
 import * as fs from 'node:fs/promises';
 import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
-
-import { mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
 
 const DYNAMIC_PACKAGES_IMPORT_REGEX = /import\((['"])packages\//gm;
 
@@ -22,14 +21,14 @@ async function validateFiles() {
   });
 
   const invalidFiles = (
-    await mapConcurrently(
+    await mapAsync(
       declarationFiles,
       async (declarationFile) => {
         const content = await fs.readFile(declarationFile, 'utf-8');
         const matches = Array.from(content.matchAll(DYNAMIC_PACKAGES_IMPORT_REGEX));
         return matches.length > 0 ? declarationFile : undefined;
       },
-      20,
+      { concurrency: 20 },
     )
   ).filter((file) => typeof file === 'string');
 

package/src/eslint/testConfig.mjs

@@ -1,8 +1,6 @@
-import mochaPlugin from 'eslint-plugin-mocha';
 import vitestPlugin from '@vitest/eslint-plugin';
 import testingLibrary from 'eslint-plugin-testing-library';
 import { defineConfig } from 'eslint/config';
-import globals from 'globals';
 import * as tseslint from 'typescript-eslint';
 import { EXTENSION_TS } from './extensions.mjs';
 
@@ -44,16 +42,11 @@ export const baseSpecRules = {
 };
 
 /**
- * @param {Object} [options]
- * @param {boolean} [options.useMocha]
- * @param {boolean} [options.useVitest]
  * @returns {import('eslint').Linter.Config[]}
  */
-export function createTestConfig(options = {}) {
-  const { useMocha = true, useVitest = false } = options;
+export function createTestConfig() {
   return defineConfig(
-    useMocha ? mochaPlugin.configs.recommended : {},
-    useVitest ? vitestPlugin.configs.recommended : {},
+    vitestPlugin.configs.recommended,
     testingLibrary.configs['flat/dom'],
     testingLibrary.configs['flat/react'],
     {
@@ -63,7 +56,6 @@ export function createTestConfig(options = {}) {
         parserOptions: {
           ecmaVersion: 7,
         },
-        globals: globals.mocha,
       },
       rules: {
         'compat/compat': 'off',
@@ -99,27 +91,7 @@ export function createTestConfig(options = {}) {
         'testing-library/no-node-access': 'off',
         '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
         // end migration
-        ...(useMocha
-          ? {
-              'mocha/consistent-spacing-between-blocks': 'off',
-
-              // upgraded level from recommended
-              'mocha/no-pending-tests': 'error',
-
-              // no rationale provided in /recommended
-              'mocha/no-mocha-arrows': 'off',
-              // definitely a useful rule but too many false positives
-              // due to `describeConformance`
-              // "If you're using dynamically generated tests, you should disable this rule.""
-              'mocha/no-setup-in-describe': 'off',
-              // `beforeEach` for a single case is optimized for change
-              // when we add a test we don't have to refactor the existing
-              // test to `beforeEach`.
-              // `beforeEach`+`afterEach` also means that the `beforeEach`
-              // is cleaned up in `afterEach` if the test causes a crash
-              'mocha/no-hooks-for-single-case': 'off',
-            }
-          : {}),
+        'vitest/prefer-importing-vitest-globals': 'error',
       },
     },
   );

package/src/untyped-plugins.d.ts

@@ -95,73 +95,35 @@ declare module '@next/eslint-plugin-next' {
   export default config;
 }
 
-declare module '@babel/plugin-transform-runtime' {
-  import type { PluginItem } from '@babel/core';
-
-  declare const plugin: PluginItem;
-  export default plugin;
-}
-
-declare module '@babel/plugin-syntax-jsx' {
-  import type { PluginItem } from '@babel/core';
-
-  declare const plugin: PluginItem;
-  export default plugin;
-}
-
-declare module '@babel/plugin-syntax-typescript' {
-  import type { PluginItem } from '@babel/core';
-
-  declare const plugin: PluginItem;
-  export default plugin;
-}
-
 declare module 'babel-plugin-optimize-clsx' {
-  import type { PluginItem } from '@babel/core';
+  import type { PluginTarget } from '@babel/core';
 
-  declare const plugin: PluginItem;
+  declare const plugin: PluginTarget;
   export default plugin;
 }
 
 declare module 'babel-plugin-transform-react-remove-prop-types' {
-  import type { PluginItem } from '@babel/core';
+  import type { PluginTarget } from '@babel/core';
 
-  declare const plugin: PluginItem;
+  declare const plugin: PluginTarget;
   export default plugin;
 }
 
-declare module 'babel-plugin-transform-import-meta' {
-  import type { PluginItem } from '@babel/core';
+declare module 'babel-plugin-transform-remove-imports' {
+  // The package's own bundled types mislabel the export's signature.
+  import type { PluginTarget } from '@babel/core';
 
-  declare const plugin: PluginItem;
+  declare const plugin: PluginTarget;
   export default plugin;
 }
 
-declare module 'babel-plugin-transform-inline-environment-variables' {
-  import type { PluginItem } from '@babel/core';
+declare module 'babel-plugin-transform-import-meta' {
+  import type { PluginTarget } from '@babel/core';
 
-  declare const plugin: PluginItem;
+  declare const plugin: PluginTarget;
   export default plugin;
 }
 
-declare module '@babel/preset-react' {
-  import type { PluginItem } from '@babel/core';
-
-  export type Options = {
-    runtime: 'string';
-  };
-
-  declare const preset: PluginItem;
-  export default preset;
-}
-
-declare module '@babel/preset-typescript' {
-  import type { PluginItem } from '@babel/core';
-
-  declare const preset: PluginItem;
-  export default preset;
-}
-
 declare module 'stylelint-config-standard' {
   import type { Config } from 'stylelint';
 

package/src/utils/build.mjs

@@ -894,42 +894,3 @@ export function measureFn(label) {
   const endMark = `${label}-end`;
   return performance.measure(label, startMark, endMark);
 }
-
-/**
- * A utility to map a function over an array of items in a worker pool.
- *
- * This function will create a pool of workers and distribute the items to be processed among them.
- * Each worker will process items sequentially, but multiple workers will run in parallel.
- *
- * @function
- * @template T
- * @template R
- * @param {T[]} items
- * @param {(item: T) => Promise<R>} mapper
- * @param {number} concurrency
- * @returns {Promise<(R|Error)[]>}
- */
-export async function mapConcurrently(items, mapper, concurrency) {
-  if (!items.length) {
-    return Promise.resolve([]); // nothing to do
-  }
-  const itemIterator = items.entries();
-  const count = Math.min(concurrency, items.length);
-  const workers = [];
-  /**
-   * @type {(R|Error)[]}
-   */
-  const results = new Array(items.length);
-  for (let i = 0; i < count; i += 1) {
-    const worker = Promise.resolve().then(async () => {
-      for (const [index, item] of itemIterator) {
-        // eslint-disable-next-line no-await-in-loop
-        const res = await mapper(item);
-        results[index] = res;
-      }
-    });
-    workers.push(worker);
-  }
-  await Promise.all(workers);
-  return results;
-}