feat(pack-directory): Remove figgy-pudding

lerna · Nov 24, 2020 · 640faa5 · 640faa5
1 parent bdc162d
commit 640faa5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/utils/pack-directory/__tests__/pack-directory.test.js b/utils/pack-directory/__tests__/pack-directory.test.js
@@ -158,8 +158,8 @@ describe("pack-directory", () => {
       next,
       next.location,
       Object.assign({}, conf, {
-        "ignore-prepublish": true,
-        "lerna-command": "publish",
+        ignorePrepublish: true,
+        lernaCommand: "publish",
       })
     );
 

diff --git a/utils/pack-directory/lib/pack-directory.js b/utils/pack-directory/lib/pack-directory.js
@@ -1,7 +1,6 @@
 "use strict";
 
 const path = require("path");
-const figgyPudding = require("figgy-pudding");
 const packlist = require("npm-packlist");
 const log = require("npmlog");
 const tar = require("tar");
@@ -12,17 +11,25 @@ const runLifecycle = require("@lerna/run-lifecycle");
 
 module.exports = packDirectory;
 
-const PackConfig = figgyPudding({
-  log: { default: log },
-  "lerna-command": { default: "pack" },
-  lernaCommand: "lerna-command",
-  "ignore-prepublish": {},
-  ignorePrepublish: "ignore-prepublish",
-});
+/**
+ * @typedef {object} PackConfig
+ * @property {typeof log} [log]
+ * @property {string} [lernaCommand] If "publish", run "prepublishOnly" lifecycle
+ * @property {boolean} [ignorePrepublish]
+ */
 
-function packDirectory(_pkg, dir, _opts) {
+/**
+ * Pack a directory suitable for publishing, writing tarball to a tempfile.
+ * @param {Package|string} _pkg Package instance or path to manifest
+ * @param {string} dir to pack
+ * @param {PackConfig} options
+ */
+function packDirectory(_pkg, dir, options) {
   const pkg = Package.lazy(_pkg, dir);
-  const opts = PackConfig(_opts);
+  const opts = {
+    log,
+    ...options,
+  };
 
   opts.log.verbose("pack-directory", path.relative(".", pkg.contents));
 

diff --git a/utils/pack-directory/package.json b/utils/pack-directory/package.json
@@ -30,7 +30,6 @@
     "@lerna/get-packed": "file:../get-packed",
     "@lerna/package": "file:../../core/package",
     "@lerna/run-lifecycle": "file:../run-lifecycle",
-    "figgy-pudding": "^3.5.1",
     "npm-packlist": "^2.1.4",
     "npmlog": "^4.1.2",
     "tar": "^6.0.5",