diff --git a/package-lock.json b/package-lock.json index bead62a66e..2a21a8038f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18337,27 +18337,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-every": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-every/-/p-every-2.0.0.tgz", - "integrity": "sha512-MCz9DqD5opPC48Zsd+BHm56O/HfhYIQQtupfDzhXoVgQdg/Ux4F8/JcdRuQ+arq7zD5fB6zP3axbH3d9Nr8dlw==", - "license": "MIT", - "dependencies": { - "p-map": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-every/node_modules/p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/p-filter": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-4.1.0.tgz", @@ -23808,7 +23787,6 @@ "minimatch": "^9.0.4", "os-name": "^6.0.0", "p-event": "^6.0.0", - "p-every": "^2.0.0", "p-filter": "^4.0.0", "p-locate": "^6.0.0", "p-map": "^7.0.0", diff --git a/packages/build/package.json b/packages/build/package.json index d73930f3c7..0ab7b8f80f 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -96,7 +96,6 @@ "minimatch": "^9.0.4", "os-name": "^6.0.0", "p-event": "^6.0.0", - "p-every": "^2.0.0", "p-filter": "^4.0.0", "p-locate": "^6.0.0", "p-map": "^7.0.0", diff --git a/packages/build/src/plugins/compatibility.ts b/packages/build/src/plugins/compatibility.ts index ca6d6ab6bc..68f6272cac 100644 --- a/packages/build/src/plugins/compatibility.ts +++ b/packages/build/src/plugins/compatibility.ts @@ -1,4 +1,3 @@ -import _pEvery from 'p-every' import pLocate from 'p-locate' import { type PackageJson } from 'read-package-up' import semver from 'semver' @@ -9,9 +8,6 @@ import { SystemLogger } from '../plugins_core/types.js' import { PluginVersion } from './list.js' import { CONDITIONS } from './plugin_conditions.js' -// the types of that package seem to be not correct and demand a `pEvery.default()` usage which is wrong -const pEvery = _pEvery as unknown as typeof import('p-every').default - /** * Retrieve the `expectedVersion` of a plugin: * - This is the version which should be run @@ -128,9 +124,13 @@ const getCompatibleEntry = async function ({ return false } - return await pEvery(conditions, async ({ type, condition }) => - CONDITIONS[type].test(condition as any, { nodeVersion, packageJson, packagePath, buildDir }), - ) + return ( + await Promise.all( + conditions.map(async ({ type, condition }) => + CONDITIONS[type].test(condition as any, { nodeVersion, packageJson, packagePath, buildDir }), + ), + ) + ).every(Boolean) }) if (compatibleEntry) { @@ -192,9 +192,13 @@ const getFirstCompatibleEntry = async function ({ return true } - return await pEvery(conditions, async ({ type, condition }) => - CONDITIONS[type].test(condition as any, { nodeVersion, packageJson, packagePath, buildDir }), - ) + return ( + await Promise.all( + conditions.map(async ({ type, condition }) => + CONDITIONS[type].test(condition as any, { nodeVersion, packageJson, packagePath, buildDir }), + ), + ) + ).every(Boolean) }) if (compatibleEntry) { diff --git a/packages/build/src/plugins/plugin_conditions.ts b/packages/build/src/plugins/plugin_conditions.ts index 53157d464b..efddd903bb 100644 --- a/packages/build/src/plugins/plugin_conditions.ts +++ b/packages/build/src/plugins/plugin_conditions.ts @@ -1,6 +1,5 @@ import { join } from 'path' -import _pEvery from 'p-every' import { type PackageJson } from 'read-package-up' import semver from 'semver' @@ -9,9 +8,6 @@ import { resolvePath } from '../utils/resolve.js' import { type PluginVersion } from './list.js' -// the types of that package seem to be not correct and demand a `pEvery.default()` usage which is wrong -const pEvery = _pEvery as unknown as typeof import('p-every').default - type ConditionContext = { nodeVersion: string packageJson: PackageJson @@ -53,9 +49,13 @@ const siteDependenciesTest = async function ( } } - return await pEvery(Object.entries(allowedSiteDependencies), ([dependencyName, allowedVersion]) => - siteDependencyTest({ dependencyName, allowedVersion, siteDependencies, buildDir }), - ) + return ( + await Promise.all( + Object.entries(allowedSiteDependencies).map(async ([dependencyName, allowedVersion]) => + siteDependencyTest({ dependencyName, allowedVersion, siteDependencies, buildDir }), + ), + ) + ).every(Boolean) } const siteDependencyTest = async function ({