@docusaurus/core 4.0.0-canary-6835 → 4.0.0-canary-6840

package/lib/client/App.js

@@ -13,7 +13,6 @@ import Root from '@theme/Root';
 import ThemeProvider from '@theme/ThemeProvider';
 import SiteMetadata from '@theme/SiteMetadata';
 import normalizeLocation from './normalizeLocation';
-import { BrowserContextProvider } from './browserContext';
 import { DocusaurusContextProvider } from './docusaurusContext';
 import PendingNavigation from './PendingNavigation';
 import BaseUrlIssueBanner from './BaseUrlIssueBanner';
@@ -33,17 +32,15 @@ function AppNavigation() {
 export default function App() {
     return (<ErrorBoundary>
       <DocusaurusContextProvider>
-        <BrowserContextProvider>
-          <Root>
-            <ThemeProvider>
-              <SiteMetadataDefaults />
-              <SiteMetadata />
-              <BaseUrlIssueBanner />
-              <AppNavigation />
-            </ThemeProvider>
-          </Root>
-          <HasHydratedDataAttribute />
-        </BrowserContextProvider>
+        <Root>
+          <ThemeProvider>
+            <SiteMetadataDefaults />
+            <SiteMetadata />
+            <BaseUrlIssueBanner />
+            <AppNavigation />
+          </ThemeProvider>
+        </Root>
+        <HasHydratedDataAttribute />
       </DocusaurusContextProvider>
     </ErrorBoundary>);
 }

package/lib/client/exports/useIsBrowser.js

@@ -4,8 +4,14 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { useContext } from 'react';
-import { Context } from '../browserContext';
+import { useSyncExternalStore } from 'react';
+// The "browser" state never changes, there's nothing to subscribe to
+const subscribe = () => () => { };
+// On first client-side render, we need to render exactly as the server rendered
+// See https://www.joshwcomeau.com/react/the-perils-of-rehydration/
+// React uses getServerSnapshot during SSR and hydration, and re-renders with
+// getSnapshot right after hydration. Components mounted after hydration
+// directly get the client value, without an extra re-render.
 export default function useIsBrowser() {
-    return useContext(Context);
+    return useSyncExternalStore(subscribe, () => true, () => false);
 }

package/lib/commands/start/watcher.d.ts

@@ -24,7 +24,7 @@ type WatchParams = {
  * Watch file system paths for changes and emit events
  * Returns an async handle to stop watching
  */
-export declare function watch(params: WatchParams, callback: (event: FileWatchEvent) => void): () => Promise<void>;
+export declare function watchPaths(params: WatchParams, callback: (event: FileWatchEvent) => void): () => Promise<void>;
 export declare function getSitePathsToWatch({ props }: {
     props: Props;
 }): string[];

package/lib/commands/start/watcher.js

@@ -7,13 +7,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPollingOptions = createPollingOptions;
-exports.watch = watch;
+exports.watchPaths = watchPaths;
 exports.getSitePathsToWatch = getSitePathsToWatch;
 exports.getPluginPathsToWatch = getPluginPathsToWatch;
 exports.setupSiteFileWatchers = setupSiteFileWatchers;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
+const glob_1 = require("@docusaurus/glob");
 const utils_1 = require("@docusaurus/utils");
 function createPollingOptions(cliOptions) {
     return {
@@ -27,15 +27,15 @@ function createPollingOptions(cliOptions) {
  * Watch file system paths for changes and emit events
  * Returns an async handle to stop watching
  */
-function watch(params, callback) {
+function watchPaths(params, callback) {
     const { pathsToWatch, siteDir, ...options } = params;
-    const fsWatcher = chokidar_1.default.watch(pathsToWatch, {
+    const watcher = (0, glob_1.watch)(pathsToWatch, {
         cwd: siteDir,
         ignoreInitial: true,
         ...options,
     });
-    fsWatcher.on('all', (name, eventPath) => callback({ name, path: eventPath }));
-    return () => fsWatcher.close();
+    watcher.on('all', (name, eventPath) => callback({ name, path: eventPath }));
+    return () => watcher.close();
 }
 function getSitePathsToWatch({ props }) {
     return [
@@ -62,13 +62,13 @@ function setupSiteFileWatchers({ props, cliOptions, }, callback) {
     // TODO on config / or local plugin updates,
     //  the getFilePathsToWatch lifecycle code might get updated
     //  so we should probably reset the watchers?
-    watch({
+    watchPaths({
         pathsToWatch: getSitePathsToWatch({ props }),
         siteDir: props.siteDir,
         ...pollingOptions,
     }, (event) => callback({ plugin: null, event }));
     props.plugins.forEach((plugin) => {
-        watch({
+        watchPaths({
             pathsToWatch: getPluginPathsToWatch({ plugin, siteDir }),
             siteDir,
             ...pollingOptions,

package/lib/commands/swizzle/actions.js

@@ -16,6 +16,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const prompts_1 = require("./prompts");
 exports.SwizzleActions = ['wrap', 'eject'];
 async function getAction(componentConfig, options) {
@@ -38,7 +39,7 @@ async function eject({ siteDir, themePath, componentName, typescript, }) {
             path_1.default.join(fromPath, '**/*')
         : `${fromPath}.*`;
     const globPatternPosix = (0, utils_1.posixPath)(globPattern);
-    const filesToCopy = await (0, utils_1.Globby)(globPatternPosix, {
+    const filesToCopy = await (0, glob_1.glob)(globPatternPosix, {
         // Workaround for Tinyglobby bug?
         // We glob absolute from the theme root path, not from cwd
         // See https://github.com/SuperchupuDev/tinyglobby/issues/186

package/lib/commands/writeHeadingIds.js

@@ -11,6 +11,7 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const site_1 = require("../server/site");
 const init_1 = require("../server/plugins/init");
 function inferFallbackSyntax(_filepath) {
@@ -38,6 +39,10 @@ async function transformMarkdownFile(filepath, options) {
     }
     return undefined;
 }
+async function globMarkdownFiles(patterns) {
+    const files = await (0, glob_1.safeGlob)(patterns);
+    return files.filter((file) => file.endsWith('.md') || file.endsWith('.mdx'));
+}
 /**
  * We only handle the "paths to watch" because these are the paths where the
  * markdown files are. Also we don't want to transform the site md docs that do
@@ -63,9 +68,7 @@ async function writeHeadingIds(siteDirParam = '.', files = [], options = {}) {
     validateOptions(options);
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const patterns = files.length ? files : await getPathsToWatch(siteDir);
-    const markdownFiles = (await (0, utils_1.safeGlobby)(patterns, {
-        expandDirectories: true,
-    })).filter((file) => file.endsWith('.md') || file.endsWith('.mdx'));
+    const markdownFiles = await globMarkdownFiles(patterns);
     if (markdownFiles.length === 0) {
         logger_1.default.warn `No markdown files found in siteDir path=${siteDir} for patterns: ${patterns}`;
         return;

package/lib/commands/writeTranslations.js

@@ -10,7 +10,7 @@ exports.writeTranslations = writeTranslations;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const site_1 = require("../server/site");
 const init_1 = require("../server/plugins/init");
 const translations_1 = require("../server/translations/translations");
@@ -35,7 +35,7 @@ async function getExtraSourceCodeFilePaths() {
     if (!themeCommonLibDir) {
         return []; // User may not use a Docusaurus official theme? Quite unlikely...
     }
-    return (0, utils_1.globTranslatableSourceFiles)([themeCommonLibDir]);
+    return (0, glob_1.globTranslatableSourceFiles)([themeCommonLibDir]);
 }
 async function writePluginTranslationFiles({ localizationDir, plugin, options, }) {
     if (plugin.getTranslationFiles) {

package/lib/server/plugins/synthetic.js

@@ -95,6 +95,7 @@ async function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
                         {
                             test: /\.mdx?$/i,
                             exclude: getMDXFallbackExcludedPaths(),
+                            with: { type: { not: 'text' } },
                             use: [mdxLoaderItem],
                         },
                     ],

package/lib/server/translations/translationsExtractor.js

@@ -11,6 +11,7 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const babel_1 = require("@docusaurus/babel");
 function getSiteSourceCodeFilePaths(siteDir) {
     return [path_1.default.join(siteDir, utils_1.SRC_DIR_NAME)];
@@ -36,7 +37,7 @@ async function getSourceCodeFilePaths(siteDir, plugins) {
     // new lifecycle method for that???
     const pluginsPaths = plugins.flatMap(getPluginSourceCodeFilePaths);
     const allPaths = [...sitePaths, ...pluginsPaths];
-    return (0, utils_1.globTranslatableSourceFiles)(allPaths);
+    return (0, glob_1.globTranslatableSourceFiles)(allPaths);
 }
 async function extractSiteSourceCodeTranslations({ siteDir, plugins, extraSourceCodeFilePaths = [], }) {
     const babelOptions = (0, babel_1.getBabelOptions)({

package/lib/webpack/aliases/index.js

@@ -15,6 +15,7 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const ThemeFallbackDir = path_1.default.join(__dirname, '../../client/theme-fallback');
 /**
  * Order of Webpack aliases is important because one alias can shadow another.
@@ -37,7 +38,7 @@ async function createAliasesForTheme(themePath, addOriginalAlias) {
     if (!(await fs_extra_1.default.pathExists(themePath))) {
         return {};
     }
-    const themeComponentFiles = await (0, utils_1.Globby)(['**/*.{js,jsx,ts,tsx}'], {
+    const themeComponentFiles = await (0, glob_1.glob)(['**/*.{js,jsx,ts,tsx}'], {
         cwd: themePath,
         ignore: [
             // Ignore co-located test files

package/lib/webpack/base.js

@@ -109,6 +109,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
             },
         };
     }
+    const notTextImport = { type: { not: 'text' } };
     return {
         mode,
         name,
@@ -212,6 +213,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 {
                     test: /\.[jt]sx?$/i,
                     exclude: excludeJS,
+                    with: notTextImport,
                     use: [
                         createJsLoader({
                             isServer,
@@ -222,6 +224,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 {
                     test: CSS_REGEX,
                     exclude: CSS_MODULE_REGEX,
+                    with: notTextImport,
                     use: configureWebpackUtils.getStyleLoaders(isServer, {
                         importLoaders: 1,
                         sourceMap: !isProd,
@@ -231,6 +234,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 // using the extension .module.css
                 {
                     test: CSS_MODULE_REGEX,
+                    with: notTextImport,
                     use: configureWebpackUtils.getStyleLoaders(isServer, {
                         modules: {
                             // Using the same CSS Module class pattern in dev/prod on purpose

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6835",
+  "version": "4.0.0-canary-6840",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,15 +33,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6835",
-    "@docusaurus/bundler": "4.0.0-canary-6835",
-    "@docusaurus/logger": "4.0.0-canary-6835",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6835",
-    "@docusaurus/utils": "4.0.0-canary-6835",
-    "@docusaurus/utils-common": "4.0.0-canary-6835",
-    "@docusaurus/utils-validation": "4.0.0-canary-6835",
+    "@docusaurus/babel": "4.0.0-canary-6840",
+    "@docusaurus/bundler": "4.0.0-canary-6840",
+    "@docusaurus/glob": "4.0.0-canary-6840",
+    "@docusaurus/logger": "4.0.0-canary-6840",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6840",
+    "@docusaurus/utils": "4.0.0-canary-6840",
+    "@docusaurus/utils-common": "4.0.0-canary-6840",
+    "@docusaurus/utils-validation": "4.0.0-canary-6840",
     "boxen": "^8.0.1",
-    "chokidar": "^3.6.0",
     "cli-table3": "^0.6.5",
     "combine-promises": "^1.2.0",
     "commander": "^15.0.0",
@@ -76,8 +76,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6835",
-    "@docusaurus/types": "4.0.0-canary-6835",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6840",
+    "@docusaurus/types": "4.0.0-canary-6840",
     "@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-6835",
+    "@docusaurus/faster": "4.0.0-canary-6840",
     "@mdx-js/react": "^3.1.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0"
@@ -104,5 +104,5 @@
   "engines": {
     "node": ">=24.21"
   },
-  "gitHead": "545ee70227b7e3446e96056b3c5e7796711e42b4"
+  "gitHead": "b767143bc76b7747a9d1cc747dece7b06195a5c0"
 }

package/lib/client/browserContext.d.ts

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import React, { type ReactNode } from 'react';
-export declare const Context: React.Context<boolean>;
-export declare function BrowserContextProvider({ children, }: {
-    children: ReactNode;
-}): ReactNode;

package/lib/client/browserContext.js

@@ -1,22 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import React, { useEffect, useState } from 'react';
-// Encapsulate the logic to avoid React hydration problems
-// See https://www.joshwcomeau.com/react/the-perils-of-rehydration/
-// On first client-side render, we need to render exactly as the server rendered
-// isBrowser is set to true only after a successful hydration
-// Note, isBrowser is not part of useDocusaurusContext() for perf reasons
-// Using useDocusaurusContext() (much more common need) should not trigger
-// re-rendering after a successful hydration
-export const Context = React.createContext(false);
-export function BrowserContextProvider({ children, }) {
-    const [isBrowser, setIsBrowser] = useState(false);
-    useEffect(() => {
-        setIsBrowser(true);
-    }, []);
-    return <Context.Provider value={isBrowser}>{children}</Context.Provider>;
-}