@netlify/build 29.59.1 → 30.0.0

package/lib/plugins/child/utils.d.ts

@@ -13,10 +13,10 @@ export function getUtils({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS
         cancelBuild: any;
     };
     cache: {
-        save: (paths: any, optsA: any) => any;
-        restore: (paths: any, optsA: any) => any;
-        remove: (paths: any, optsA: any) => any;
-        has: (paths: any, optsA: any) => any;
+        save: (paths: any, optsA: any) => Promise<any>;
+        restore: (paths: any, optsA: any) => Promise<any>;
+        remove: (paths: any, optsA: any) => Promise<any>;
+        has: (paths: any, optsA: any) => Promise<any>;
         list: (optsA: any) => Promise<string[]>;
         getCacheDir: (optsA: any) => string;
     };

package/lib/plugins/resolve.js

@@ -13,7 +13,7 @@ const AUTO_PLUGINS_DIR = '.netlify/plugins/';
 //  - automatically installed by us, to `.netlify/plugins/`
 export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, pluginsEnv, }) {
     const autoPluginsDir = getAutoPluginsDir(buildDir, packagePath);
-    const pluginsOptionsA = await Promise.all(pluginsOptions.map((pluginOptions) => resolvePluginPath({ pluginOptions, buildDir, autoPluginsDir })));
+    const pluginsOptionsA = await Promise.all(pluginsOptions.map((pluginOptions) => resolvePluginPath({ pluginOptions, buildDir, packagePath, autoPluginsDir })));
     const pluginsOptionsB = await addPluginsNodeVersion({
         featureFlags,
         pluginsOptions: pluginsOptionsA,
@@ -65,20 +65,21 @@ export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, bu
 const getAutoPluginsDir = function (buildDir, packagePath) {
     return join(buildDir, packagePath || '', AUTO_PLUGINS_DIR);
 };
-const resolvePluginPath = async function ({ pluginOptions, pluginOptions: { packageName, loadedFrom }, buildDir, autoPluginsDir, }) {
+const resolvePluginPath = async function ({ pluginOptions, pluginOptions: { packageName, loadedFrom }, buildDir, packagePath, autoPluginsDir, }) {
     // Core plugins
     if (loadedFrom !== undefined) {
         return pluginOptions;
     }
-    const localPackageName = normalizeLocalPackageName(packageName);
     // Local plugins
+    const localPackageName = normalizeLocalPackageName(packageName);
     if (localPackageName.startsWith('.')) {
         const { path: localPath, error } = await tryResolvePath(localPackageName, buildDir);
         validateLocalPluginPath(error, localPackageName);
         return { ...pluginOptions, pluginPath: localPath, loadedFrom: 'local' };
     }
     // Plugin added to `package.json`
-    const { path: manualPath } = await tryResolvePath(packageName, buildDir);
+    const packageDir = join(buildDir, packagePath || '');
+    const { path: manualPath } = await tryResolvePath(packageName, packageDir);
     if (manualPath !== undefined) {
         return { ...pluginOptions, pluginPath: manualPath, loadedFrom: 'package.json' };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.59.1",
+  "version": "30.0.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -69,15 +69,15 @@
     "@bugsnag/js": "^7.0.0",
     "@netlify/blobs": "^7.4.0",
     "@netlify/cache-utils": "^5.2.0",
-    "@netlify/config": "^20.22.0",
+    "@netlify/config": "^21.0.0",
     "@netlify/edge-bundler": "12.3.2",
     "@netlify/framework-info": "^9.9.1",
-    "@netlify/functions-utils": "^5.3.7",
+    "@netlify/functions-utils": "^5.3.9",
     "@netlify/git-utils": "^5.2.0",
     "@netlify/opentelemetry-utils": "^1.3.0",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^5.2.0",
-    "@netlify/zip-it-and-ship-it": "9.43.0",
+    "@netlify/zip-it-and-ship-it": "10.0.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -112,7 +112,7 @@
     "ps-list": "^8.0.0",
     "read-package-up": "^11.0.0",
     "readdirp": "^3.4.0",
-    "resolve": "^2.0.0-next.1",
+    "resolve": "^2.0.0-next.5",
     "rfdc": "^1.3.0",
     "safe-json-stringify": "^1.2.0",
     "semver": "^7.3.8",
@@ -126,7 +126,7 @@
     "yargs": "^17.6.0"
   },
   "devDependencies": {
-    "@netlify/nock-udp": "^3.2.0",
+    "@netlify/nock-udp": "^4.0.0",
     "@opentelemetry/api": "~1.8.0",
     "@opentelemetry/sdk-trace-base": "~1.24.0",
     "@types/node": "^14.18.53",
@@ -164,5 +164,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "5ef5481867986c27c75fc39a12a82c7be40f5938"
+  "gitHead": "65206cf82369d2e0412c707c763590690cc1819a"
 }