@docusaurus/core 2.2.0 → 2.3.0

package/bin/docusaurus.mjs

@@ -104,6 +104,23 @@ cli
   )
   .action(deploy);
 
+/**
+ * @param {string | undefined} value
+ * @returns {boolean | number}
+ */
+function normalizePollValue(value) {
+  if (value === undefined || value === '') {
+    return false;
+  }
+
+  const parsedIntValue = Number.parseInt(value, 10);
+  if (!Number.isNaN(parsedIntValue)) {
+    return parsedIntValue;
+  }
+
+  return value === 'true';
+}
+
 cli
   .command('start [siteDir]')
   .description('Start the development server.')
@@ -122,6 +139,7 @@ cli
   .option(
     '--poll [interval]',
     'use polling rather than watching for reload (default: false). Can specify a poll interval in milliseconds',
+    normalizePollValue,
   )
   .option(
     '--no-minify',

package/lib/client/ClientLifecyclesDispatcher.js

@@ -14,7 +14,17 @@ export function dispatchLifecycleAction(lifecycleAction, ...args) {
     });
     return () => callbacks.forEach((cb) => cb?.());
 }
-function scrollAfterNavigation(location) {
+function scrollAfterNavigation({ location, previousLocation, }) {
+    if (!previousLocation) {
+        return; // no-op: use native browser feature
+    }
+    const samePathname = location.pathname === previousLocation.pathname;
+    const sameHash = location.hash === previousLocation.hash;
+    const sameSearch = location.search === previousLocation.search;
+    // Query-string changes: do not scroll to top/hash
+    if (samePathname && sameHash && !sameSearch) {
+        return;
+    }
     const { hash } = location;
     if (!hash) {
         window.scrollTo(0, 0);
@@ -28,9 +38,7 @@ function scrollAfterNavigation(location) {
 function ClientLifecyclesDispatcher({ children, location, previousLocation, }) {
     useLayoutEffect(() => {
         if (previousLocation !== location) {
-            if (previousLocation) {
-                scrollAfterNavigation(location);
-            }
+            scrollAfterNavigation({ location, previousLocation });
             dispatchLifecycleAction('onRouteDidUpdate', { previousLocation, location });
         }
     }, [previousLocation, location]);

package/lib/client/exports/useBaseUrl.js

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { useCallback } from 'react';
 import useDocusaurusContext from './useDocusaurusContext';
 import { hasProtocol } from './isInternalUrl';
 function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolute = false } = {}) {
@@ -27,8 +28,9 @@ function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolu
 }
 export function useBaseUrlUtils() {
     const { siteConfig: { baseUrl, url: siteUrl }, } = useDocusaurusContext();
+    const withBaseUrl = useCallback((url, options) => addBaseUrl(siteUrl, baseUrl, url, options), [siteUrl, baseUrl]);
     return {
-        withBaseUrl: (url, options) => addBaseUrl(siteUrl, baseUrl, url, options),
+        withBaseUrl,
     };
 }
 export default function useBaseUrl(url, options = {}) {

package/lib/commands/build.js

@@ -131,7 +131,11 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
         serverConfig = (0, webpack_merge_1.default)(serverConfig, {
             plugins: [
                 new copy_webpack_plugin_1.default({
-                    patterns: staticDirectories.map((dir) => ({ from: dir, to: outDir })),
+                    patterns: staticDirectories.map((dir) => ({
+                        from: dir,
+                        to: outDir,
+                        toType: 'dir',
+                    })),
                 }),
             ],
         });

package/lib/commands/deploy.js

@@ -53,7 +53,7 @@ This behavior can have SEO impacts and create relative link issues.
     }
     // Source repo is the repo from where the command is invoked
     const sourceRepoUrl = shelljs_1.default
-        .exec('git config --get remote.origin.url', { silent: true })
+        .exec('git remote get-url origin', { silent: true })
         .stdout.trim();
     // The source branch; defaults to the currently checked out branch
     const sourceBranch = process.env.CURRENT_BRANCH ??

package/lib/commands/swizzle/actions.js

@@ -33,7 +33,7 @@ async function eject({ siteDir, themePath, componentName, typescript, }) {
     const isDirectory = await isDir(fromPath);
     const globPattern = isDirectory
         ? // Do we really want to copy all components?
-            path_1.default.join(fromPath, '*')
+            path_1.default.join(fromPath, '**/*')
         : `${fromPath}.*`;
     const globPatternPosix = (0, utils_1.posixPath)(globPattern);
     const filesToCopy = await (0, utils_1.Globby)(globPatternPosix, {
@@ -42,6 +42,7 @@ async function eject({ siteDir, themePath, componentName, typescript, }) {
             // When ejecting JS components, we want to avoid emitting TS files
             // In particular the .d.ts files that theme build output contains
             typescript ? null : '**/*.{d.ts,ts,tsx}',
+            '**/{__fixtures__,__tests__}/*',
         ]),
     });
     if (filesToCopy.length === 0) {

package/lib/commands/swizzle/components.d.ts

@@ -15,6 +15,15 @@ export declare type ThemeComponents = {
     hasAnySafeAction: (component: string) => boolean;
     hasAllSafeAction: (component: string) => boolean;
 };
+/**
+ * Expand a list of components to include and return parent folders.
+ * If a folder is not directly a component (no Folder/index.tsx file),
+ * we still want to be able to swizzle --eject that folder.
+ * See https://github.com/facebook/docusaurus/pull/7175#issuecomment-1103757218
+ *
+ * @param componentNames the original list of component names
+ */
+export declare function getMissingIntermediateComponentFolderNames(componentNames: string[]): string[];
 export declare function readComponentNames(themePath: string): Promise<string[]>;
 export declare function listComponentNames(themeComponents: ThemeComponents): string;
 export declare function getThemeComponents({ themeName, themePath, swizzleConfig, }: {

package/lib/commands/swizzle/components.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getComponentName = exports.getThemeComponents = exports.listComponentNames = exports.readComponentNames = void 0;
+exports.getComponentName = exports.getThemeComponents = exports.listComponentNames = exports.readComponentNames = exports.getMissingIntermediateComponentFolderNames = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -37,6 +37,7 @@ function getMissingIntermediateComponentFolderNames(componentNames) {
     const expandedComponentNames = lodash_1.default.uniq(componentNames.flatMap((componentName) => getAllIntermediatePaths(componentName)));
     return lodash_1.default.difference(expandedComponentNames, componentNames);
 }
+exports.getMissingIntermediateComponentFolderNames = getMissingIntermediateComponentFolderNames;
 const skipReadDirNames = ['__test__', '__tests__', '__mocks__', '__fixtures__'];
 async function readComponentNames(themePath) {
     if (!(await fs_extra_1.default.pathExists(themePath))) {

package/lib/server/routes.js

@@ -18,6 +18,7 @@ function indent(str) {
     return `  ${str.replace(/\n/g, `\n  `)}`;
 }
 const chunkNameCache = new Map();
+const chunkNameCount = new Map();
 /**
  * Generates a unique chunk name that can be used in the chunk registry.
  *
@@ -41,10 +42,15 @@ function genChunkName(modulePath, prefix, preferredName, shortId = process.env.N
                 const shortHash = (0, utils_1.simpleHash)(modulePath, 3);
                 str = `${preferredName}${shortHash}`;
             }
-            const name = str === '/' ? 'index' : (0, utils_1.docuHash)(str);
+            const name = (0, utils_1.docuHash)(str);
             chunkName = prefix ? `${prefix}---${name}` : name;
         }
+        const seenCount = (chunkNameCount.get(chunkName) ?? 0) + 1;
+        if (seenCount > 1) {
+            chunkName += seenCount.toString(36);
+        }
         chunkNameCache.set(modulePath, chunkName);
+        chunkNameCount.set(chunkName, seenCount);
     }
     return chunkName;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.18.6",
     "@babel/runtime-corejs3": "^7.18.6",
     "@babel/traverse": "^7.18.8",
-    "@docusaurus/cssnano-preset": "2.2.0",
-    "@docusaurus/logger": "2.2.0",
-    "@docusaurus/mdx-loader": "2.2.0",
+    "@docusaurus/cssnano-preset": "2.3.0",
+    "@docusaurus/logger": "2.3.0",
+    "@docusaurus/mdx-loader": "2.3.0",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "2.2.0",
-    "@docusaurus/utils-common": "2.2.0",
-    "@docusaurus/utils-validation": "2.2.0",
+    "@docusaurus/utils": "2.3.0",
+    "@docusaurus/utils-common": "2.3.0",
+    "@docusaurus/utils-validation": "2.3.0",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.2.0",
-    "@docusaurus/types": "2.2.0",
+    "@docusaurus/module-type-aliases": "2.3.0",
+    "@docusaurus/types": "2.3.0",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-config": "^5.0.6",
@@ -127,5 +127,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "a308fb7c81832cca354192fe2984f52749441249"
+  "gitHead": "ad477781bdca6a11fa9c6daef5048bdcec0ee37e"
 }