@netlify/zip-it-and-ship-it 5.9.1 → 5.9.2

package/dist/runtimes/node/bundlers/nft/es_modules.d.ts

@@ -3,7 +3,7 @@ import type { FunctionConfig } from '../../../../config.js';
 import { FeatureFlags } from '../../../../feature_flags.js';
 import { FsCache } from '../../../../utils/fs.js';
 import { ModuleFormat } from '../../utils/module_format.js';
-export declare const processESM: ({ basePath, config, esmPaths, featureFlags, fsCache, mainFile, reasons, }: {
+export declare const processESM: ({ basePath, config, esmPaths, featureFlags, fsCache, mainFile, reasons, name, }: {
     basePath: string | undefined;
     config: FunctionConfig;
     esmPaths: Set<string>;
@@ -11,6 +11,7 @@ export declare const processESM: ({ basePath, config, esmPaths, featureFlags, fs
     fsCache: FsCache;
     mainFile: string;
     reasons: NodeFileTraceReasons;
+    name: string;
 }) => Promise<{
     rewrites?: Map<string, string> | undefined;
     moduleFormat: ModuleFormat;

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

@@ -28,7 +28,7 @@ const patchESMPackage = async (path, fsCache) => {
     };
     return JSON.stringify(patchedPackageJson);
 };
-const processESM = async ({ basePath, config, esmPaths, featureFlags, fsCache, mainFile, reasons, }) => {
+const processESM = async ({ basePath, config, esmPaths, featureFlags, fsCache, mainFile, reasons, name, }) => {
     const entrypointIsESM = isEntrypointESM({ basePath, esmPaths, mainFile });
     if (!entrypointIsESM) {
         return {
@@ -42,7 +42,7 @@ const processESM = async ({ basePath, config, esmPaths, featureFlags, fsCache, m
             moduleFormat: 'esm',
         };
     }
-    const rewrites = await transpileESM({ basePath, config, esmPaths, fsCache, reasons });
+    const rewrites = await transpileESM({ basePath, config, esmPaths, fsCache, reasons, name });
     return {
         moduleFormat: 'cjs',
         rewrites,
@@ -75,7 +75,7 @@ const shouldTranspile = (path, cache, esmPaths, reasons) => {
     cache.set(path, shouldTranspilePath);
     return shouldTranspilePath;
 };
-const transpileESM = async ({ basePath, config, esmPaths, fsCache, reasons, }) => {
+const transpileESM = async ({ basePath, config, esmPaths, fsCache, reasons, name, }) => {
     const cache = new Map();
     const pathsToTranspile = [...esmPaths].filter((path) => shouldTranspile(path, cache, esmPaths, reasons));
     const pathsToTranspileSet = new Set(pathsToTranspile);
@@ -91,7 +91,7 @@ const transpileESM = async ({ basePath, config, esmPaths, fsCache, reasons, }) =
     const rewrites = await getPatchedESMPackages(packageJsonPaths, fsCache);
     await Promise.all(pathsToTranspile.map(async (path) => {
         const absolutePath = resolvePath(path, basePath);
-        const transpiled = await (0, transpile_js_1.transpile)(absolutePath, config);
+        const transpiled = await (0, transpile_js_1.transpile)(absolutePath, config, name);
         rewrites.set(absolutePath, transpiled);
     }));
     return rewrites;

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

@@ -15,7 +15,7 @@ const es_modules_js_1 = require("./es_modules.js");
 // Paths that will be excluded from the tracing process.
 const ignore = ['node_modules/aws-sdk/**'];
 const appearsToBeModuleName = (name) => !name.startsWith('.');
-const bundle = async ({ basePath, config, featureFlags, mainFile, pluginsModulesPath, repositoryRoot = basePath, }) => {
+const bundle = async ({ basePath, config, featureFlags, mainFile, name, pluginsModulesPath, repositoryRoot = basePath, }) => {
     const { includedFiles = [], includedFilesBasePath } = config;
     const { exclude: excludedPaths, paths: includedFilePaths } = await (0, included_files_js_1.getPathsOfIncludedFiles)(includedFiles, includedFilesBasePath || basePath);
     const { moduleFormat, paths: dependencyPaths, rewrites, } = await traceFilesAndTranspile({
@@ -24,6 +24,7 @@ const bundle = async ({ basePath, config, featureFlags, mainFile, pluginsModules
         featureFlags,
         mainFile,
         pluginsModulesPath,
+        name,
     });
     const filteredIncludedPaths = (0, included_files_js_1.filterExcludedPaths)([...dependencyPaths, ...includedFilePaths], excludedPaths);
     const dirnames = filteredIncludedPaths.map((filePath) => (0, path_1.normalize)((0, path_1.dirname)(filePath))).sort();
@@ -43,7 +44,7 @@ const ignoreFunction = (path) => {
     const shouldIgnore = ignore.some((expression) => (0, minimatch_1.default)(normalizedPath, expression));
     return shouldIgnore;
 };
-const traceFilesAndTranspile = async function ({ basePath, config, featureFlags, mainFile, pluginsModulesPath, }) {
+const traceFilesAndTranspile = async function ({ basePath, config, featureFlags, mainFile, pluginsModulesPath, name, }) {
     const fsCache = {};
     const { fileList: dependencyPaths, esmFileList, reasons, } = await (0, nft_1.nodeFileTrace)([mainFile], {
         base: basePath,
@@ -85,6 +86,7 @@ const traceFilesAndTranspile = async function ({ basePath, config, featureFlags,
         fsCache,
         mainFile,
         reasons,
+        name,
     });
     return {
         moduleFormat,

package/dist/runtimes/node/bundlers/nft/transpile.d.ts

@@ -1,2 +1,2 @@
 import type { FunctionConfig } from '../../../../config.js';
-export declare const transpile: (path: string, config: FunctionConfig) => Promise<string>;
+export declare const transpile: (path: string, config: FunctionConfig, functionName: string) => Promise<string>;

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

@@ -3,21 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transpile = void 0;
 const esbuild_1 = require("@netlify/esbuild");
 const bundler_target_js_1 = require("../esbuild/bundler_target.js");
-const transpile = async (path, config) => {
+const transpile = async (path, config, functionName) => {
     // The version of ECMAScript to use as the build target. This will determine
     // whether certain features are transpiled down or left untransformed.
     const nodeTarget = (0, bundler_target_js_1.getBundlerTarget)(config.nodeVersion);
-    const transpiled = await (0, esbuild_1.build)({
-        bundle: false,
-        entryPoints: [path],
-        format: 'cjs',
-        logLevel: 'error',
-        platform: 'node',
-        sourcemap: Boolean(config.nodeSourcemap),
-        target: [nodeTarget],
-        write: false,
-    });
-    return transpiled.outputFiles[0].text;
+    try {
+        const transpiled = await (0, esbuild_1.build)({
+            bundle: false,
+            entryPoints: [path],
+            format: 'cjs',
+            logLevel: 'error',
+            platform: 'node',
+            sourcemap: Boolean(config.nodeSourcemap),
+            target: [nodeTarget],
+            write: false,
+        });
+        return transpiled.outputFiles[0].text;
+    }
+    catch (error) {
+        const bundler = 'nft';
+        const runtime = 'js';
+        error.customErrorInfo = {
+            type: 'functionsBundling',
+            location: { bundler, functionName, runtime },
+        };
+        throw error;
+    }
 };
 exports.transpile = transpile;
 //# sourceMappingURL=transpile.js.map

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,10 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSrcFiles = void 0;
 /* eslint-disable max-lines */
 const path_1 = require("path");
-const process = __importStar(require("process"));
 const junk_1 = require("junk");
 const precinct_1 = __importDefault(require("precinct"));
-const semver_1 = __importDefault(require("semver"));
 const non_nullable_js_1 = require("../../../../utils/non_nullable.js");
 const included_files_js_1 = require("../../utils/included_files.js");
 const package_json_js_1 = require("../../utils/package_json.js");
@@ -84,34 +59,15 @@ const getDependencies = async function ({ featureFlags, functionName, mainFile,
         throw error;
     }
 };
-const paperwork = async (path) => {
-    if (semver_1.default.lt(process.version, '18.0.0')) {
-        return await precinct_1.default.paperwork(path, { includeCore: false });
-    }
-    // for Node v18, we're temporarily using our own mechanism to filter out core dependencies, until
-    // https://github.com/dependents/node-precinct/pull/108 landed
-    const modules = await precinct_1.default.paperwork(path, { includeCore: true });
-    return modules.filter((moduleName) => {
-        if (moduleName.startsWith('node:')) {
-            return false;
-        }
-        // only require("node:test") refers to the
-        // builtin, require("test") doesn't
-        if (moduleName === 'test') {
-            return true;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const isNativeModule = moduleName in process.binding('natives');
-        return !isNativeModule;
-    });
-};
 const getFileDependencies = async function ({ featureFlags, functionName, path, packageJson, pluginsModulesPath, state, treeShakeNext = false, }) {
     if (state.localFiles.has(path)) {
         return [];
     }
     state.localFiles.add(path);
     const basedir = (0, path_1.dirname)(path);
-    const dependencies = featureFlags.parseWithEsbuild ? await (0, list_imports_js_1.listImports)({ functionName, path }) : await paperwork(path);
+    const dependencies = featureFlags.parseWithEsbuild
+        ? await (0, list_imports_js_1.listImports)({ functionName, path })
+        : await precinct_1.default.paperwork(path, { includeCore: false });
     const depsPaths = await Promise.all(dependencies.filter(non_nullable_js_1.nonNullable).map((dependency) => getImportDependencies({
         dependency,
         basedir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.9.1",
+  "version": "5.9.2",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "@babel/parser": "7.16.8",
-    "@netlify/esbuild": "0.14.23",
+    "@netlify/esbuild": "0.14.25",
     "@vercel/nft": "^0.18.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
@@ -74,7 +74,7 @@
     "p-map": "^4.0.0",
     "path-exists": "^4.0.0",
     "pkg-dir": "^5.0.0",
-    "precinct": "^8.2.0",
+    "precinct": "^9.0.1",
     "read-package-json-fast": "^2.0.2",
     "require-package-name": "^2.0.1",
     "resolve": "^2.0.0-next.1",