fix: execa cjs

Author: devthejo

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+.cjs
 
 .pnp.*
 .yarn/*

.npmignore

@@ -2,3 +2,4 @@ tests
 .github
 .eslintrc.yml
 .gitignore
+.cjs

package.json

@@ -9,7 +9,6 @@
   "license": "MIT",
   "packageManager": "[email protected]",
   "dependencies": {
-    "@esm2cjs/execa": "^6.1.1-cjs.1",
     "ajv": "^8.11.2",
     "async": "^3.2.4",
     "async-retry": "^1.3.3",
@@ -20,6 +19,7 @@
     "direct-logger": "^2.11.1",
     "dotenv": "^16.0.3",
     "enquirer": "^2.3.6",
+    "execa": "^7.1.1",
     "form-data": "^4.0.0",
     "fs-extra": "^11.1.0",
     "humanize-duration": "^3.27.3",
@@ -52,6 +52,7 @@
     "yaml": "^2.1.3"
   },
   "devDependencies": {
+    "@vercel/ncc": "^0.36.1",
     "commit-and-tag-version": "^10.1.0",
     "docsify-cli": "^4.4.4",
     "eslint": "^8.28.0",
@@ -66,7 +67,8 @@
     "jest-specific-snapshot": "^7.0.0",
     "lint-staged": "^13.0.4",
     "prettier": "^2.8.0",
-    "replace": "^1.2.2"
+    "replace": "^1.2.2",
+    "rollup": "^3.20.2"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -81,7 +83,9 @@
     "test": "NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest tests",
     "test:debug": "DEBUG=1 yarn test",
     "test:update-snapshots": "yarn test -u",
-    "postinstall": "[ -d '.husky' ] && husky install || true && link-module-alias",
+    "postinstall": "[ -d '.husky' ] && husky install || true && yarn compile:cjs && link-module-alias",
+    "compile:cjs": "yarn compile:cjs:execa",
+    "compile:cjs:execa": "mkdir -p .cjs/execa && ncc build node_modules/execa/index.js -e cross-spawn -e merge-stream -e signal-exit -o .cjs/execa/ncc-dist && rollup .cjs/execa/ncc-dist/index.js --file .cjs/execa/index.js --format cjs",
     "precommit": "lint-staged",
     "release": "commit-and-tag-version",
     "push": "git push -f --follow-tags origin master",
@@ -92,7 +96,8 @@
     "docker:foundernetes": "yarn docker:foundernetes:build && yarn docker:foundernetes:run"
   },
   "_moduleAliases": {
-    "~": "src"
+    "~": "src",
+    "~cjs": ".cjs"
   },
   "bin": "./bin/foundernetes",
   "files": [

src/lib/execa.js

@@ -2,11 +2,11 @@ const defaults = require("lodash.defaults")
 const pick = require("lodash.pick")
 const omit = require("lodash.omit")
 const { parse } = require("shell-quote")
-const { execa } = require("@esm2cjs/execa")
 const chalk = require("chalk")
 
 const ctx = require("~/ctx")
 
+const { execa } = require("~cjs/execa")
 const sudoFactory = require("./sudo-factory")
 const gosuFactory = require("./gosu-factory")
 

src/lib/gosu-factory.js

@@ -1,4 +1,4 @@
-const { execa } = require("@esm2cjs/execa")
+const { execa } = require("~cjs/execa")
 
 module.exports = (options = {}) => {
   const { execaOptions: execaDefaultOptions = {} } = options

src/lib/sudo-detect-password-needed.js

@@ -1,4 +1,4 @@
-const { execa } = require("@esm2cjs/execa")
+const { execa } = require("~cjs/execa")
 
 module.exports = async () => {
   const { exitCode } = await execa("sudo", ["-n", "true"], { reject: false })

src/lib/sudo-factory.js

@@ -2,7 +2,7 @@ const os = require("os")
 const { randomUUID } = require("node:crypto")
 const { setTimeout } = require("timers/promises")
 const through2 = require("through2")
-const { execa } = require("@esm2cjs/execa")
+const { execa } = require("~cjs/execa")
 const Deferred = require("~/utils/deferred")
 
 const ctx = require("~/ctx")

yarn.lock

@@ -425,76 +425,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esm2cjs/execa@npm:^6.1.1-cjs.1":
-  version: 6.1.1-cjs.1
-  resolution: "@esm2cjs/execa@npm:6.1.1-cjs.1"
-  dependencies:
-    "@esm2cjs/human-signals": ^3.0.1
-    "@esm2cjs/is-stream": ^3.0.0
-    "@esm2cjs/npm-run-path": ^5.1.1-cjs.0
-    "@esm2cjs/onetime": ^6.0.1-cjs.0
-    "@esm2cjs/strip-final-newline": ^3.0.1-cjs.0
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.1
-    merge-stream: ^2.0.0
-    signal-exit: ^3.0.7
-  checksum: 7ae9c0b86f9a924c13f5ab258f07234424a0e33655d3f3c47b0e277adbf0281121586780484b02d09b724d9e753c3d4315a40683c15ff948d72fb12464cfd376
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/human-signals@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@esm2cjs/human-signals@npm:3.0.1"
-  checksum: b3943f331a039b2cce835306b67fb2a11aba2416ab93e58c6787028cf5a2bcb4aeef40a3df741c4e8196c4c85f0b84bee807a7dd3681f60cbedc0c04a43ed040
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/is-stream@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@esm2cjs/is-stream@npm:3.0.0"
-  checksum: b122aac5cd8e9b3c258af42007e4fa08bed34abb8b69062b7e756d14cc09a230cee2816a5ef7403695390ace7ce2d8ccdcdc3e06f92023bb6d50aabc34c73681
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/mimic-fn@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@esm2cjs/mimic-fn@npm:4.0.0"
-  checksum: 1a6027769d61273bd4ba0e7dee9fd20969eb87b1b76974f82ada3f2f97ba2ed0ed1ecda26293cb867f62f28b1b90363dc7804f31c26cf6f76243f730f8d181d4
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/npm-run-path@npm:^5.1.1-cjs.0":
-  version: 5.1.1-cjs.0
-  resolution: "@esm2cjs/npm-run-path@npm:5.1.1-cjs.0"
-  dependencies:
-    "@esm2cjs/path-key": ^4.0.0
-  checksum: 3ec07c58aa27072fb0992166774fbe1b7e9b8e9ff5fe70e9cc1042b4048f7e1abd50bc63a30d3de79143a72887a0ed2d1bc82d3ca80bcbd4bcdefc6b48b4bc93
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/onetime@npm:^6.0.1-cjs.0":
-  version: 6.0.1-cjs.0
-  resolution: "@esm2cjs/onetime@npm:6.0.1-cjs.0"
-  dependencies:
-    "@esm2cjs/mimic-fn": ^4.0.0
-  checksum: 341e04f8ce1737cc1569f6fedb1d462559be7b67c762a2c862f39f08b1bf0cb13824941f0af87578d74e54ed6845b779d2af35999abb1c184ae555a1701bca7c
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/path-key@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@esm2cjs/path-key@npm:4.0.0"
-  checksum: f5207b14c33d8bf09aa3028ddee088d471a58763280e2c78ec14ca7910f07285cb53069c2ef7b1319f2d74ff2685c49267a65658dfac66e225cd614f8e4193ff
-  languageName: node
-  linkType: hard
-
-"@esm2cjs/strip-final-newline@npm:^3.0.1-cjs.0":
-  version: 3.0.1-cjs.0
-  resolution: "@esm2cjs/strip-final-newline@npm:3.0.1-cjs.0"
-  checksum: b840bc29339b4c62372e9d40c0ef9f319859fce9db35a5c49fd9e1d0ba75e560df475a00aa19504793dd5da39a7db1c3e4b9f60d191075a94029ea33e3aaa394
-  languageName: node
-  linkType: hard
-
 "@gar/promisify@npm:^1.1.3":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
@@ -1159,6 +1089,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vercel/ncc@npm:^0.36.1":
+  version: 0.36.1
+  resolution: "@vercel/ncc@npm:0.36.1"
+  dependencies:
+    node-gyp: latest
+  bin:
+    ncc: dist/ncc/cli.js
+  checksum: dcb8db089b07a8fad64c24eef25be6bc2db7ba30582a03236e3a6d332c8653d93a45aba7fe0e01b6d64f3c5b54d23467539ac3664c113f54a9e59341ded79bf9
+  languageName: node
+  linkType: hard
+
 "JSONStream@npm:^1.0.4":
   version: 1.3.5
   resolution: "JSONStream@npm:1.3.5"
@@ -3280,6 +3221,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"execa@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "execa@npm:7.1.1"
+  dependencies:
+    cross-spawn: ^7.0.3
+    get-stream: ^6.0.1
+    human-signals: ^4.3.0
+    is-stream: ^3.0.0
+    merge-stream: ^2.0.0
+    npm-run-path: ^5.1.0
+    onetime: ^6.0.0
+    signal-exit: ^3.0.7
+    strip-final-newline: ^3.0.0
+  checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937
+  languageName: node
+  linkType: hard
+
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
@@ -3508,7 +3466,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "foundernetes@workspace:."
   dependencies:
-    "@esm2cjs/execa": ^6.1.1-cjs.1
+    "@vercel/ncc": ^0.36.1
     ajv: ^8.11.2
     async: ^3.2.4
     async-retry: ^1.3.3
@@ -3528,6 +3486,7 @@ __metadata:
     eslint-plugin-import: ^2.26.0
     eslint-plugin-jest: ^27.1.6
     eslint-plugin-prettier: ^4.2.1
+    execa: ^7.1.1
     form-data: ^4.0.0
     fs-extra: ^11.1.0
     humanize-duration: ^3.27.3
@@ -3555,6 +3514,7 @@ __metadata:
     pretty-ms: ^8.0.0
     qs: ^6.11.0
     replace: ^1.2.2
+    rollup: ^3.20.2
     shell-quote: ^1.8.0
     slugify: ^1.6.5
     sonic-boom: ^3.2.0
@@ -4166,6 +4126,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"human-signals@npm:^4.3.0":
+  version: 4.3.1
+  resolution: "human-signals@npm:4.3.1"
+  checksum: 6f12958df3f21b6fdaf02d90896c271df00636a31e2bbea05bddf817a35c66b38a6fdac5863e2df85bd52f34958997f1f50350ff97249e1dff8452865d5235d1
+  languageName: node
+  linkType: hard
+
 "humanize-duration@npm:^3.27.3":
   version: 3.27.3
   resolution: "humanize-duration@npm:3.27.3"
@@ -7015,6 +6982,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^3.20.2":
+  version: 3.20.2
+  resolution: "rollup@npm:3.20.2"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 34b0932839b7c2a5d1742fb21ce95a47e0b49a0849f4abee2dccf25833187aa7babb898ca90d4fc761cffa4102b9ed0ac6ad7f6f6b96c8b8e2d67305abc5da65
+  languageName: node
+  linkType: hard
+
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"