create-docusaurus 2.0.0-beta.17 → 2.0.0-beta.18

package/bin/index.js

@@ -13,7 +13,6 @@ import semver from 'semver';
 import path from 'path';
 import {program} from 'commander';
 import {createRequire} from 'module';
-import init from '../lib/index.js';
 
 const packageJson = createRequire(import.meta.url)('../package.json');
 const requiredVersion = packageJson.engines.node;
@@ -24,14 +23,6 @@ if (!semver.satisfies(process.version, requiredVersion)) {
   process.exit(1);
 }
 
-function wrapCommand(fn) {
-  return (...args) =>
-    fn(...args).catch((err) => {
-      logger.error(err.stack);
-      process.exitCode = 1;
-    });
-}
-
 program.version(packageJson.version);
 
 program
@@ -61,11 +52,14 @@ program
       rootDir = '.',
       {packageManager, skipInstall, typescript, gitStrategy} = {},
     ) => {
-      wrapCommand(init)(path.resolve(rootDir), siteName, template, {
-        packageManager,
-        skipInstall,
-        typescript,
-        gitStrategy,
+      // See https://github.com/facebook/docusaurus/pull/6860
+      import('../lib/index.js').then(({default: init}) => {
+        init(path.resolve(rootDir), siteName, template, {
+          packageManager,
+          skipInstall,
+          typescript,
+          gitStrategy,
+        });
       });
     },
   );
@@ -75,3 +69,8 @@ program.parse(process.argv);
 if (!process.argv.slice(1).length) {
   program.outputHelp();
 }
+
+process.on('unhandledRejection', (err) => {
+  logger.error(err);
+  process.exit(1);
+});

package/lib/index.js

@@ -25,7 +25,7 @@ const SupportedPackageManagers = {
 const PackageManagersList = Object.keys(SupportedPackageManagers);
 async function findPackageManagerFromLockFile() {
     for (const packageManager of PackageManagersList) {
-        const lockFilePath = path.resolve(process.cwd(), SupportedPackageManagers[packageManager]);
+        const lockFilePath = path.resolve(SupportedPackageManagers[packageManager]);
         if (await fs.pathExists(lockFilePath)) {
             return packageManager;
         }
@@ -97,7 +97,7 @@ function getTypeScriptBaseTemplate(template) {
     return undefined;
 }
 async function copyTemplate(templatesDir, template, dest) {
-    await fs.copy(path.resolve(templatesDir, 'shared'), dest);
+    await fs.copy(path.join(templatesDir, 'shared'), dest);
     // TypeScript variants will copy duplicate resources like CSS & config from
     // base template
     const tsBaseTemplate = getTypeScriptBaseTemplate(template);
@@ -137,7 +137,7 @@ async function getGitCommand(gitStrategy) {
 export default async function init(rootDir, siteName, reqTemplate, cliOptions = {}) {
     const templatesDir = fileURLToPath(new URL('../templates', import.meta.url));
     const templates = await readTemplates(templatesDir);
-    const hasTS = (templateName) => fs.pathExists(path.resolve(templatesDir, `${templateName}${TypeScriptTemplateSuffix}`));
+    const hasTS = (templateName) => fs.pathExists(path.join(templatesDir, `${templateName}${TypeScriptTemplateSuffix}`));
     let name = siteName;
     // Prompt if siteName is not passed from CLI.
     if (!name) {
@@ -216,7 +216,7 @@ export default async function init(rootDir, siteName, reqTemplate, cliOptions =
             name: 'templateDir',
             validate: async (dir) => {
                 if (dir) {
-                    const fullDir = path.resolve(process.cwd(), dir);
+                    const fullDir = path.resolve(dir);
                     if (await fs.pathExists(fullDir)) {
                         return true;
                     }
@@ -265,8 +265,8 @@ export default async function init(rootDir, siteName, reqTemplate, cliOptions =
             throw err;
         }
     }
-    else if (await fs.pathExists(path.resolve(process.cwd(), template))) {
-        const templateDir = path.resolve(process.cwd(), template);
+    else if (await fs.pathExists(path.resolve(template))) {
+        const templateDir = path.resolve(template);
         try {
             await fs.copy(templateDir, dest);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-docusaurus",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "description": "Create Docusaurus apps easily.",
   "type": "module",
   "repository": {
@@ -13,8 +13,8 @@
   },
   "scripts": {
     "create-docusaurus": "create-docusaurus",
-    "build": "tsc",
-    "watch": "tsc --watch"
+    "build": "tsc -p tsconfig.build.json",
+    "watch": "tsc -p tsconfig.build.json --watch"
   },
   "bin": "bin/index.js",
   "publishConfig": {
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "2.0.0-beta.17",
+    "@docusaurus/logger": "2.0.0-beta.18",
     "commander": "^5.1.0",
     "fs-extra": "^10.0.1",
     "lodash": "^4.17.21",
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "0032c0b0480083227af2e1b4da2d3ee6ce992403"
+  "gitHead": "1a945d06993d53376e61bed2c942799fe07dc336"
 }

package/templates/classic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-template",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -14,13 +14,13 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.17",
-    "@docusaurus/preset-classic": "2.0.0-beta.17",
+    "@docusaurus/core": "2.0.0-beta.18",
+    "@docusaurus/preset-classic": "2.0.0-beta.18",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
-    "prism-react-renderer": "^1.2.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "prism-react-renderer": "^1.3.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "browserslist": {
     "production": [

package/templates/classic-typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-typescript-template",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -15,18 +15,18 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.17",
-    "@docusaurus/preset-classic": "2.0.0-beta.17",
+    "@docusaurus/core": "2.0.0-beta.18",
+    "@docusaurus/preset-classic": "2.0.0-beta.18",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
-    "prism-react-renderer": "^1.2.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "prism-react-renderer": "^1.3.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.17",
-    "@tsconfig/docusaurus": "^1.0.4",
-    "typescript": "^4.6.2"
+    "@docusaurus/module-type-aliases": "2.0.0-beta.18",
+    "@tsconfig/docusaurus": "^1.0.5",
+    "typescript": "^4.6.3"
   },
   "browserslist": {
     "production": [

package/templates/facebook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-facebook-template",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -18,25 +18,25 @@
     "format:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx,md,mdx}\""
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.17",
-    "@docusaurus/preset-classic": "2.0.0-beta.17",
+    "@docusaurus/core": "2.0.0-beta.18",
+    "@docusaurus/preset-classic": "2.0.0-beta.18",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.16.3",
-    "eslint": "^8.8.0",
-    "eslint-config-airbnb": "^19.0.0",
-    "eslint-config-prettier": "^8.4.0",
+    "@babel/eslint-parser": "^7.17.0",
+    "eslint": "^8.11.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.29.2",
+    "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "prettier": "^2.5.1",
-    "stylelint": "^14.5.3"
+    "prettier": "^2.6.0",
+    "stylelint": "^14.6.0"
   },
   "browserslist": {
     "production": [

package/templates/shared/docs/tutorial-basics/create-a-document.md

@@ -41,14 +41,14 @@ This is my **first Docusaurus document**!
 
 It is also possible to create your sidebar explicitly in `sidebars.js`:
 
-```diff title="sidebars.js"
+```js title="sidebars.js"
 module.exports = {
   tutorialSidebar: [
     {
       type: 'category',
       label: 'Tutorial',
--     items: [...],
-+     items: ['hello'],
+      // highlight-next-line
+      items: ['hello'],
     },
   ],
 };