fixed npm8

Author: HillLiu

packages/yonpx/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.15.0",
+  "version": "0.15.1",
   "name": "yonpx",
   "repository": {
     "type": "git",

packages/yonpx/src/__tests__/Test.js

@@ -4,9 +4,12 @@ const { init, getNpxCmd, getPkgName, npxPath } = require("../init");
 
 describe("Test yonpx", () => {
   it("test getNpxCmd", () => {
-    /*your test code*/
     const actual = getNpxCmd(["", "", "reshow"]);
-    expect(actual.p).to.deep.equal(["yo@latest", "generator-reshow@latest"]);
+    if (actual.p) {
+      expect(actual.p).to.deep.equal(["yo@latest", "generator-reshow@latest"]);
+    } else {
+      expect(actual[5]).to.equal("yo reshow ");
+    }
   });
 });
 

packages/yonpx/src/init.js

@@ -10,10 +10,25 @@ const npxPath = () => {
   if (!FS.existsSync(libnpx)) {
     libnpx = getPath([path]);
   }
+  if (!FS.existsSync(libnpx)) {
+    libnpx = getPath(["../lib", "node_modules/npm/lib/cli.js"]);
+  }
   return { libnpx, npmCli: getPath(["npm"]) };
 };
 const { libnpx, npmCli } = npxPath();
-const npx = createRequire(libnpx)("libnpx");
+
+const npx8 = (cmd) => {
+  const npmcli = require(libnpx);
+  process.argv[1] = libnpx;
+  process.argv.splice(2, 0, "exec");
+  for (let i = 0, j = cmd.length; i < j; i++) {
+    process.argv[i + 3] = cmd[i];
+  }
+  npmcli(process);
+};
+
+const npx =
+  libnpx.substr(-6) === "cli.js" ? npx8 : createRequire(libnpx)("libnpx");
 
 const pkgPrefix = "generator-";
 const isOrgReg = /^@[^/]+\//;
@@ -32,26 +47,26 @@ const getNpxCmd = (argv) => {
     return false;
   }
 
-  const parsed = npx.parseArgs(
-    [
-      "-p",
-      "yo",
-      "-p",
-      getPkgName(generatorPkg),
-      "-c",
-      `yo ${generatorName} ${otherArgv.join(" ")}`,
-    ],
-    npmCli
-  );
-  return parsed;
+  let cmd = [
+    "--package",
+    "yo",
+    "--package",
+    getPkgName(generatorPkg),
+    "--call",
+    `yo ${generatorName} ${otherArgv.join(" ")}`,
+  ];
+  if (npx.parseArgs != null) {
+    cmd = npx.parseArgs(cmd, npmCli);
+  }
+
+  return cmd;
 };
 
 const init = async () => {
   const argv = process.argv;
   const cmdOptions = getNpxCmd(argv);
   if (cmdOptions) {
     await npx(cmdOptions);
-    process.exit(0);
   } else {
     console.error("Generator not found.", argv);
     process.exit(1);

packages/yonpx/yarn.lock

@@ -3177,10 +3177,10 @@ require-relative@^0.8.7:
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
   integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
 
-reshow-unit@*:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/reshow-unit/-/reshow-unit-0.0.5.tgz#a3fa410f7ab266492edf6afb3dbd5130d66ced68"
-  integrity sha512-TMnfSJwbDKzq4SAZXh5oNzDLu1we4rT/ZOf2iXa69PdKZPqO0aVBq+jJr23Zh/itZbagEt+YKro7tQHNSxZqsg==
+reshow-unit@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/reshow-unit/-/reshow-unit-0.15.0.tgz#2ed3edb586066c59119f09e1430b63a415c044af"
+  integrity sha512-wvxGZLUCsTXpLbX95YYwbN/xxufj2M/ongbyQxbPnUoR0SyNmjK02+MbdEetWCrwQelQ46KqM5stG6Ky1ZHeEw==
   dependencies:
     chai "*"
     enzyme "*"