create-turbo 1.0.21 → 1.0.24-canary.1

package/dist/index.js

@@ -31,7 +31,7 @@ var import_chalk = __toModule(require("chalk"));
 
 // package.json
 var name = "create-turbo";
-var version = "1.0.21";
+var version = "1.0.24-canary.1";
 var description = "Create a new Turborepo";
 var homepage = "https://turborepo.org";
 var license = "MPL-2.0";
@@ -112,13 +112,28 @@ function shouldUseYarn() {
   }
 }
 
-// src/git.ts
+// src/shouldUsePnpm.ts
 var import_child_process2 = __toModule(require("child_process"));
+function shouldUsePnpm() {
+  try {
+    const userAgent = process.env.npm_config_user_agent;
+    if (userAgent && userAgent.startsWith("pnpm")) {
+      return true;
+    }
+    (0, import_child_process2.execSync)("pnpm --version", { stdio: "ignore" });
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+// src/git.ts
+var import_child_process3 = __toModule(require("child_process"));
 var import_path = __toModule(require("path"));
 var import_rimraf = __toModule(require("rimraf"));
 function isInGitRepository() {
   try {
-    (0, import_child_process2.execSync)("git rev-parse --is-inside-work-tree", { stdio: "ignore" });
+    (0, import_child_process3.execSync)("git rev-parse --is-inside-work-tree", { stdio: "ignore" });
     return true;
   } catch (_) {
   }
@@ -126,7 +141,7 @@ function isInGitRepository() {
 }
 function isInMercurialRepository() {
   try {
-    (0, import_child_process2.execSync)("hg --cwd . root", { stdio: "ignore" });
+    (0, import_child_process3.execSync)("hg --cwd . root", { stdio: "ignore" });
     return true;
   } catch (_) {
   }
@@ -135,15 +150,15 @@ function isInMercurialRepository() {
 function tryGitInit(root) {
   let didInit = false;
   try {
-    (0, import_child_process2.execSync)("git --version", { stdio: "ignore" });
+    (0, import_child_process3.execSync)("git --version", { stdio: "ignore" });
     if (isInGitRepository() || isInMercurialRepository()) {
       return false;
     }
-    (0, import_child_process2.execSync)("git init", { stdio: "ignore" });
+    (0, import_child_process3.execSync)("git init", { stdio: "ignore" });
     didInit = true;
-    (0, import_child_process2.execSync)("git checkout -b main", { stdio: "ignore" });
-    (0, import_child_process2.execSync)("git add -A", { stdio: "ignore" });
-    (0, import_child_process2.execSync)('git commit -m "Initial commit from Create Turborepo"', {
+    (0, import_child_process3.execSync)("git checkout -b main", { stdio: "ignore" });
+    (0, import_child_process3.execSync)("git add -A", { stdio: "ignore" });
+    (0, import_child_process3.execSync)('git commit -m "Initial commit from Create Turborepo"', {
       stdio: "ignore"
     });
     return true;
@@ -167,7 +182,8 @@ var help = `
   If <dir> is not provided up front you will be prompted for it.
 
   Flags:    
-    --use-npm           Explicitly tell the CLI to bootstrap the app using npm.
+    --use-npm           Explicitly tell the CLI to bootstrap the app using npm
+    --use-pnpm          Explicitly tell the CLI to bootstrap the app using pnpm
     --no-install        Explicitly do not run the package mananger's install command
     --help, -h          Show this help message
     --version, -v       Show the version of this script
@@ -191,6 +207,7 @@ async function run() {
     flags: {
       help: { type: "boolean", default: false, alias: "h" },
       useNpm: { type: "boolean", default: false },
+      usePnpm: { type: "boolean", default: false },
       install: { type: "boolean", default: true },
       version: { type: "boolean", default: false, alias: "v" }
     }
@@ -214,9 +231,12 @@ async function run() {
     }
   ])).dir);
   const isYarnInstalled = shouldUseYarn();
+  const isPnpmInstalled = shouldUsePnpm();
   let answers;
   if (flags.useNpm) {
     answers = { packageManager: "npm" };
+  } else if (flags.usePnpm) {
+    answers = { packageManager: "pnpm" };
   } else {
     answers = await import_inquirer.default.prompt([
       {
@@ -224,12 +244,17 @@ async function run() {
         type: "list",
         message: "Which package manager do you want to use?",
         choices: [
+          { name: "npm", value: "npm" },
+          {
+            name: "pnpm",
+            value: "pnpm",
+            disabled: !isPnpmInstalled && "not installed"
+          },
           {
-            name: "Yarn",
+            name: "yarn",
             value: "yarn",
             disabled: !isYarnInstalled && "not installed"
-          },
-          { name: "NPM", value: "npm" }
+          }
         ]
       }
     ]);
@@ -312,14 +337,14 @@ async function run() {
   console.log(`speed boost, enable Remote Caching (beta) with Vercel by`);
   console.log(`entering the following command:`);
   console.log();
-  console.log(import_chalk.default.cyan(`  npx turbo login`));
+  console.log(import_chalk.default.cyan(`  ${getNpxCommand(answers.packageManager)} turbo login`));
   console.log();
   console.log(`We suggest that you begin by typing:`);
   console.log();
   if (!projectDirIsCurrentDir) {
     console.log(`  ${import_chalk.default.cyan("cd")} ${relativeProjectDir}`);
   }
-  console.log(import_chalk.default.cyan(`  npx turbo login`));
+  console.log(import_chalk.default.cyan(`  ${getNpxCommand(answers.packageManager)} turbo login`));
   console.log();
 }
 var update = (0, import_update_check.default)(package_default).catch(() => null);
@@ -337,3 +362,12 @@ async function notifyUpdate() {
   } catch {
   }
 }
+function getNpxCommand(pkgManager) {
+  if (pkgManager === "yarn") {
+    return "npx";
+  } else if (pkgManager === "pnpm") {
+    return "pnpx";
+  } else {
+    return "npx";
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-turbo",
-  "version": "1.0.21",
+  "version": "1.0.24-canary.1",
   "description": "Create a new Turborepo",
   "homepage": "https://turborepo.org",
   "license": "MPL-2.0",

package/templates/_shared_ts/apps/docs/package.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "12.0.3",
+    "next": "12.0.7",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "ui": "*"

package/templates/_shared_ts/apps/web/package.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "12.0.3",
+    "next": "12.0.7",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "ui": "*"

package/templates/_shared_ts/packages/config/eslint-preset.js

@@ -5,4 +5,7 @@ module.exports = {
       rootDir: ["apps/*/", "packages/*/"],
     },
   },
+  rules: {
+    "@next/next/no-html-link-for-pages": "off",
+  },
 };

package/templates/_shared_ts/packages/config/package.json

@@ -7,7 +7,7 @@
     "eslint-preset.js"
   ],
   "dependencies": {
-    "eslint-config-next": "^12.0.3",
+    "eslint-config-next": "^12.0.7",
     "eslint-config-prettier": "^8.3.0"
   }
 }

package/templates/_shared_ts/packages/tsconfig/base.json

@@ -9,6 +9,7 @@
     "forceConsistentCasingInFileNames": true,
     "inlineSources": false,
     "isolatedModules": true,
+    "moduleResolution": "node",
     "noUnusedLocals": false,
     "noUnusedParameters": false,
     "preserveWatchOutput": true,

package/templates/_shared_ts/packages/tsconfig/nextjs.json

@@ -13,7 +13,6 @@
     "incremental": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve"

package/templates/_shared_ts/packages/ui/Button.tsx

@@ -1,3 +1,4 @@
+import * as React from "react";
 export const Button = () => {
   return <button>Boop</button>;
 };

package/templates/_shared_ts/packages/ui/index.tsx

@@ -1 +1,2 @@
+import * as React from "react";
 export * from "./Button";

package/templates/_shared_ts/packages/ui/package.json

@@ -8,6 +8,7 @@
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "tsconfig": "*",
+    "config": "*",
     "typescript": "^4.5.3"
   }
 }

package/templates/pnpm/README.md

@@ -1,10 +1,10 @@
-# Turborepo starter with PNPM
+# Turborepo starter with pnpm
 
 This is an official starter turborepo.
 
 ## What's inside?
 
-This turborepo uses [PNPM](https://pnpm.io) as a packages manager. It includes the following packages/apps:
+This turborepo uses [pnpm](https://pnpm.io) as a packages manager. It includes the following packages/apps:
 
 ### Apps and Packages
 
@@ -55,7 +55,7 @@ By default, Turborepo will cache locally. To enable Remote Caching (Beta) you wi
 
 ```
 cd my-turborepo
-npx turbo login
+pnpx turbo login
 ```
 
 This will authenticate the Turborepo CLI with your [Vercel account](https://vercel.com/docs/concepts/personal-accounts/overview).
@@ -63,7 +63,7 @@ This will authenticate the Turborepo CLI with your [Vercel account](https://verc
 Next, you can link your Turborepo to your Remote Cache by running the following command from the root of your turborepo:
 
 ```
-npx turbo link
+pnpx turbo link
 ```
 
 ## Useful Links

package/templates/pnpm/apps/docs/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "docs",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev --port 3001",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "next": "12.0.7",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "ui": "workspace:*"
+  },
+  "devDependencies": {
+    "config": "workspace:*",
+    "eslint": "7.32.0",
+    "next-transpile-modules": "9.0.0",
+    "tsconfig": "workspace:*",
+    "@types/react": "17.0.37",
+    "typescript": "^4.5.3"
+  }
+}

package/templates/pnpm/apps/web/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "web",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "next": "12.0.7",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "ui": "workspace:*"
+  },
+  "devDependencies": {
+    "config": "workspace:*",
+    "eslint": "7.32.0",
+    "next-transpile-modules": "9.0.0",
+    "tsconfig": "workspace:*",
+    "@types/react": "17.0.37",
+    "typescript": "^4.5.3"
+  }
+}

package/templates/pnpm/packages/ui/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "ui",
+  "version": "0.0.0",
+  "main": "./index.tsx",
+  "types": "./index.tsx",
+  "license": "MIT",
+  "devDependencies": {
+    "@types/react": "^17.0.37",
+    "@types/react-dom": "^17.0.11",
+    "tsconfig": "workspace:*",
+    "config": "workspace:*",
+    "typescript": "^4.5.3"
+  }
+}