@netlify/zip-it-and-ship-it 9.28.2 → 9.28.4

package/dist/feature_flags.d.ts

@@ -8,6 +8,7 @@ export declare const defaultFlags: {
     readonly zisi_unique_entry_file: false;
     readonly zisi_esbuild_fail_double_glob: false;
     readonly zisi_go_drop_runtime_override: false;
+    readonly zisi_fix_symlinks: false;
 };
 export type FeatureFlags = Partial<Record<keyof typeof defaultFlags, boolean>>;
 export declare const getFlags: (input?: Record<string, boolean>, flags?: {
@@ -20,4 +21,5 @@ export declare const getFlags: (input?: Record<string, boolean>, flags?: {
     readonly zisi_unique_entry_file: false;
     readonly zisi_esbuild_fail_double_glob: false;
     readonly zisi_go_drop_runtime_override: false;
+    readonly zisi_fix_symlinks: false;
 }) => FeatureFlags;

package/dist/feature_flags.js

@@ -20,6 +20,8 @@ export const defaultFlags = {
     zisi_esbuild_fail_double_glob: false,
     // drops the "runtimeVersion" override field
     zisi_go_drop_runtime_override: false,
+    // fixes symlinks in included files
+    zisi_fix_symlinks: false,
 };
 // List of supported flags and their default value.
 export const getFlags = (input = {}, flags = defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({

package/dist/runtimes/index.d.ts

@@ -11,7 +11,7 @@ export declare const getFunctionsFromPaths: (paths: string[], { cache, config, c
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;
     dedupe?: boolean | undefined;
-    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_unique_entry_file" | "zisi_esbuild_fail_double_glob" | "zisi_go_drop_runtime_override", boolean>> | undefined;
+    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_unique_entry_file" | "zisi_esbuild_fail_double_glob" | "zisi_go_drop_runtime_override" | "zisi_fix_symlinks", boolean>> | undefined;
 }) => Promise<FunctionMap>;
 /**
  * Gets a list of functions found in a list of paths.
@@ -20,6 +20,6 @@ export declare const getFunctionFromPath: (path: string, { cache, config, config
     cache: RuntimeCache;
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;
-    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_unique_entry_file" | "zisi_esbuild_fail_double_glob" | "zisi_go_drop_runtime_override", boolean>> | undefined;
+    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_unique_entry_file" | "zisi_esbuild_fail_double_glob" | "zisi_go_drop_runtime_override" | "zisi_fix_symlinks", boolean>> | undefined;
 }) => Promise<FunctionSource | undefined>;
 export {};

package/dist/runtimes/node/bundlers/esbuild/src_files.js

@@ -2,9 +2,9 @@ import { filterExcludedPaths, getPathsOfIncludedFiles } from '../../utils/includ
 import { getPackageJson } from '../../utils/package_json.js';
 import { getNewCache } from '../../utils/traversal_cache.js';
 import { getDependencyPathsForDependency } from '../zisi/traverse.js';
-export const getSrcFiles = async ({ config, mainFile, pluginsModulesPath, srcDir }) => {
+export const getSrcFiles = async ({ config, mainFile, pluginsModulesPath, srcDir, featureFlags, }) => {
     const { externalNodeModules = [], includedFiles = [], includedFilesBasePath, nodeVersion } = config;
-    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, includedFilesBasePath);
+    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, featureFlags, includedFilesBasePath);
     const dependencyPaths = await getSrcFilesForDependencies({
         basedir: srcDir,
         dependencies: externalNodeModules,

package/dist/runtimes/node/bundlers/nft/index.js

@@ -27,7 +27,7 @@ const bundle = async ({ basePath, cache, config, featureFlags, mainFile, name, p
         const sideFiles = await getSideFiles(srcPath, stat);
         includedFiles.push(...sideFiles);
     }
-    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, includedFilesBasePath || basePath);
+    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, featureFlags, includedFilesBasePath || basePath);
     const { aliases, bundledPaths = [], mainFile: normalizedMainFile, moduleFormat, rewrites, tracedPaths, } = await traceFilesAndTranspile({
         basePath: repositoryRoot,
         cache,
@@ -159,9 +159,9 @@ const traceFilesAndTranspile = async function ({ basePath, cache, config, featur
         tracedPaths: normalizedTracedPaths,
     };
 };
-const getSrcFiles = async function ({ basePath, config, mainFile }) {
+const getSrcFiles = async function ({ basePath, config, mainFile, featureFlags }) {
     const { includedFiles = [], includedFilesBasePath } = config;
-    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, includedFilesBasePath);
+    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, featureFlags, includedFilesBasePath);
     const { fileList: dependencyPaths } = await nodeFileTrace([mainFile], {
         base: basePath,
         ignore: getIgnoreFunction(config),

package/dist/runtimes/node/bundlers/none/index.js

@@ -28,9 +28,9 @@ const getModuleFormat = async function (mainFile) {
     }
     return MODULE_FORMAT.COMMONJS;
 };
-export const getSrcFiles = async function ({ config, mainFile }) {
+export const getSrcFiles = async function ({ config, mainFile, featureFlags }) {
     const { includedFiles = [], includedFilesBasePath } = config;
-    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, includedFilesBasePath);
+    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, featureFlags, includedFilesBasePath);
     const includedPaths = filterExcludedPaths(includedFilePaths, excludePatterns);
     return { srcFiles: [mainFile, ...includedPaths], includedFiles: includedPaths };
 };

package/dist/runtimes/node/bundlers/zisi/src_files.js

@@ -14,7 +14,7 @@ import { shouldTreeShake } from './tree_shake.js';
 // has a size limit for the zipped file. It also makes cold starts faster.
 export const getSrcFiles = async function ({ config, featureFlags, mainFile, name, pluginsModulesPath, srcDir, srcPath, stat, }) {
     const { includedFiles = [], includedFilesBasePath, nodeVersion } = config;
-    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, includedFilesBasePath);
+    const { excludePatterns, paths: includedFilePaths } = await getPathsOfIncludedFiles(includedFiles, featureFlags, includedFilesBasePath);
     const [treeFiles, depFiles] = await Promise.all([
         getTreeFiles(srcPath, stat),
         getDependencies({ featureFlags, functionName: name, mainFile, pluginsModulesPath, srcDir, nodeVersion }),

package/dist/runtimes/node/utils/included_files.d.ts

@@ -1,5 +1,6 @@
+import { type FeatureFlags } from '../../../feature_flags.js';
 export declare const filterExcludedPaths: (paths: string[], excludePattern?: string[]) => string[];
-export declare const getPathsOfIncludedFiles: (includedFiles: string[], basePath?: string) => Promise<{
+export declare const getPathsOfIncludedFiles: (includedFiles: string[], featureFlags: FeatureFlags, basePath?: string) => Promise<{
     excludePatterns: string[];
     paths: string[];
 }>;

package/dist/runtimes/node/utils/included_files.js

@@ -10,7 +10,7 @@ export const filterExcludedPaths = (paths, excludePattern = []) => {
     const excludedPaths = paths.filter((path) => !excludePattern.some((pattern) => minimatch(path, pattern)));
     return excludedPaths;
 };
-export const getPathsOfIncludedFiles = async (includedFiles, basePath) => {
+export const getPathsOfIncludedFiles = async (includedFiles, featureFlags, basePath) => {
     if (basePath === undefined) {
         return { excludePatterns: [], paths: [] };
     }
@@ -37,9 +37,23 @@ export const getPathsOfIncludedFiles = async (includedFiles, basePath) => {
         cwd: basePath,
         dot: true,
         ignore: excludePatterns,
-        followSymbolicLinks: true,
-        throwErrorOnBrokenSymbolicLink: true,
+        ...(featureFlags.zisi_fix_symlinks
+            ? {
+                onlyFiles: false,
+                // get directories as well to get symlinked directories,
+                // to filter the regular non symlinked directories out mark them with a slash at the end to filter them out.
+                markDirectories: true,
+                followSymbolicLinks: false,
+            }
+            : {
+                followSymbolicLinks: true,
+                throwErrorOnBrokenSymbolicLink: true,
+            }),
     });
-    return { excludePatterns, paths: pathGroups.map(normalize) };
+    const paths = featureFlags.zisi_fix_symlinks
+        ? pathGroups.filter((path) => !path.endsWith('/')).map(normalize)
+        : pathGroups.map(normalize);
+    // now filter the non symlinked directories out that got marked with a trailing slash
+    return { excludePatterns, paths };
 };
 //# sourceMappingURL=included_files.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.28.2",
+  "version": "9.28.4",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -55,15 +55,15 @@
   },
   "dependencies": {
     "@babel/parser": "^7.22.5",
-    "@babel/types": "7.23.5",
+    "@babel/types": "7.23.6",
     "@netlify/binary-info": "^1.0.0",
-    "@netlify/serverless-functions-api": "^1.13.0",
+    "@netlify/serverless-functions-api": "^1.13.1",
     "@vercel/nft": "^0.23.0",
     "archiver": "^6.0.0",
     "common-path-prefix": "^3.0.0",
     "cp-file": "^10.0.0",
     "es-module-lexer": "^1.0.0",
-    "esbuild": "0.19.9",
+    "esbuild": "0.19.11",
     "execa": "^6.0.0",
     "fast-glob": "^3.3.2",
     "filter-obj": "^5.0.0",
@@ -102,10 +102,10 @@
     "@types/unixify": "1.0.2",
     "@types/yargs": "17.0.32",
     "@vitest/coverage-v8": "0.34.6",
-    "adm-zip": "0.5.10",
     "browserslist": "4.22.2",
     "cardinal": "2.1.1",
     "cpy": "9.0.1",
+    "decompress": "^4.2.1",
     "deepmerge": "4.3.1",
     "get-stream": "8.0.1",
     "husky": "8.0.3",