@docusaurus/core 4.0.0-canary-6974 → 4.0.0-canary-6976

package/lib/commands/build/buildLocale.js

@@ -47,7 +47,10 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
     const { props } = site;
     const { outDir, plugins, siteConfig } = props;
     const router = siteConfig.future.experimental_router;
-    const configureWebpackUtils = await (0, configure_1.createConfigureWebpackUtils)({ siteConfig });
+    const configureWebpackUtils = await (0, configure_1.createConfigureWebpackUtils)({
+        siteDir: props.siteDir,
+        siteConfig,
+    });
     // We can build the 2 configs in parallel
     const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await logger_1.PerfLogger.async(`Creating ${props.currentBundler.name} bundler configs`, () => Promise.all([
         getBuildClientConfig({

package/lib/commands/start/webpack.js

@@ -106,6 +106,7 @@ async function getStartClientConfig({ props, minify, poll, configureWebpackUtils
 }
 async function createWebpackDevServer({ props, cliOptions, openUrlContext, }) {
     const configureWebpackUtils = await (0, configure_1.createConfigureWebpackUtils)({
+        siteDir: props.siteDir,
         siteConfig: props.siteConfig,
     });
     const config = await getStartClientConfig({

package/lib/server/translations/translationsExtractor.js

@@ -42,7 +42,7 @@ async function getSourceCodeFilePaths(siteDir, plugins) {
 async function extractSiteSourceCodeTranslations({ siteDir, plugins, extraSourceCodeFilePaths = [], }) {
     const babelOptions = (0, babel_1.getBabelOptions)({
         isServer: true,
-        babelOptions: await (0, babel_1.getCustomBabelConfigFilePath)(siteDir),
+        configFile: await (0, babel_1.getCustomBabelConfigFilePath)(siteDir),
     });
     // Should we warn here if the same translation "key" is found in multiple
     // source code files?

package/lib/webpack/base.js

@@ -11,7 +11,6 @@ exports.excludeJS = excludeJS;
 exports.createBaseConfig = createBaseConfig;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const babel_1 = require("@docusaurus/babel");
 const bundler_1 = require("@docusaurus/bundler");
 const utils_1 = require("@docusaurus/utils");
 const fs_1 = require("@docusaurus/fs");
@@ -57,7 +56,7 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
     const themeAliases = await (0, aliases_1.loadThemeAliases)({ siteDir, plugins });
-    const createJsLoader = await (0, bundler_1.createJsLoaderFactory)({ siteConfig });
+    const createJsLoader = await (0, bundler_1.createJsLoaderFactory)({ siteDir, siteConfig });
     const CSSExtractPlugin = await (0, bundler_1.getCSSExtractPlugin)({
         currentBundler: props.currentBundler,
     });
@@ -71,9 +70,12 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
         // Because Webpack does not evict the cache on alias/swizzle changes,
         // See https://github.com/webpack/webpack/issues/13627
         const themeAliasesHash = (0, utils_1.md5Hash)(JSON.stringify(themeAliases));
+        // Loader and minimizer options are not part of the cache key
+        // Changing the Browserslist config must evict the cache
+        const browserslistHash = (0, utils_1.md5Hash)(JSON.stringify((0, bundler_1.getBrowserslistQueries)()));
         // Asset module parser options are not part of the cache key
         // Changing the asset inline max size must evict the cache
-        return `${siteMetadata.docusaurusVersion}-${themeAliasesHash}-${utils_1.ASSET_INLINE_MAX_SIZE}`;
+        return `${siteMetadata.docusaurusVersion}-${themeAliasesHash}-${browserslistHash}-${utils_1.ASSET_INLINE_MAX_SIZE}`;
     }
     // When one of those modules/dependencies change (including transitive
     // deps), cache is invalidated
@@ -226,12 +228,7 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
                     test: /\.[jt]sx?$/i,
                     exclude: excludeJS,
                     with: notTextImport,
-                    use: [
-                        createJsLoader({
-                            isServer,
-                            babelOptions: await (0, babel_1.getCustomBabelConfigFilePath)(siteDir),
-                        }),
-                    ],
+                    use: [createJsLoader({ isServer })],
                 },
                 {
                     test: CSS_REGEX,

package/lib/webpack/configure.d.ts

@@ -9,9 +9,11 @@ import type { Configuration } from 'webpack';
 import type { Plugin, ConfigureWebpackUtils, LoadedPlugin } from '@docusaurus/types';
 /**
  * Creates convenient utils to inject into the configureWebpack() lifecycle
- * @param config the Docusaurus config
+ * @param siteDir the site directory
+ * @param siteConfig the Docusaurus config
  */
-export declare function createConfigureWebpackUtils({ siteConfig, }: {
+export declare function createConfigureWebpackUtils({ siteDir, siteConfig, }: {
+    siteDir: string;
     siteConfig: Parameters<typeof createJsLoaderFactory>[0]['siteConfig'] & Parameters<typeof getCurrentBundler>[0]['siteConfig'];
 }): Promise<ConfigureWebpackUtils>;
 /**

package/lib/webpack/configure.js

@@ -14,12 +14,13 @@ const webpack_merge_1 = require("webpack-merge");
 const bundler_1 = require("@docusaurus/bundler");
 /**
  * Creates convenient utils to inject into the configureWebpack() lifecycle
- * @param config the Docusaurus config
+ * @param siteDir the site directory
+ * @param siteConfig the Docusaurus config
  */
-async function createConfigureWebpackUtils({ siteConfig, }) {
+async function createConfigureWebpackUtils({ siteDir, siteConfig, }) {
     const currentBundler = await (0, bundler_1.getCurrentBundler)({ siteConfig });
     const getStyleLoaders = await (0, bundler_1.createStyleLoadersFactory)({ currentBundler });
-    const getJSLoader = await (0, bundler_1.createJsLoaderFactory)({ siteConfig });
+    const getJSLoader = await (0, bundler_1.createJsLoaderFactory)({ siteDir, siteConfig });
     return {
         currentBundler,
         getStyleLoaders,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6974",
+  "version": "4.0.0-canary-6976",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -27,15 +27,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6974",
-    "@docusaurus/bundler": "4.0.0-canary-6974",
-    "@docusaurus/fs": "4.0.0-canary-6974",
-    "@docusaurus/glob": "4.0.0-canary-6974",
-    "@docusaurus/logger": "4.0.0-canary-6974",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6974",
-    "@docusaurus/utils": "4.0.0-canary-6974",
-    "@docusaurus/utils-common": "4.0.0-canary-6974",
-    "@docusaurus/utils-validation": "4.0.0-canary-6974",
+    "@docusaurus/babel": "4.0.0-canary-6976",
+    "@docusaurus/bundler": "4.0.0-canary-6976",
+    "@docusaurus/fs": "4.0.0-canary-6976",
+    "@docusaurus/glob": "4.0.0-canary-6976",
+    "@docusaurus/logger": "4.0.0-canary-6976",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6976",
+    "@docusaurus/utils": "4.0.0-canary-6976",
+    "@docusaurus/utils-common": "4.0.0-canary-6976",
+    "@docusaurus/utils-validation": "4.0.0-canary-6976",
     "@rspack/core": "^2.2.3",
     "@rspack/dev-server": "^2.2.1",
     "boxen": "^9.0.0",
@@ -68,8 +68,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6974",
-    "@docusaurus/types": "4.0.0-canary-6974",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6976",
+    "@docusaurus/types": "4.0.0-canary-6976",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",