@docusaurus/core 0.0.0-4525 → 0.0.0-4533

package/lib/client/clientEntry.js

@@ -7,6 +7,7 @@
 import React from 'react';
 import { hydrate, render } from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
+import { HelmetProvider } from 'react-helmet-async';
 import routes from '@generated/routes';
 import ExecutionEnvironment from './exports/ExecutionEnvironment';
 import App from './App';
@@ -22,9 +23,11 @@ if (ExecutionEnvironment.canUseDOM) {
     // We also preload async component to avoid first-load loading screen.
     const renderMethod = process.env.NODE_ENV === 'production' ? hydrate : render;
     preload(routes, window.location.pathname).then(() => {
-        renderMethod(<BrowserRouter>
-        <App />
-      </BrowserRouter>, document.getElementById('__docusaurus'));
+        renderMethod(<HelmetProvider>
+        <BrowserRouter>
+          <App />
+        </BrowserRouter>
+      </HelmetProvider>, document.getElementById('__docusaurus'));
     });
     // Webpack Hot Module Replacement API
     if (module.hot) {

package/lib/client/docusaurus.js

@@ -23,7 +23,7 @@ const canPreload = (routePath) => !isSlowConnection() && !loaded[routePath];
 // Remove the last part containing the route hash
 // input: /blog/2018/12/14/Happy-First-Birthday-Slash-fe9
 // output: /blog/2018/12/14/Happy-First-Birthday-Slash
-const removeRouteNameHash = (str) => str.replace(/(-[^-]+)$/, '');
+const removeRouteNameHash = (str) => str.replace(/-[^-]+$/, '');
 const getChunkNamesToLoad = (path) => Object.entries(routesChunkNames)
     .filter(([routeNameWithHash]) => removeRouteNameHash(routeNameWithHash) === path)
     .flatMap(([, routeChunks]) => 

package/lib/client/exports/Head.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React from 'react';
-import { Helmet } from 'react-helmet';
+import { Helmet } from 'react-helmet-async';
 function Head(props) {
     return <Helmet {...props}/>;
 }

package/lib/client/exports/isInternalUrl.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 export function hasProtocol(url) {
-    return /^(\w*:|\/\/)/.test(url) === true;
+    return /^(?:\w*:|\/\/)/.test(url) === true;
 }
 export default function isInternalUrl(url) {
     return typeof url !== 'undefined' && !hasProtocol(url);

package/lib/client/serverEntry.js

@@ -8,7 +8,7 @@ import * as eta from 'eta';
 import React from 'react';
 import { StaticRouter } from 'react-router-dom';
 import ReactDOMServer from 'react-dom/server';
-import { Helmet } from 'react-helmet';
+import { HelmetProvider } from 'react-helmet-async';
 import { getBundles } from 'react-loadable-ssr-addon-v5-slorber';
 import Loadable from 'react-loadable';
 import { minify } from 'html-minifier-terser';
@@ -37,7 +37,7 @@ export default async function render(locals) {
     catch (e) {
         logger.error `Docusaurus Node/SSR could not render static page with path path=${locals.path} because of following error:
 ${e.stack}`;
-        const isNotDefinedErrorRegex = /(window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
+        const isNotDefinedErrorRegex = /(?:window|document|localStorage|navigator|alert|location|buffer|self) is not defined/i;
         if (isNotDefinedErrorRegex.test(e.message)) {
             logger.info `It looks like you are using code that should run on the client-side only.
 To get around it, try using code=${'<BrowserOnly>'} (path=${'https://docusaurus.io/docs/docusaurus-core/#browseronly'}) or code=${'ExecutionEnvironment'} (path=${'https://docusaurus.io/docs/docusaurus-core/#executionenvironment'}).
@@ -53,16 +53,19 @@ async function doRender(locals) {
     await preload(routes, location);
     const modules = new Set();
     const context = {};
+    const helmetContext = {};
     const linksCollector = createStatefulLinksCollector();
     const appHtml = ReactDOMServer.renderToString(<Loadable.Capture report={(moduleName) => modules.add(moduleName)}>
-      <StaticRouter location={location} context={context}>
-        <ProvideLinksCollector linksCollector={linksCollector}>
-          <App />
-        </ProvideLinksCollector>
-      </StaticRouter>
+      <HelmetProvider context={helmetContext}>
+        <StaticRouter location={location} context={context}>
+          <ProvideLinksCollector linksCollector={linksCollector}>
+            <App />
+          </ProvideLinksCollector>
+        </StaticRouter>
+      </HelmetProvider>
     </Loadable.Capture>);
     onLinksCollected(location, linksCollector.getCollectedLinks());
-    const helmet = Helmet.renderStatic();
+    const { helmet } = helmetContext;
     const htmlAttributes = helmet.htmlAttributes.toString();
     const bodyAttributes = helmet.bodyAttributes.toString();
     const metaStrings = [

package/lib/commands/deploy.js

@@ -56,7 +56,7 @@ function hasSSHProtocol(sourceRepoUrl) {
     }
     catch {
         // Fails when there isn't a protocol
-        return /^([\w-]+@)?[\w.-]+:[\w./_-]+(\.git)?/.test(sourceRepoUrl); // git@github.com:facebook/docusaurus.git
+        return /^(?:[\w-]+@)?[\w.-]+:[\w./_-]+/.test(sourceRepoUrl); // git@github.com:facebook/docusaurus.git
     }
 }
 exports.hasSSHProtocol = hasSSHProtocol;

package/lib/commands/swizzle.js

@@ -45,8 +45,8 @@ function getPluginNames(plugins) {
 }
 exports.getPluginNames = getPluginNames;
 const formatComponentName = (componentName) => componentName
-    .replace(/(\/|\\)index\.(js|tsx|ts|jsx)/, '')
-    .replace(/\.(js|tsx|ts|jsx)/, '');
+    .replace(/[\\/]index\.(?:jsx?|tsx?)/, '')
+    .replace(/\.(?:jsx?|tsx?)/, '');
 function readComponent(themePath) {
     function walk(dir) {
         let results = [];

package/lib/commands/writeHeadingIds.js

@@ -15,7 +15,7 @@ const init_1 = (0, tslib_1.__importDefault)(require("../server/plugins/init"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("../server/utils");
 function unwrapMarkdownLinks(line) {
-    return line.replace(/\[([^\]]+)\]\([^)]+\)/g, (match, p1) => p1);
+    return line.replace(/\[(?<alt>[^\]]+)\]\([^)]+\)/g, (match, p1) => p1);
 }
 function addHeadingId(line, slugger, maintainCase) {
     let headingLevel = 0;

package/lib/server/index.js

@@ -178,7 +178,7 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
                 module: {
                     rules: [
                         {
-                            test: /(\.mdx?)$/,
+                            test: /\.mdx?$/i,
                             exclude: getMDXFallbackExcludedPaths(),
                             use: [
                                 getJSLoader({ isServer }),

package/lib/server/moduleShorthand.js

@@ -13,7 +13,7 @@ function getNamePatterns(moduleName, moduleType) {
         if (!moduleName.includes('/')) {
             return [`${moduleName}/docusaurus-${moduleType}`];
         }
-        const [scope, packageName] = moduleName.split(/\/(.*)/);
+        const [scope, packageName] = moduleName.split(/\/(?<rest>.*)/);
         return [
             `${scope}/${packageName}`,
             `${scope}/docusaurus-${moduleType}-${packageName}`,

package/lib/server/routes.js

@@ -11,7 +11,7 @@ const lodash_1 = require("lodash");
 const querystring_1 = require("querystring");
 function indent(str) {
     const spaces = '  ';
-    return `${spaces}${str.replace(/(\n)/g, `\n${spaces}`)}`;
+    return `${spaces}${str.replace(/\n/g, `\n${spaces}`)}`;
 }
 const createRouteCodeString = ({ routePath, routeHash, exact, subroutesCodeStrings, props, }) => {
     const parts = [

package/lib/webpack/base.js

@@ -14,8 +14,8 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("./utils");
 const themes_1 = require("../server/themes");
 const utils_2 = require("@docusaurus/utils");
-const CSS_REGEX = /\.css$/;
-const CSS_MODULE_REGEX = /\.module\.css$/;
+const CSS_REGEX = /\.css$/i;
+const CSS_MODULE_REGEX = /\.module\.css$/i;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
 const LibrariesToTranspile = [
     'copy-text-to-clipboard', // contains optional catch binding, incompatible with recent versions of Edge
@@ -28,7 +28,7 @@ function excludeJS(modulePath) {
     }
     // Don't transpile node_modules except any docusaurus npm package
     return (/node_modules/.test(modulePath) &&
-        !/(docusaurus)((?!node_modules).)*\.jsx?$/.test(modulePath) &&
+        !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath) &&
         !LibrariesToTranspileRegex.test(modulePath));
 }
 exports.excludeJS = excludeJS;
@@ -182,7 +182,7 @@ function createBaseConfig(props, isServer, minify = true) {
                 fileLoaderUtils.rules.svg(),
                 fileLoaderUtils.rules.otherAssets(),
                 {
-                    test: /\.(j|t)sx?$/,
+                    test: /\.[jt]sx?$/i,
                     exclude: excludeJS,
                     use: [
                         (0, utils_1.getCustomizableJSLoader)((_a = siteConfig.webpack) === null || _a === void 0 ? void 0 : _a.jsLoader)({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4525",
+  "version": "0.0.0-4533",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -34,34 +34,34 @@
     "@babel/core": "^7.16.0",
     "@babel/generator": "^7.16.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
+    "@babel/plugin-transform-runtime": "^7.16.10",
+    "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.0",
     "@babel/preset-typescript": "^7.16.0",
     "@babel/runtime": "^7.16.3",
     "@babel/runtime-corejs3": "^7.16.3",
     "@babel/traverse": "^7.16.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4525",
-    "@docusaurus/logger": "0.0.0-4525",
-    "@docusaurus/mdx-loader": "0.0.0-4525",
+    "@docusaurus/cssnano-preset": "0.0.0-4533",
+    "@docusaurus/logger": "0.0.0-4533",
+    "@docusaurus/mdx-loader": "0.0.0-4533",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4525",
-    "@docusaurus/utils-common": "0.0.0-4525",
-    "@docusaurus/utils-validation": "0.0.0-4525",
+    "@docusaurus/utils": "0.0.0-4533",
+    "@docusaurus/utils-common": "0.0.0-4533",
+    "@docusaurus/utils-validation": "0.0.0-4533",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^6.0.0",
     "autoprefixer": "^10.3.5",
     "babel-loader": "^8.2.2",
     "babel-plugin-dynamic-import-node": "2.3.0",
     "boxen": "^5.0.1",
-    "chokidar": "^3.5.2",
-    "clean-css": "^5.1.5",
+    "chokidar": "^3.5.3",
+    "clean-css": "^5.2.4",
     "commander": "^5.1.0",
-    "copy-webpack-plugin": "^10.2.0",
-    "core-js": "^3.18.0",
+    "copy-webpack-plugin": "^10.2.4",
+    "core-js": "^3.21.0",
     "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^3.3.1",
-    "cssnano": "^5.0.8",
+    "css-minimizer-webpack-plugin": "^3.4.1",
+    "cssnano": "^5.0.16",
     "del": "^6.0.0",
     "detect-port": "^1.3.0",
     "escape-html": "^1.0.3",
@@ -75,13 +75,13 @@
     "is-root": "^2.1.0",
     "leven": "^3.1.0",
     "lodash": "^4.17.20",
-    "mini-css-extract-plugin": "^1.6.0",
+    "mini-css-extract-plugin": "^2.5.3",
     "nprogress": "^0.2.0",
     "postcss": "^8.3.7",
     "postcss-loader": "^6.1.1",
     "prompts": "^2.4.1",
     "react-dev-utils": "^12.0.0",
-    "react-helmet": "^6.1.0",
+    "react-helmet-async": "^1.2.2",
     "react-loadable": "npm:@docusaurus/react-loadable@5.5.2",
     "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
     "react-router": "^5.2.0",
@@ -92,27 +92,25 @@
     "semver": "^7.3.4",
     "serve-handler": "^6.1.3",
     "shelljs": "^0.8.4",
-    "strip-ansi": "^6.0.0",
     "terser-webpack-plugin": "^5.2.4",
     "tslib": "^2.3.1",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
     "wait-on": "^6.0.0",
-    "webpack": "^5.61.0",
+    "webpack": "^5.68.0",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-dev-server": "^4.7.1",
     "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4525",
-    "@docusaurus/types": "0.0.0-4525",
-    "@types/copy-webpack-plugin": "^8.0.1",
+    "@docusaurus/module-type-aliases": "0.0.0-4533",
+    "@docusaurus/types": "0.0.0-4533",
+    "@types/copy-webpack-plugin": "^10.1.0",
     "@types/detect-port": "^1.3.0",
-    "@types/mini-css-extract-plugin": "^1.4.3",
+    "@types/mini-css-extract-plugin": "^2.5.1",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.9",
-    "@types/react-helmet": "^6.0.0",
     "@types/react-router-config": "^5.0.1",
     "@types/rtl-detect": "^1.0.0",
     "@types/serve-handler": "^6.1.1",
@@ -129,5 +127,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "c1122ee21d114f85261bed9b8296ab3501454098"
+  "gitHead": "5ab127cc566e3d1af8653a162eafbfbd64d0764e"
 }