Push everything through NPX

FirebaseExtended · May 13, 2024 · e9ea13d · e9ea13d
1 parent 1e90b02
commit e9ea13d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/packages/create-next-on-firebase/package.json b/packages/create-next-on-firebase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-on-firebase",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Experimental CLI to init a Next.js project for deployment on Firebase",
   "main": "dist/index.js",
   "bin": {

diff --git a/packages/create-next-on-firebase/src/bin/create.ts b/packages/create-next-on-firebase/src/bin/create.ts
@@ -15,32 +15,27 @@ program
   .argument("[directory]", "path to the project's root directory")
   .action(async (directory) => {
     let packageManager: string | undefined = undefined;
+    let packageManagerVersion = "*";
     if (contextIsNpmCreate) {
       packageManager = "npm";
     } else if (npmUserAgent.pnpm) {
       packageManager = "pnpm";
+      packageManagerVersion = npmUserAgent.pnpm;
     } else if (npmUserAgent.yarn) {
       packageManager = "yarn";
+      packageManagerVersion = npmUserAgent.yarn;
     }
+    const args = ["--yes", "@apphosting/create@latest", "--framework=nextjs"];
     if (packageManager) {
-      await spawn(
-        packageManager,
-        ["create", "@apphosting", "--framework=nextjs", directory].filter((it) => it),
-        {
-          shell: true,
-          stdio: "inherit",
-        },
-      );
-    } else {
-      await spawn(
-        "npx",
-        ["@apphosting/create", "--framework=nextjs", directory].filter((it) => it),
-        {
-          shell: true,
-          stdio: "inherit",
-        },
-      );
+      args.push(`--package-manager=${packageManager}@${packageManagerVersion}`);
     }
+    if (directory) {
+      args.push(directory);
+    }
+    await spawn("npx", args, {
+      shell: true,
+      stdio: "inherit",
+    });
   });
 
 program.parse();