@netlify/zip-it-and-ship-it 5.1.0 → 5.2.0

package/dist/feature_flags.js

@@ -6,7 +6,6 @@ const FLAGS = {
     buildGoSource: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_BUILD_GO_SOURCE),
     buildRustSource: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE),
     defaultEsModulesToEsbuild: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_DEFAULT_ES_MODULES_TO_ESBUILD),
-    nftTranspile: false,
     parseISC: false,
     parseWithEsbuild: false,
     traceWithNft: false,

package/dist/runtimes/node/bundlers/esbuild/bundler.d.ts

@@ -14,7 +14,6 @@ declare const bundleJsFile: ({ additionalModulePaths, basePath, config, external
     bundlePaths: Map<string, string>;
     cleanTempFiles: () => Promise<void>;
     inputs: string[];
-    iscImporterPaths: Set<string>;
     nativeNodeModules: {};
     nodeModulesWithDynamicImports: string[];
     warnings: import("@netlify/esbuild").Message[];

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

@@ -16,7 +16,6 @@ const tmp_promise_1 = require("tmp-promise");
 const fs_1 = require("../../../../utils/fs");
 const bundler_target_1 = require("./bundler_target");
 const plugin_dynamic_imports_1 = require("./plugin_dynamic_imports");
-const plugin_in_source_config_1 = require("./plugin_in_source_config");
 const plugin_native_modules_1 = require("./plugin_native_modules");
 const plugin_node_builtin_1 = require("./plugin_node_builtin");
 // Maximum number of log messages that an esbuild instance will produce. This
@@ -45,7 +44,6 @@ const bundleJsFile = function ({ additionalModulePaths, basePath, config, extern
         // format) to be included in the bundle in order to make a dynamic import
         // work at runtime.
         const dynamicImportsIncludedPaths = new Set();
-        const iscImporterPaths = new Set();
         // The list of esbuild plugins to enable for this build.
         const plugins = [
             (0, plugin_node_builtin_1.getNodeBuiltinPlugin)(),
@@ -57,7 +55,6 @@ const bundleJsFile = function ({ additionalModulePaths, basePath, config, extern
                 processImports: config.processDynamicNodeImports !== false,
                 srcDir,
             }),
-            (0, plugin_in_source_config_1.getISCImportFinderPlugin)({ importerPaths: iscImporterPaths }),
         ];
         // The version of ECMAScript to use as the build target. This will determine
         // whether certain features are transpiled down or left untransformed.
@@ -95,7 +92,6 @@ const bundleJsFile = function ({ additionalModulePaths, basePath, config, extern
                 bundlePaths,
                 cleanTempFiles,
                 inputs,
-                iscImporterPaths,
                 nativeNodeModules,
                 nodeModulesWithDynamicImports: [...nodeModulesWithDynamicImports],
                 warnings,

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

@@ -39,7 +39,7 @@ const getExternalAndIgnoredModules = ({ config, srcDir }) => __awaiter(void 0, v
 });
 const bundle = ({ basePath, config = {}, extension, featureFlags, filename, mainFile, name, pluginsModulesPath, repositoryRoot, runtime, srcDir, srcPath, stat, }) => __awaiter(void 0, void 0, void 0, function* () {
     const { externalModules, ignoredModules } = yield getExternalAndIgnoredModules({ config, srcDir });
-    const { additionalPaths, bundlePaths, cleanTempFiles, inputs, iscImporterPaths, nativeNodeModules = {}, nodeModulesWithDynamicImports, warnings, } = yield (0, bundler_1.bundleJsFile)({
+    const { additionalPaths, bundlePaths, cleanTempFiles, inputs, nativeNodeModules = {}, nodeModulesWithDynamicImports, warnings, } = yield (0, bundler_1.bundleJsFile)({
         additionalModulePaths: pluginsModulesPath ? [pluginsModulesPath] : [],
         basePath,
         config,
@@ -81,7 +81,6 @@ const bundle = ({ basePath, config = {}, extension, featureFlags, filename, main
         basePath: functionBasePath,
         bundlerWarnings,
         inputs,
-        iscImporterPaths,
         mainFile: normalizedMainFile,
         nativeNodeModules,
         nodeModulesWithDynamicImports,

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

@@ -19,7 +19,6 @@ declare type BundleFunction = (args: {
     bundlerWarnings?: BundlerWarning[];
     cleanupFunction?: CleanupFunction;
     inputs: string[];
-    iscImporterPaths?: Set<string>;
     mainFile: string;
     nativeNodeModules?: NativeNodeModules;
     nodeModulesWithDynamicImports?: string[];

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

@@ -24,7 +24,7 @@ const es_modules_1 = require("./es_modules");
 // Paths that will be excluded from the tracing process.
 const ignore = ['node_modules/aws-sdk/**'];
 const appearsToBeModuleName = (name) => !name.startsWith('.');
-const bundle = ({ basePath, config, featureFlags, mainFile, pluginsModulesPath, repositoryRoot = basePath, }) => __awaiter(void 0, void 0, void 0, function* () {
+const bundle = ({ basePath, config, mainFile, pluginsModulesPath, repositoryRoot = basePath, }) => __awaiter(void 0, void 0, void 0, function* () {
     const { includedFiles = [], includedFilesBasePath } = config;
     const { exclude: excludedPaths, paths: includedFilePaths } = yield (0, included_files_1.getPathsOfIncludedFiles)(includedFiles, includedFilesBasePath || basePath);
     const { paths: dependencyPaths, rewrites } = yield traceFilesAndTranspile({
@@ -32,7 +32,6 @@ const bundle = ({ basePath, config, featureFlags, mainFile, pluginsModulesPath,
         config,
         mainFile,
         pluginsModulesPath,
-        transpile: featureFlags.nftTranspile,
     });
     const filteredIncludedPaths = (0, included_files_1.filterExcludedPaths)([...dependencyPaths, ...includedFilePaths], excludedPaths);
     const dirnames = filteredIncludedPaths.map((filePath) => (0, path_1.normalize)((0, path_1.dirname)(filePath))).sort();
@@ -51,7 +50,7 @@ const ignoreFunction = (path) => {
     const shouldIgnore = ignore.some((expression) => (0, minimatch_1.default)(normalizedPath, expression));
     return shouldIgnore;
 };
-const traceFilesAndTranspile = function ({ basePath, config, mainFile, pluginsModulesPath, transpile, }) {
+const traceFilesAndTranspile = function ({ basePath, config, mainFile, pluginsModulesPath, }) {
     return __awaiter(this, void 0, void 0, function* () {
         const fsCache = {};
         const { fileList: dependencyPaths, esmFileList, reasons, } = yield (0, nft_1.nodeFileTrace)([mainFile], {
@@ -86,9 +85,7 @@ const traceFilesAndTranspile = function ({ basePath, config, mainFile, pluginsMo
             }),
         });
         const normalizedDependencyPaths = [...dependencyPaths].map((path) => basePath ? (0, path_1.resolve)(basePath, path) : (0, path_1.resolve)(path));
-        const rewrites = transpile
-            ? yield (0, es_modules_1.transpileESM)({ basePath, config, esmPaths: esmFileList, fsCache, reasons })
-            : undefined;
+        const rewrites = yield (0, es_modules_1.transpileESM)({ basePath, config, esmPaths: esmFileList, fsCache, reasons });
         return {
             paths: normalizedDependencyPaths,
             rewrites,

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

@@ -2,13 +2,11 @@ import { ArgumentPlaceholder, Expression, SpreadElement, JSXNamespacedName } fro
 import { parse as parseSchedule } from './properties/schedule';
 declare const IN_SOURCE_CONFIG_MODULE = "@netlify/functions";
 declare type ISCValues = Partial<ReturnType<typeof parseSchedule>>;
-declare const findISCDeclarationsInPaths: (sourcePaths: string[]) => Promise<Partial<{
-    schedule: string | undefined;
-}>>;
+declare const findISCDeclarationsInPath: (sourcePath: string) => Promise<ISCValues>;
 declare type ISCHandlerArg = ArgumentPlaceholder | Expression | SpreadElement | JSXNamespacedName;
 interface ISCExport {
     local: string;
     args: ISCHandlerArg[];
 }
-export { findISCDeclarationsInPaths, IN_SOURCE_CONFIG_MODULE };
+export { findISCDeclarationsInPath, IN_SOURCE_CONFIG_MODULE };
 export type { ISCExport, ISCHandlerArg, ISCValues };

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IN_SOURCE_CONFIG_MODULE = exports.findISCDeclarationsInPaths = void 0;
+exports.IN_SOURCE_CONFIG_MODULE = exports.findISCDeclarationsInPath = void 0;
 const non_nullable_1 = require("../../../utils/non_nullable");
 const parser_1 = require("../parser");
 const exports_1 = require("../parser/exports");
@@ -45,10 +45,5 @@ const findISCDeclarationsInPath = (sourcePath) => __awaiter(void 0, void 0, void
     const mergedExports = iscExports.reduce((acc, obj) => (Object.assign(Object.assign({}, acc), obj)), {});
     return mergedExports;
 });
-const findISCDeclarationsInPaths = (sourcePaths) => __awaiter(void 0, void 0, void 0, function* () {
-    const paths = yield Promise.all(sourcePaths.map(findISCDeclarationsInPath));
-    const mergedValues = paths.reduce((acc, obj) => (Object.assign(Object.assign({}, acc), obj)), {});
-    return mergedValues;
-});
-exports.findISCDeclarationsInPaths = findISCDeclarationsInPaths;
+exports.findISCDeclarationsInPath = findISCDeclarationsInPath;
 //# sourceMappingURL=index.js.map

package/dist/runtimes/node/index.js

@@ -74,7 +74,7 @@ const zipFunction = function ({ archiveFormat, basePath, config = {}, destFolder
             yield (0, cp_file_1.default)(srcPath, destPath);
             return { config, path: destPath };
         }
-        const { aliases = new Map(), cleanupFunction, basePath: finalBasePath, bundlerWarnings, inputs, iscImporterPaths = new Set(), mainFile: finalMainFile = mainFile, nativeNodeModules, nodeModulesWithDynamicImports, rewrites, srcFiles, } = yield bundler.bundle({
+        const { aliases = new Map(), cleanupFunction, basePath: finalBasePath, bundlerWarnings, inputs, mainFile: finalMainFile = mainFile, nativeNodeModules, nodeModulesWithDynamicImports, rewrites, srcFiles, } = yield bundler.bundle({
             basePath,
             config,
             extension,
@@ -91,7 +91,7 @@ const zipFunction = function ({ archiveFormat, basePath, config = {}, destFolder
         });
         let inSourceConfig = {};
         if (featureFlags.parseISC) {
-            inSourceConfig = yield (0, in_source_config_1.findISCDeclarationsInPaths)([...iscImporterPaths]);
+            inSourceConfig = yield (0, in_source_config_1.findISCDeclarationsInPath)(mainFile);
         }
         (0, plugin_modules_path_1.createAliases)(srcFiles, pluginsModulesPath, aliases, finalBasePath);
         const zipPath = yield (0, zip_1.zipNodeJs)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -93,7 +93,7 @@
   },
   "devDependencies": {
     "@babel/types": "^7.15.6",
-    "@netlify/eslint-config-node": "^3.3.8",
+    "@netlify/eslint-config-node": "^3.3.10",
     "@types/archiver": "^5.1.1",
     "@types/end-of-stream": "^1.4.1",
     "@types/resolve": "^1.20.1",

package/dist/runtimes/node/bundlers/esbuild/plugin_in_source_config.d.ts

@@ -1,5 +0,0 @@
-import type { Plugin } from '@netlify/esbuild';
-declare const getISCImportFinderPlugin: ({ importerPaths }: {
-    importerPaths: Set<string>;
-}) => Plugin;
-export { getISCImportFinderPlugin };

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

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getISCImportFinderPlugin = void 0;
-const in_source_config_1 = require("../../in_source_config");
-// An esbuild plugin that collects the paths of any files that import the
-// in-source configuration module.
-const getISCImportFinderPlugin = ({ importerPaths }) => ({
-    name: 'find-isc-imports',
-    setup(build) {
-        const filter = new RegExp(`^${in_source_config_1.IN_SOURCE_CONFIG_MODULE}$`);
-        build.onResolve({ filter }, (args) => {
-            importerPaths.add(args.importer);
-            // eslint-disable-next-line unicorn/no-useless-undefined
-            return undefined;
-        });
-    },
-});
-exports.getISCImportFinderPlugin = getISCImportFinderPlugin;
-//# sourceMappingURL=plugin_in_source_config.js.map