@netlify/zip-it-and-ship-it 9.18.1 → 9.19.0

package/dist/manifest.d.ts

@@ -2,6 +2,7 @@ import type { InvocationMode } from './function.js';
 import type { FunctionResult } from './utils/format_result.js';
 import type { Route } from './utils/routes.js';
 interface ManifestFunction {
+    buildData?: Record<string, unknown>;
     invocationMode?: InvocationMode;
     mainFile: string;
     name: string;

package/dist/manifest.js

@@ -12,12 +12,13 @@ export const createManifest = async ({ functions, path }) => {
     };
     await fs.writeFile(path, JSON.stringify(payload));
 };
-const formatFunctionForManifest = ({ bundler, displayName, generator, invocationMode, mainFile, name, path, routes, runtime, runtimeVersion, schedule, }) => {
+const formatFunctionForManifest = ({ bundler, displayName, generator, invocationMode, mainFile, name, path, routes, runtime, runtimeVersion, runtimeAPIVersion, schedule, }) => {
     const manifestFunction = {
         bundler,
         displayName,
         generator,
         invocationMode,
+        buildData: { runtimeAPIVersion },
         mainFile,
         name,
         runtimeVersion,

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

@@ -7,7 +7,8 @@ import { getBasePath } from '../../utils/base_path.js';
 import { filterExcludedPaths, getPathsOfIncludedFiles } from '../../utils/included_files.js';
 import { MODULE_FORMAT, MODULE_FILE_EXTENSION, tsExtensions } from '../../utils/module_format.js';
 import { getNodeSupportMatrix } from '../../utils/node_version.js';
-import { getModuleFormat as getTSModuleFormat } from '../../utils/tsconfig.js';
+import { getClosestPackageJson } from '../../utils/package_json.js';
+import { getModuleFormat as getModuleFormatFromTsConfig } from '../../utils/tsconfig.js';
 import { processESM } from './es_modules.js';
 import { transpile } from './transpile.js';
 const appearsToBeModuleName = (name) => !name.startsWith('.');
@@ -50,9 +51,32 @@ const getIgnoreFunction = (config) => {
         return shouldIgnore;
     };
 };
+/**
+ * Returns the module format that should be used when transpiling a TypeScript
+ * file.
+ */
+const getTSModuleFormat = async (mainFile, repositoryRoot) => {
+    const fromTsConfig = getModuleFormatFromTsConfig(mainFile, repositoryRoot);
+    // If we can infer the module type from a `tsconfig.json` file, use that.
+    if (fromTsConfig !== undefined) {
+        return fromTsConfig;
+    }
+    // At this point, we need to infer the module type from the `type` field in
+    // the closest `package.json`.
+    try {
+        const packageJSON = await getClosestPackageJson(dirname(mainFile), repositoryRoot);
+        if (packageJSON?.contents.type === 'module') {
+            return MODULE_FORMAT.ESM;
+        }
+    }
+    catch {
+        // no-op
+    }
+    return MODULE_FORMAT.COMMONJS;
+};
 const traceFilesAndTranspile = async function ({ basePath, cache, config, featureFlags, mainFile, pluginsModulesPath, name, repositoryRoot, runtimeAPIVersion, }) {
     const isTypeScript = tsExtensions.has(extname(mainFile));
-    const tsFormat = isTypeScript ? getTSModuleFormat(mainFile, repositoryRoot) : MODULE_FORMAT.COMMONJS;
+    const tsFormat = isTypeScript ? await getTSModuleFormat(mainFile, repositoryRoot) : MODULE_FORMAT.COMMONJS;
     const tsAliases = new Map();
     const tsRewrites = new Map();
     const { fileList: dependencyPaths, esmFileList, reasons, } = await nodeFileTrace([mainFile], {

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

@@ -1 +1,6 @@
-export declare const getModuleFormat: (path: string, boundary?: string) => "cjs" | "esm";
+/**
+ * Looks for a `tsconfig.json` file on a given path and, if one exists, returns
+ * the module format inferred from the `module` property. If no file is found
+ * or if no `module` property is defined, the function returns `undefined`.
+ */
+export declare const getModuleFormat: (path: string, boundary?: string) => "cjs" | "esm" | undefined;

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

@@ -2,19 +2,25 @@ import { dirname, relative } from 'path';
 import { getTsconfig } from 'get-tsconfig';
 import { MODULE_FORMAT } from './module_format.js';
 const esmModuleValues = new Set(['es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext']);
-// Returns the module format that should be used for a TypeScript file at a
-// given path, by reading the associated `tsconfig.json` file if it exists.
+/**
+ * Looks for a `tsconfig.json` file on a given path and, if one exists, returns
+ * the module format inferred from the `module` property. If no file is found
+ * or if no `module` property is defined, the function returns `undefined`.
+ */
 export const getModuleFormat = (path, boundary) => {
     const file = getTsconfig(path);
     if (!file) {
-        return MODULE_FORMAT.COMMONJS;
+        return;
     }
     // If there is a boundary defined and the file we found is outside of it,
     // discard the file.
     if (boundary !== undefined && relative(boundary, dirname(file.path)).startsWith('..')) {
-        return MODULE_FORMAT.COMMONJS;
+        return;
+    }
+    const moduleProp = file.config.compilerOptions?.module;
+    if (!moduleProp) {
+        return;
     }
-    const moduleProp = file.config.compilerOptions?.module?.toLowerCase() ?? '';
     return esmModuleValues.has(moduleProp) ? MODULE_FORMAT.ESM : MODULE_FORMAT.COMMONJS;
 };
 //# sourceMappingURL=tsconfig.js.map

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

@@ -126,7 +126,8 @@ const createZipArchive = async function ({ aliases = new Map(), basePath, cache,
             addZipContent(archive, packageJSON.contents, packageJSON.path);
         }
     }
-    const srcFilesInfos = await Promise.all(srcFiles.map((file) => addStat(cache, file)));
+    const deduplicatedSrcFiles = [...new Set(srcFiles)];
+    const srcFilesInfos = await Promise.all(deduplicatedSrcFiles.map((file) => addStat(cache, file)));
     // We ensure this is not async, so that the archive's checksum is
     // deterministic. Otherwise it depends on the order the files were added.
     srcFilesInfos.forEach(({ srcFile, stat }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.18.1",
+  "version": "9.19.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -88,21 +88,22 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@babel/types": "7.22.17",
+    "@babel/types": "7.22.19",
     "@netlify/eslint-config-node": "7.0.1",
     "@skn0tt/lambda-local": "2.0.3",
-    "@types/archiver": "5.3.2",
+    "@types/archiver": "5.3.3",
     "@types/glob": "8.1.0",
-    "@types/is-ci": "3.0.0",
-    "@types/node": "14.18.56",
+    "@types/is-ci": "3.0.1",
+    "@types/node": "14.18.63",
     "@types/normalize-path": "3.0.0",
     "@types/resolve": "1.20.2",
-    "@types/semver": "7.5.1",
-    "@types/tmp": "0.2.3",
+    "@types/semver": "7.5.2",
+    "@types/tmp": "0.2.4",
     "@types/unixify": "1.0.0",
     "@types/yargs": "17.0.24",
     "@vitest/coverage-v8": "0.34.4",
-    "browserslist": "4.21.10",
+    "adm-zip": "0.5.10",
+    "browserslist": "4.21.11",
     "cardinal": "2.1.1",
     "cpy": "9.0.1",
     "deepmerge": "4.3.1",