@netlify/zip-it-and-ship-it 5.3.0 → 5.4.1

package/dist/zip.js

@@ -1,27 +1,18 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zipFunctions = exports.zipFunction = void 0;
+const fs_1 = require("fs");
 const path_1 = require("path");
-const make_dir_1 = __importDefault(require("make-dir"));
 const p_map_1 = __importDefault(require("p-map"));
 const feature_flags_1 = require("./feature_flags");
 const manifest_1 = require("./manifest");
 const runtimes_1 = require("./runtimes");
 const archive_size_1 = require("./utils/archive_size");
 const format_result_1 = require("./utils/format_result");
-const fs_1 = require("./utils/fs");
+const fs_2 = require("./utils/fs");
 const non_nullable_1 = require("./utils/non_nullable");
 const DEFAULT_PARALLEL_LIMIT = 5;
 // TODO: now that we have types, do we still need runtime validation?
@@ -32,74 +23,70 @@ const validateArchiveFormat = (archiveFormat) => {
 };
 // Zip `srcFolder/*` (Node.js or Go files) to `destFolder/*.zip` so it can be
 // used by AWS Lambda
-const zipFunctions = function (relativeSrcFolders, destFolder, { archiveFormat = 'zip', basePath, config = {}, featureFlags: inputFeatureFlags, manifest, parallelLimit = DEFAULT_PARALLEL_LIMIT, repositoryRoot = basePath, } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        validateArchiveFormat(archiveFormat);
-        const featureFlags = (0, feature_flags_1.getFlags)(inputFeatureFlags);
-        const srcFolders = (0, fs_1.resolveFunctionsDirectories)(relativeSrcFolders);
-        const [paths] = yield Promise.all([(0, fs_1.listFunctionsDirectories)(srcFolders), (0, make_dir_1.default)(destFolder)]);
-        const functions = yield (0, runtimes_1.getFunctionsFromPaths)(paths, { config, dedupe: true, featureFlags });
-        const results = yield (0, p_map_1.default)(functions.values(), (func) => __awaiter(this, void 0, void 0, function* () {
-            const zipResult = yield func.runtime.zipFunction({
-                archiveFormat,
-                basePath,
-                config: func.config,
-                destFolder,
-                extension: func.extension,
-                filename: func.filename,
-                mainFile: func.mainFile,
-                name: func.name,
-                repositoryRoot,
-                runtime: func.runtime,
-                srcDir: func.srcDir,
-                srcPath: func.srcPath,
-                stat: func.stat,
-                featureFlags,
-            });
-            return Object.assign(Object.assign({}, zipResult), { mainFile: func.mainFile, name: func.name, runtime: func.runtime });
-        }), {
-            concurrency: parallelLimit,
-        });
-        const formattedResults = yield Promise.all(results.filter(non_nullable_1.nonNullable).map((result) => __awaiter(this, void 0, void 0, function* () {
-            const resultWithSize = yield (0, archive_size_1.addArchiveSize)(result);
-            return (0, format_result_1.formatZipResult)(resultWithSize);
-        })));
-        if (manifest !== undefined) {
-            yield (0, manifest_1.createManifest)({ functions: formattedResults, path: (0, path_1.resolve)(manifest) });
-        }
-        return formattedResults;
-    });
-};
-exports.zipFunctions = zipFunctions;
-const zipFunction = function (relativeSrcPath, destFolder, { archiveFormat = 'zip', basePath, config: inputConfig = {}, featureFlags: inputFeatureFlags, repositoryRoot = basePath, } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        validateArchiveFormat(archiveFormat);
-        const featureFlags = (0, feature_flags_1.getFlags)(inputFeatureFlags);
-        const srcPath = (0, path_1.resolve)(relativeSrcPath);
-        const functions = yield (0, runtimes_1.getFunctionsFromPaths)([srcPath], { config: inputConfig, dedupe: true, featureFlags });
-        if (functions.size === 0) {
-            return;
-        }
-        const { config, extension, filename, mainFile, name, runtime, srcDir, stat: stats, } = functions.values().next().value;
-        yield (0, make_dir_1.default)(destFolder);
-        const zipResult = yield runtime.zipFunction({
+const zipFunctions = async function (relativeSrcFolders, destFolder, { archiveFormat = 'zip', basePath, config = {}, featureFlags: inputFeatureFlags, manifest, parallelLimit = DEFAULT_PARALLEL_LIMIT, repositoryRoot = basePath, } = {}) {
+    validateArchiveFormat(archiveFormat);
+    const featureFlags = (0, feature_flags_1.getFlags)(inputFeatureFlags);
+    const srcFolders = (0, fs_2.resolveFunctionsDirectories)(relativeSrcFolders);
+    const [paths] = await Promise.all([(0, fs_2.listFunctionsDirectories)(srcFolders), fs_1.promises.mkdir(destFolder, { recursive: true })]);
+    const functions = await (0, runtimes_1.getFunctionsFromPaths)(paths, { config, dedupe: true, featureFlags });
+    const results = await (0, p_map_1.default)(functions.values(), async (func) => {
+        const zipResult = await func.runtime.zipFunction({
             archiveFormat,
             basePath,
-            config,
+            config: func.config,
             destFolder,
-            extension,
-            featureFlags,
-            filename,
-            mainFile,
-            name,
+            extension: func.extension,
+            filename: func.filename,
+            mainFile: func.mainFile,
+            name: func.name,
             repositoryRoot,
-            runtime,
-            srcDir,
-            srcPath,
-            stat: stats,
+            runtime: func.runtime,
+            srcDir: func.srcDir,
+            srcPath: func.srcPath,
+            stat: func.stat,
+            featureFlags,
         });
-        return (0, format_result_1.formatZipResult)(Object.assign(Object.assign({}, zipResult), { mainFile, name, runtime }));
+        return { ...zipResult, mainFile: func.mainFile, name: func.name, runtime: func.runtime };
+    }, {
+        concurrency: parallelLimit,
+    });
+    const formattedResults = await Promise.all(results.filter(non_nullable_1.nonNullable).map(async (result) => {
+        const resultWithSize = await (0, archive_size_1.addArchiveSize)(result);
+        return (0, format_result_1.formatZipResult)(resultWithSize);
+    }));
+    if (manifest !== undefined) {
+        await (0, manifest_1.createManifest)({ functions: formattedResults, path: (0, path_1.resolve)(manifest) });
+    }
+    return formattedResults;
+};
+exports.zipFunctions = zipFunctions;
+const zipFunction = async function (relativeSrcPath, destFolder, { archiveFormat = 'zip', basePath, config: inputConfig = {}, featureFlags: inputFeatureFlags, repositoryRoot = basePath, } = {}) {
+    validateArchiveFormat(archiveFormat);
+    const featureFlags = (0, feature_flags_1.getFlags)(inputFeatureFlags);
+    const srcPath = (0, path_1.resolve)(relativeSrcPath);
+    const functions = await (0, runtimes_1.getFunctionsFromPaths)([srcPath], { config: inputConfig, dedupe: true, featureFlags });
+    if (functions.size === 0) {
+        return;
+    }
+    const { config, extension, filename, mainFile, name, runtime, srcDir, stat: stats, } = functions.values().next().value;
+    await fs_1.promises.mkdir(destFolder, { recursive: true });
+    const zipResult = await runtime.zipFunction({
+        archiveFormat,
+        basePath,
+        config,
+        destFolder,
+        extension,
+        featureFlags,
+        filename,
+        mainFile,
+        name,
+        repositoryRoot,
+        runtime,
+        srcDir,
+        srcPath,
+        stat: stats,
     });
+    return (0, format_result_1.formatZipResult)({ ...zipResult, mainFile, name, runtime });
 };
 exports.zipFunction = zipFunction;
 //# sourceMappingURL=zip.js.map

package/dist/zip_binary.js

@@ -1,24 +1,13 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zipBinary = void 0;
 const archive_1 = require("./archive");
 // Zip a binary function file
-const zipBinary = function ({ destPath, filename, runtime, srcPath, stat, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { archive, output } = (0, archive_1.startZip)(destPath);
-        (0, archive_1.addZipFile)(archive, srcPath, filename, stat);
-        (0, archive_1.addZipContent)(archive, JSON.stringify({ runtime: runtime.name }), 'netlify-toolchain');
-        yield (0, archive_1.endZip)(archive, output);
-    });
+const zipBinary = async function ({ destPath, filename, runtime, srcPath, stat, }) {
+    const { archive, output } = (0, archive_1.startZip)(destPath);
+    (0, archive_1.addZipFile)(archive, srcPath, filename, stat);
+    (0, archive_1.addZipContent)(archive, JSON.stringify({ runtime: runtime.name }), 'netlify-toolchain');
+    await (0, archive_1.endZip)(archive, output);
 };
 exports.zipBinary = zipBinary;
 //# sourceMappingURL=zip_binary.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.3.0",
+  "version": "5.4.1",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -11,6 +11,7 @@
     "dist/**/*.d.ts"
   ],
   "scripts": {
+    "prepare": "husky install node_modules/@netlify/eslint-config-node/.husky/",
     "prepublishOnly": "npm ci && npm test",
     "prepack": "npm run build",
     "build": "tsc",
@@ -25,7 +26,7 @@
     "format:check:prettier": "cross-env-shell prettier --check $npm_package_config_prettier",
     "format:fix:prettier": "cross-env-shell prettier --write $npm_package_config_prettier",
     "test:dev": "npm run build && ava",
-    "test:ci": "npm run build && nyc -r lcovonly -r text -r json ava"
+    "test:ci": "npm run build && c8 -r lcovonly -r text -r json ava"
   },
   "config": {
     "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,tests,.github}/**/*.{js,ts,md,html}\" \"*.{js,ts,md,html}\" \".*.{js,ts,md,html}\"",
@@ -34,12 +35,6 @@
   "eslintIgnore": [
     "benchmarks/fixtures/**"
   ],
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "npm run format"
-    }
-  },
   "keywords": [
     "api",
     "bundler",
@@ -74,7 +69,6 @@
     "is-builtin-module": "^3.1.0",
     "junk": "^3.1.0",
     "locate-path": "^6.0.0",
-    "make-dir": "^3.1.0",
     "merge-options": "^3.0.4",
     "minimatch": "^3.0.4",
     "p-map": "^4.0.0",
@@ -93,27 +87,25 @@
   },
   "devDependencies": {
     "@babel/types": "^7.15.6",
-    "@netlify/eslint-config-node": "^4.0.0",
+    "@netlify/eslint-config-node": "^4.1.5",
     "@types/archiver": "^5.1.1",
     "@types/end-of-stream": "^1.4.1",
     "@types/resolve": "^1.20.1",
     "@types/semver": "^7.3.8",
     "@types/unixify": "^1.0.0",
     "@types/yargs": "^17.0.4",
-    "adm-zip": "0.5.5",
     "ava": "^3.0.0",
+    "c8": "^7.11.0",
     "cpy": "^8.0.0",
     "deepmerge": "^4.2.2",
     "get-stream": "^6.0.0",
-    "husky": "^4.3.8",
+    "husky": "^7.0.4",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.0.0",
     "p-every": "^2.0.0",
     "sinon": "^12.0.0",
     "sort-on": "^4.1.1",
     "source-map-support": "^0.5.20",
-    "throat": "^6.0.1",
-    "typescript": "^4.4.3"
+    "throat": "^6.0.1"
   },
   "engines": {
     "node": "^12.20.0 || ^14.14.0 || >=16.0.0"