@docusaurus/core 4.0.0-canary-6820 → 4.0.0-canary-6821

package/lib/commands/cli.d.ts

@@ -4,14 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { type CommanderStatic } from 'commander';
-type CLIProgram = CommanderStatic;
+import { Command } from 'commander';
 type CLIArgs = [string, string, ...string[]];
 export declare function runCLI(cliArgs: CLIArgs): Promise<void>;
 export declare function createCLIProgram({ cli, cliArgs, siteDir, config, }: {
-    cli: CLIProgram;
+    cli: Command;
     cliArgs: CLIArgs;
     siteDir: string;
     config: string | undefined;
-}): Promise<CLIProgram>;
+}): Promise<Command>;
 export {};

package/lib/commands/cli.js

@@ -8,9 +8,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCLI = runCLI;
 exports.createCLIProgram = createCLIProgram;
-const tslib_1 = require("tslib");
 const logger_1 = require("@docusaurus/logger");
-const commander_1 = tslib_1.__importDefault(require("commander"));
+const commander_1 = require("commander");
 const utils_1 = require("@docusaurus/utils");
 const build_1 = require("./build/build");
 const clear_1 = require("./clear");
@@ -48,7 +47,7 @@ const DEFAULT_SITE_DIR = process.env.DOCUSAURUS_CLI_SITE_DIR ?? '.';
 const DEFAULT_CONFIG = process.env.DOCUSAURUS_CLI_CONFIG ?? undefined;
 async function runCLI(cliArgs) {
     const program = await createCLIProgram({
-        cli: commander_1.default,
+        cli: new commander_1.Command(),
         cliArgs,
         siteDir: DEFAULT_SITE_DIR,
         config: DEFAULT_CONFIG,
@@ -57,6 +56,11 @@ async function runCLI(cliArgs) {
 }
 async function createCLIProgram({ cli, cliArgs, siteDir, config, }) {
     const command = cliArgs[2];
+    // Preserve Commander 5 behavior for plugins using extendCli: options remain
+    // properties of the command passed to action handlers, and commands may read
+    // undeclared positional arguments from command.args. Subcommands created with
+    // .command() inherit these settings, including nested plugin commands.
+    cli.storeOptionsAsProperties(true).allowExcessArguments(true);
     cli.version(utils_1.DOCUSAURUS_VERSION).usage('<command> [options]');
     cli
         .command('build [siteDir]')
@@ -143,7 +147,7 @@ async function createCLIProgram({ cli, cliArgs, siteDir, config, }) {
         .option('--overwrite', 'overwrite existing heading IDs, re-generate them from the heading text (default: false)')
         .option('--maintain-case', "keep the headings' casing, otherwise make all lowercase (default: false)")
         .action(writeHeadingIds_1.writeHeadingIds);
-    cli.arguments('<command>').action((cmd) => {
+    cli.arguments('[command]').action((cmd) => {
         cli.outputHelp();
         if (!cmd) {
             throw new Error(logger_1.logger.interpolate `Missing Docusaurus CLI command.`);

package/lib/commands/external.d.ts

@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { CommanderStatic } from 'commander';
+import type { Command } from 'commander';
 export declare function externalCommand({ cli, siteDir: siteDirInput, config, }: {
-    cli: CommanderStatic;
+    cli: Command;
     siteDir: string;
     config: string | undefined;
 }): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6820",
+  "version": "4.0.0-canary-6821",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,18 +33,18 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6820",
-    "@docusaurus/bundler": "4.0.0-canary-6820",
-    "@docusaurus/logger": "4.0.0-canary-6820",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6820",
-    "@docusaurus/utils": "4.0.0-canary-6820",
-    "@docusaurus/utils-common": "4.0.0-canary-6820",
-    "@docusaurus/utils-validation": "4.0.0-canary-6820",
+    "@docusaurus/babel": "4.0.0-canary-6821",
+    "@docusaurus/bundler": "4.0.0-canary-6821",
+    "@docusaurus/logger": "4.0.0-canary-6821",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6821",
+    "@docusaurus/utils": "4.0.0-canary-6821",
+    "@docusaurus/utils-common": "4.0.0-canary-6821",
+    "@docusaurus/utils-validation": "4.0.0-canary-6821",
     "boxen": "^6.2.1",
     "chokidar": "^3.6.0",
     "cli-table3": "^0.6.5",
     "combine-promises": "^1.2.0",
-    "commander": "^5.1.0",
+    "commander": "^15.0.0",
     "core-js": "^3.50.0",
     "detect-port": "^2.1.0",
     "escape-html": "^1.0.3",
@@ -76,8 +76,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6820",
-    "@docusaurus/types": "4.0.0-canary-6820",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6821",
+    "@docusaurus/types": "4.0.0-canary-6821",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",
@@ -91,7 +91,7 @@
     "tree-node-cli": "^3.0.0"
   },
   "peerDependencies": {
-    "@docusaurus/faster": "4.0.0-canary-6820",
+    "@docusaurus/faster": "4.0.0-canary-6821",
     "@mdx-js/react": "^3.1.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0"
@@ -104,5 +104,5 @@
   "engines": {
     "node": ">=26.9"
   },
-  "gitHead": "548b203e01abc1df60907285520e3b000a9af3eb"
+  "gitHead": "9391ea0602707f2012a14a4dfd56f813413f5332"
 }