@netlify/zip-it-and-ship-it 12.1.5 → 12.2.0

package/dist/runtimes/node/index.js

@@ -1,4 +1,4 @@
-import { extname, join } from 'path';
+import { dirname, extname, join } from 'path';
 import { copyFile } from 'copy-file';
 import { INVOCATION_MODE } from '../../function.js';
 import { Priority } from '../../priority.js';
@@ -36,10 +36,20 @@ const zipFunction = async function ({ archiveFormat, basePath, branch, cache, co
         await copyFile(srcPath, destPath);
         return { config, path: destPath, entryFilename: '' };
     }
+    // If the function is inside the plugins modules path, we need to treat that
+    // directory as the base path, not as an extra directory used for module
+    // resolution. So we unset `pluginsModulesPath` for this function. We do
+    // this because we want the modules used by those functions to be isolated
+    // from the ones defined in the project root.
+    let pluginsModulesPath = await getPluginsModulesPath(srcDir);
+    const isInPluginsModulesPath = Boolean(pluginsModulesPath && srcDir.startsWith(pluginsModulesPath));
+    if (isInPluginsModulesPath) {
+        basePath = dirname(pluginsModulesPath);
+        pluginsModulesPath = undefined;
+    }
     const staticAnalysisResult = await parseFile(mainFile, { functionName: name });
     const runtimeAPIVersion = staticAnalysisResult.runtimeAPIVersion === 2 ? 2 : 1;
     const mergedConfig = augmentFunctionConfig(mainFile, config, staticAnalysisResult.config);
-    const pluginsModulesPath = await getPluginsModulesPath(srcDir);
     const bundlerName = await getBundlerName({
         config: mergedConfig,
         extension,
@@ -48,7 +58,7 @@ const zipFunction = async function ({ archiveFormat, basePath, branch, cache, co
         runtimeAPIVersion,
     });
     const bundler = getBundler(bundlerName);
-    const { aliases = new Map(), cleanupFunction, basePath: finalBasePath, bundlerWarnings, includedFiles, inputs, mainFile: finalMainFile = mainFile, moduleFormat, nativeNodeModules, rewrites = new Map(), srcFiles, } = await bundler.bundle({
+    const { aliases = new Map(), cleanupFunction, basePath: basePathFromBundler, bundlerWarnings, includedFiles, inputs, mainFile: finalMainFile = mainFile, moduleFormat, nativeNodeModules, rewrites = new Map(), srcFiles, } = await bundler.bundle({
         basePath,
         cache,
         config: mergedConfig,
@@ -66,7 +76,12 @@ const zipFunction = async function ({ archiveFormat, basePath, branch, cache, co
         srcPath,
         stat,
     });
-    createPluginsModulesPathAliases(srcFiles, pluginsModulesPath, aliases, finalBasePath);
+    createPluginsModulesPathAliases(srcFiles, pluginsModulesPath, aliases, basePathFromBundler);
+    // If the function is inside the plugins modules path, we need to force the
+    // base path to be that directory. If not, we'll run the logic that finds the
+    // common path prefix and that will break module resolution, as the modules
+    // will no longer be inside a `node_modules` directory.
+    const finalBasePath = isInPluginsModulesPath ? basePath : basePathFromBundler;
     const generator = mergedConfig?.generator || getInternalValue(isInternal);
     const zipResult = await zipNodeJs({
         aliases,

package/dist/utils/fs.js

@@ -64,9 +64,25 @@ ${errorMessages.join('\n')}`);
     }
     return validDirectories.flat();
 };
-const listFunctionsDirectory = async function (srcFolder) {
-    const filenames = await fs.readdir(srcFolder);
-    return filenames.map((name) => join(srcFolder, name));
+const listFunctionsDirectory = async function (srcPath) {
+    try {
+        const filenames = await fs.readdir(srcPath);
+        return filenames.map((name) => join(srcPath, name));
+    }
+    catch (error) {
+        // We could move the `stat` call up and use its result to decide whether to
+        // treat the path as a file or as a directory. We're doing it this way since
+        // historically this method only supported directories, and only later we
+        // made it accept files. To roll out that change as safely as possible, we
+        // keep the directory flow untouched and look for files only as a fallback.
+        if (error.code === 'ENOTDIR') {
+            const stat = await fs.stat(srcPath);
+            if (stat.isFile()) {
+                return srcPath;
+            }
+        }
+        throw error;
+    }
 };
 export const resolveFunctionsDirectories = (input) => {
     const directories = Array.isArray(input) ? input : [input];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "12.1.5",
+  "version": "12.2.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -100,5 +100,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "e663c8f1a5667e6737c689c33f7cabd6b2a98774"
+  "gitHead": "1c03ad22e24821b3a4803e54e8eeaa5a15c509d6"
 }