@netlify/zip-it-and-ship-it 12.2.0-experimental → 12.2.1

package/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2020 Netlify <team@netlify.com>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/config.d.ts

@@ -18,7 +18,6 @@ export declare const functionConfig: z.ZodObject<{
     nodeVersion: z.ZodCatch<z.ZodOptional<z.ZodString>>;
     rustTargetDirectory: z.ZodCatch<z.ZodOptional<z.ZodString>>;
     schedule: z.ZodCatch<z.ZodOptional<z.ZodString>>;
-    scopedToFunctionDirectory: z.ZodCatch<z.ZodOptional<z.ZodBoolean>>;
     timeout: z.ZodCatch<z.ZodOptional<z.ZodNumber>>;
     zipGo: z.ZodCatch<z.ZodOptional<z.ZodBoolean>>;
     nodeModuleFormat: z.ZodCatch<z.ZodOptional<z.ZodNativeEnum<{
@@ -37,7 +36,6 @@ export declare const functionConfig: z.ZodObject<{
     nodeVersion?: string | undefined;
     rustTargetDirectory?: string | undefined;
     schedule?: string | undefined;
-    scopedToFunctionDirectory?: boolean | undefined;
     timeout?: number | undefined;
     zipGo?: boolean | undefined;
     nodeModuleFormat?: "cjs" | "esm" | undefined;
@@ -53,7 +51,6 @@ export declare const functionConfig: z.ZodObject<{
     nodeVersion?: unknown;
     rustTargetDirectory?: unknown;
     schedule?: unknown;
-    scopedToFunctionDirectory?: unknown;
     timeout?: unknown;
     zipGo?: unknown;
     nodeModuleFormat?: unknown;

package/dist/config.js

@@ -20,7 +20,6 @@ export const functionConfig = z.object({
     nodeVersion: z.string().optional().catch(undefined),
     rustTargetDirectory: z.string().optional().catch(undefined),
     schedule: z.string().optional().catch(undefined),
-    scopedToFunctionDirectory: z.boolean().optional().catch(false),
     timeout: z.number().optional().catch(undefined),
     zipGo: z.boolean().optional().catch(undefined),
     // Temporary configuration property, only meant to be used by the deploy

package/dist/runtimes/node/in_source_config/index.d.ts

@@ -38,14 +38,13 @@ export declare const inSourceConfig: z.ZodObject<Pick<{
     nodeVersion: z.ZodCatch<z.ZodOptional<z.ZodString>>;
     rustTargetDirectory: z.ZodCatch<z.ZodOptional<z.ZodString>>;
     schedule: z.ZodCatch<z.ZodOptional<z.ZodString>>;
-    scopedToFunctionDirectory: z.ZodCatch<z.ZodOptional<z.ZodBoolean>>;
     timeout: z.ZodCatch<z.ZodOptional<z.ZodNumber>>;
     zipGo: z.ZodCatch<z.ZodOptional<z.ZodBoolean>>;
     nodeModuleFormat: z.ZodCatch<z.ZodOptional<z.ZodNativeEnum<{
         readonly COMMONJS: "cjs";
         readonly ESM: "esm";
     }>>>;
-}, "name" | "externalNodeModules" | "generator" | "includedFiles" | "ignoredNodeModules" | "nodeBundler" | "nodeVersion" | "schedule" | "scopedToFunctionDirectory" | "timeout"> & {
+}, "name" | "externalNodeModules" | "generator" | "includedFiles" | "ignoredNodeModules" | "nodeBundler" | "nodeVersion" | "schedule" | "timeout"> & {
     method: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEnum<["GET", "POST", "PUT", "PATCH", "OPTIONS", "DELETE", "HEAD"]>, "GET" | "POST" | "PUT" | "PATCH" | "OPTIONS" | "DELETE" | "HEAD", unknown>, z.ZodArray<z.ZodEffects<z.ZodEnum<["GET", "POST", "PUT", "PATCH", "OPTIONS", "DELETE", "HEAD"]>, "GET" | "POST" | "PUT" | "PATCH" | "OPTIONS" | "DELETE" | "HEAD", unknown>, "many">]>, ("GET" | "POST" | "PUT" | "PATCH" | "OPTIONS" | "DELETE" | "HEAD")[], unknown>>;
     path: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, string[], string | string[]>>;
     excludedPath: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, string[], string | string[]>>;
@@ -84,7 +83,6 @@ export declare const inSourceConfig: z.ZodObject<Pick<{
     nodeBundler?: "none" | "esbuild" | "esbuild_zisi" | "nft" | "zisi" | undefined;
     nodeVersion?: string | undefined;
     schedule?: string | undefined;
-    scopedToFunctionDirectory?: boolean | undefined;
     timeout?: number | undefined;
     method?: ("GET" | "POST" | "PUT" | "PATCH" | "OPTIONS" | "DELETE" | "HEAD")[] | undefined;
     excludedPath?: string[] | undefined;
@@ -107,7 +105,6 @@ export declare const inSourceConfig: z.ZodObject<Pick<{
     nodeBundler?: unknown;
     nodeVersion?: unknown;
     schedule?: unknown;
-    scopedToFunctionDirectory?: unknown;
     timeout?: unknown;
     method?: unknown;
     excludedPath?: string | string[] | undefined;
@@ -138,7 +135,6 @@ export declare const augmentFunctionConfig: (mainFile: string, tomlConfig: Funct
     nodeVersion?: string | undefined;
     rustTargetDirectory?: string | undefined;
     schedule?: string | undefined;
-    scopedToFunctionDirectory?: boolean | undefined;
     timeout?: number | undefined;
     zipGo?: boolean | undefined;
     nodeModuleFormat?: "cjs" | "esm" | undefined;
@@ -152,7 +148,6 @@ export declare const augmentFunctionConfig: (mainFile: string, tomlConfig: Funct
     nodeBundler?: "none" | "esbuild" | "esbuild_zisi" | "nft" | "zisi" | undefined;
     nodeVersion?: string | undefined;
     schedule?: string | undefined;
-    scopedToFunctionDirectory?: boolean | undefined;
     timeout?: number | undefined;
     method?: ("GET" | "POST" | "PUT" | "PATCH" | "OPTIONS" | "DELETE" | "HEAD")[] | undefined;
     excludedPath?: string[] | undefined;

package/dist/runtimes/node/in_source_config/index.js

@@ -29,7 +29,6 @@ export const inSourceConfig = functionConfig
     nodeBundler: true,
     nodeVersion: true,
     schedule: true,
-    scopedToFunctionDirectory: true,
     timeout: true,
 })
     .extend({

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,8 +58,7 @@ const zipFunction = async function ({ archiveFormat, basePath, branch, cache, co
         runtimeAPIVersion,
     });
     const bundler = getBundler(bundlerName);
-    const functionBasePath = mergedConfig.scopedToFunctionDirectory && srcDir === srcPath ? srcDir : repositoryRoot;
-    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,
@@ -60,14 +69,19 @@ const zipFunction = async function ({ archiveFormat, basePath, branch, cache, co
         mainFile,
         name,
         pluginsModulesPath,
-        repositoryRoot: functionBasePath,
+        repositoryRoot,
         runtime,
         runtimeAPIVersion,
         srcDir,
         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.2.0-experimental",
+  "version": "12.2.1",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -42,9 +42,9 @@
   },
   "dependencies": {
     "@babel/parser": "^7.22.5",
-    "@babel/types": "7.27.6",
+    "@babel/types": "7.28.0",
     "@netlify/binary-info": "^1.0.0",
-    "@netlify/serverless-functions-api": "^2.1.2",
+    "@netlify/serverless-functions-api": "^2.1.3",
     "@vercel/nft": "0.29.4",
     "archiver": "^7.0.0",
     "common-path-prefix": "^3.0.0",
@@ -85,7 +85,7 @@
     "@types/unixify": "1.0.2",
     "@types/yargs": "17.0.33",
     "@vitest/coverage-v8": "^3.0.0",
-    "browserslist": "4.25.0",
+    "browserslist": "4.25.1",
     "cardinal": "2.1.1",
     "cpy": "11.1.0",
     "decompress": "4.2.1",
@@ -99,5 +99,6 @@
   },
   "engines": {
     "node": ">=18.14.0"
-  }
+  },
+  "gitHead": "a317a69700be1392b54976ef34b456ac47d75f5a"
 }