@netlify/zip-it-and-ship-it 9.25.5 → 9.25.7

package/dist/feature_flags.d.ts

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

package/dist/feature_flags.js

@@ -18,8 +18,6 @@ export const defaultFlags = {
     zisi_unique_entry_file: false,
     // If multiple glob stars are in includedFiles, fail the build instead of warning.
     zisi_esbuild_fail_double_glob: false,
-    // Bundle for the provided.AL2 runtime for Go functions.
-    zisi_golang_use_al2: 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/go/builder.d.ts

@@ -1,10 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { FeatureFlags } from '../../feature_flags.js';
-export declare const build: ({ destPath, mainFile, srcDir, featureFlags, }: {
+export declare const build: ({ destPath, mainFile, srcDir }: {
     destPath: string;
     mainFile: string;
     srcDir: string;
-    featureFlags: FeatureFlags;
 }) => Promise<{
     mainFile: string;
     name: string;

package/dist/runtimes/go/builder.js

@@ -3,13 +3,10 @@ import { basename } from 'path';
 import { FunctionBundlingUserError } from '../../utils/error.js';
 import { shellUtils } from '../../utils/shell.js';
 import { RUNTIME } from '../runtime.js';
-export const build = async ({ destPath, mainFile, srcDir, featureFlags, }) => {
+export const build = async ({ destPath, mainFile, srcDir }) => {
     const functionName = basename(srcDir);
     try {
-        const args = ['build', '-o', destPath, '-ldflags', '-s -w'];
-        if (featureFlags.zisi_golang_use_al2) {
-            args.push('-tags', 'lambda.norpc');
-        }
+        const args = ['build', '-o', destPath, '-ldflags', '-s -w', '-tags', 'lambda.norpc'];
         await shellUtils.runCommand('go', args, {
             cwd: srcDir,
             env: {

package/dist/runtimes/go/index.js

@@ -68,7 +68,7 @@ const processSource = async ({ cache, mainFile, path, }) => {
         stat,
     };
 };
-const zipFunction = async function ({ config, destFolder, filename, mainFile, srcDir, srcPath, stat, isInternal, featureFlags, }) {
+const zipFunction = async function ({ config, destFolder, filename, mainFile, srcDir, srcPath, stat, isInternal, }) {
     const destPath = join(destFolder, filename);
     const isSource = extname(mainFile) === '.go';
     let binary = {
@@ -78,7 +78,7 @@ const zipFunction = async function ({ config, destFolder, filename, mainFile, sr
     // If we're building a Go function from source, we call the build method and
     // update `binary` to point to the newly-created binary.
     if (isSource) {
-        const { stat: binaryStat } = await build({ destPath, mainFile, srcDir, featureFlags });
+        const { stat: binaryStat } = await build({ destPath, mainFile, srcDir });
         binary = {
             path: destPath,
             stat: binaryStat,
@@ -88,7 +88,7 @@ const zipFunction = async function ({ config, destFolder, filename, mainFile, sr
         config,
         displayName: config?.name,
         generator: config?.generator || getInternalValue(isInternal),
-        runtimeVersion: featureFlags.zisi_golang_use_al2 ? 'provided.al2' : undefined,
+        runtimeVersion: 'provided.al2',
     };
     // If `zipGo` is enabled, we create a zip archive with the Go binary and the
     // toolchain file.
@@ -96,7 +96,7 @@ const zipFunction = async function ({ config, destFolder, filename, mainFile, sr
         const zipPath = `${destPath}.zip`;
         const zipOptions = {
             destPath: zipPath,
-            filename: featureFlags.zisi_golang_use_al2 ? 'bootstrap' : basename(destPath),
+            filename: 'bootstrap',
             runtime,
         };
         await zipBinary({ ...zipOptions, srcPath: binary.path, stat: binary.stat });

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_golang_use_al2", 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", 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_golang_use_al2", 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", boolean>> | undefined;
 }) => Promise<FunctionSource | undefined>;
 export {};

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

@@ -1,5 +1,5 @@
 import { Buffer } from 'buffer';
-import { mkdir, rm, writeFile } from 'fs/promises';
+import { mkdir, readlink as readLink, rm, symlink, writeFile } from 'fs/promises';
 import os from 'os';
 import { basename, extname, join } from 'path';
 import { getPath as getV2APIPath } from '@netlify/serverless-functions-api';
@@ -22,7 +22,7 @@ const addBootstrapFile = function (srcFiles, aliases) {
     srcFiles.push(v2APIPath);
     aliases.set(v2APIPath, BOOTSTRAP_FILE_NAME);
 };
-const createDirectory = async function ({ aliases = new Map(), basePath, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites = new Map(), runtimeAPIVersion, srcFiles, }) {
+const createDirectory = async function ({ aliases = new Map(), basePath, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites = new Map(), runtimeAPIVersion, srcFiles, }) {
     // There is a naming conflict with the entry file if one of the supporting
     // files (i.e. not the main file) has the path that the entry file needs to
     // take.
@@ -55,8 +55,9 @@ const createDirectory = async function ({ aliases = new Map(), basePath, destFol
     if (runtimeAPIVersion === 2) {
         addBootstrapFile(srcFiles, aliases);
     }
+    const symlinks = new Map();
     // Copying source files.
-    await pMap(srcFiles, (srcFile) => {
+    await pMap(srcFiles, async (srcFile) => {
         const destPath = aliases.get(srcFile) || srcFile;
         const normalizedDestPath = normalizeFilePath({
             commonPrefix: basePath,
@@ -67,8 +68,21 @@ const createDirectory = async function ({ aliases = new Map(), basePath, destFol
         if (rewrites.has(srcFile)) {
             return mkdirAndWriteFile(absoluteDestPath, rewrites.get(srcFile));
         }
+        const stat = await cachedLstat(cache.lstatCache, srcFile);
+        // If the path is a symlink, find the link target and add the link to a
+        // `symlinks` map, which we'll later use to create the symlinks in the
+        // target directory. We can't do that right now because the target path
+        // may not have been copied over yet.
+        if (stat.isSymbolicLink()) {
+            const targetPath = await readLink(srcFile);
+            symlinks.set(targetPath, absoluteDestPath);
+            return;
+        }
         return copyFile(srcFile, absoluteDestPath);
     }, { concurrency: COPY_FILE_CONCURRENCY });
+    await pMap([...symlinks.entries()], ([target, path]) => symlink(target, path), {
+        concurrency: COPY_FILE_CONCURRENCY,
+    });
     return { path: functionFolder, entryFilename };
 };
 const createZipArchive = async function ({ aliases = new Map(), basePath, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, runtimeAPIVersion, srcFiles, }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.25.5",
+  "version": "9.25.7",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.22.5",
-    "@babel/types": "7.22.19",
+    "@babel/types": "7.23.0",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/serverless-functions-api": "^1.10.1",
     "@vercel/nft": "^0.23.0",
@@ -63,7 +63,7 @@
     "common-path-prefix": "^3.0.0",
     "cp-file": "^10.0.0",
     "es-module-lexer": "^1.0.0",
-    "esbuild": "0.19.4",
+    "esbuild": "0.19.5",
     "execa": "^6.0.0",
     "filter-obj": "^5.0.0",
     "find-up": "^6.0.0",
@@ -95,10 +95,10 @@
     "@types/node": "14.18.63",
     "@types/normalize-path": "3.0.1",
     "@types/resolve": "1.20.4",
-    "@types/semver": "7.5.3",
-    "@types/tmp": "0.2.4",
-    "@types/unixify": "1.0.0",
-    "@types/yargs": "17.0.28",
+    "@types/semver": "7.5.4",
+    "@types/tmp": "0.2.5",
+    "@types/unixify": "1.0.1",
+    "@types/yargs": "17.0.29",
     "@vitest/coverage-v8": "0.34.6",
     "adm-zip": "0.5.10",
     "browserslist": "4.22.1",