create-docusaurus 0.0.0-4623 → 0.0.0-4626

package/lib/index.js

@@ -14,13 +14,32 @@ import supportsColor from 'supports-color';
 import { fileURLToPath } from 'url';
 const RecommendedTemplate = 'classic';
 const TypeScriptTemplateSuffix = '-typescript';
-function hasYarn() {
-    try {
-        return shell.exec('yarnpkg --version', { silent: true }).code === 0;
+const DefaultPackageManager = 'npm';
+const SupportedPackageManagers = {
+    npm: 'package-lock.json',
+    yarn: 'yarn.lock',
+    pnpm: 'pnpm-lock.yaml',
+};
+const PackageManagersList = Object.keys(SupportedPackageManagers);
+async function findPackageManagerFromLockFile() {
+    for (const packageManager of PackageManagersList) {
+        const lockFilePath = path.resolve(process.cwd(), SupportedPackageManagers[packageManager]);
+        if (await fs.pathExists(lockFilePath)) {
+            return packageManager;
+        }
     }
-    catch (e) {
-        return false;
+    return undefined;
+}
+function findPackageManagerFromUserAgent() {
+    return PackageManagersList.find((packageManager) => { var _a; return (_a = process.env.npm_config_user_agent) === null || _a === void 0 ? void 0 : _a.startsWith(packageManager); });
+}
+async function getPackageManager(forceUseNpm) {
+    var _a, _b;
+    // TODO replace --use-npm by --package-manager option
+    if (forceUseNpm) {
+        return 'npm';
     }
+    return ((_b = (_a = (await findPackageManagerFromLockFile())) !== null && _a !== void 0 ? _a : findPackageManagerFromUserAgent()) !== null && _b !== void 0 ? _b : DefaultPackageManager);
 }
 function isValidGitRepoUrl(gitRepoUrl) {
     return ['https://', 'git@'].some((item) => gitRepoUrl.startsWith(item));
@@ -96,7 +115,7 @@ async function getGitCommand(gitStrategy) {
 }
 export default async function init(rootDir, siteName, reqTemplate, cliOptions = {}) {
     var _a;
-    const useYarn = cliOptions.useNpm ? false : hasYarn();
+    const pkgManager = await getPackageManager(cliOptions.useNpm);
     const templatesDir = fileURLToPath(new URL('../templates', import.meta.url));
     const templates = await readTemplates(templatesDir);
     const hasTS = (templateName) => fs.pathExists(path.resolve(templatesDir, `${templateName}${TypeScriptTemplateSuffix}`));
@@ -261,17 +280,16 @@ export default async function init(rootDir, siteName, reqTemplate, cliOptions =
     if (await fs.pathExists(path.join(dest, 'gitignore'))) {
         await fs.remove(path.join(dest, 'gitignore'));
     }
-    const pkgManager = useYarn ? 'yarn' : 'npm';
     // Display the most elegant way to cd.
     const cdpath = path.relative('.', dest);
     if (!cliOptions.skipInstall) {
         shell.cd(dest);
         logger.info `Installing dependencies with name=${pkgManager}...`;
-        if (shell.exec(useYarn ? 'yarn' : 'npm install --color always', {
+        if (shell.exec(pkgManager === 'yarn' ? 'yarn' : `${pkgManager} install --color always`, {
             env: {
                 ...process.env,
-                // Force coloring the output, since the command is invoked by shelljs,
-                // which is not the interactive shell
+                // Force coloring the output, since the command is invoked,
+                // by shelljs which is not the interactive shell
                 ...(supportsColor.stdout ? { FORCE_COLOR: '1' } : {}),
             },
         }).code !== 0) {
@@ -283,16 +301,17 @@ export default async function init(rootDir, siteName, reqTemplate, cliOptions =
             process.exit(0);
         }
     }
+    const useNpm = pkgManager === 'npm';
     logger.success `Created path=${cdpath}.`;
     logger.info `Inside that directory, you can run several commands:
 
   code=${`${pkgManager} start`}
     Starts the development server.
 
-  code=${`${pkgManager} ${useYarn ? '' : 'run '}build`}
+  code=${`${pkgManager} ${useNpm ? 'run ' : ''}build`}
     Bundles your website into static files for production.
 
-  code=${`${pkgManager} ${useYarn ? '' : 'run '}serve`}
+  code=${`${pkgManager} ${useNpm ? 'run ' : ''}serve`}
     Serves the built website locally.
 
   code=${`${pkgManager} deploy`}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-docusaurus",
-  "version": "0.0.0-4623",
+  "version": "0.0.0-4626",
   "description": "Create Docusaurus apps easily.",
   "type": "module",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "0.0.0-4623",
+    "@docusaurus/logger": "0.0.0-4626",
     "commander": "^5.1.0",
     "fs-extra": "^10.0.0",
     "lodash": "^4.17.21",
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "97710505efdb9fceea33bd2dbb8eaa2860e391a1"
+  "gitHead": "1a36de8f473e7e7f79779e64748d47745068c89f"
 }

package/templates/classic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-template",
-  "version": "0.0.0-4623",
+  "version": "0.0.0-4626",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -14,8 +14,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4623",
-    "@docusaurus/preset-classic": "0.0.0-4623",
+    "@docusaurus/core": "0.0.0-4626",
+    "@docusaurus/preset-classic": "0.0.0-4626",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.2.1",

package/templates/classic-typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-typescript-template",
-  "version": "0.0.0-4623",
+  "version": "0.0.0-4626",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -15,8 +15,8 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4623",
-    "@docusaurus/preset-classic": "0.0.0-4623",
+    "@docusaurus/core": "0.0.0-4626",
+    "@docusaurus/preset-classic": "0.0.0-4626",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.2.1",
@@ -24,7 +24,7 @@
     "react-dom": "^17.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4623",
+    "@docusaurus/module-type-aliases": "0.0.0-4626",
     "@tsconfig/docusaurus": "^1.0.4",
     "typescript": "^4.5.2"
   },

package/templates/facebook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-facebook-template",
-  "version": "0.0.0-4623",
+  "version": "0.0.0-4626",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -18,8 +18,8 @@
     "format:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx,md,mdx}\""
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4623",
-    "@docusaurus/preset-classic": "0.0.0-4623",
+    "@docusaurus/core": "0.0.0-4626",
+    "@docusaurus/preset-classic": "0.0.0-4626",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "react": "^17.0.1",