@docusaurus/core 0.0.0-4258 → 0.0.0-4263

package/lib/webpack/utils.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimizer = exports.getHttpsConfig = exports.getFileLoaderUtils = exports.compile = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = void 0;
+exports.getMinimizer = exports.getHttpsConfig = exports.compile = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = void 0;
 const tslib_1 = require("tslib");
 const mini_css_extract_plugin_1 = (0, tslib_1.__importDefault)(require("mini-css-extract-plugin"));
 const webpack_merge_1 = require("webpack-merge");
@@ -17,7 +17,7 @@ const css_minimizer_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("css
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const constants_1 = require("../constants");
+const utils_1 = require("@docusaurus/utils");
 const lodash_1 = require("lodash");
 // Utility method to get style loaders
 function getStyleLoaders(isServer, cssOptions = {}) {
@@ -76,7 +76,7 @@ function getStyleLoaders(isServer, cssOptions = {}) {
 }
 exports.getStyleLoaders = getStyleLoaders;
 function getCustomBabelConfigFilePath(siteDir) {
-    const customBabelConfigurationPath = path_1.default.join(siteDir, constants_1.BABEL_CONFIG_FILE_NAME);
+    const customBabelConfigurationPath = path_1.default.join(siteDir, utils_1.BABEL_CONFIG_FILE_NAME);
     return fs_extra_1.default.existsSync(customBabelConfigurationPath)
         ? customBabelConfigurationPath
         : undefined;
@@ -221,102 +221,6 @@ function compile(config) {
     });
 }
 exports.compile = compile;
-// Inspired by https://github.com/gatsbyjs/gatsby/blob/8e6e021014da310b9cc7d02e58c9b3efe938c665/packages/gatsby/src/utils/webpack-utils.ts#L447
-function getFileLoaderUtils() {
-    // files/images < urlLoaderLimit will be inlined as base64 strings directly in the html
-    const urlLoaderLimit = constants_1.WEBPACK_URL_LOADER_LIMIT;
-    // defines the path/pattern of the assets handled by webpack
-    const fileLoaderFileName = (folder) => `${constants_1.OUTPUT_STATIC_ASSETS_DIR_NAME}/${folder}/[name]-[hash].[ext]`;
-    const loaders = {
-        file: (options) => ({
-            loader: require.resolve(`file-loader`),
-            options: {
-                name: fileLoaderFileName(options.folder),
-            },
-        }),
-        url: (options) => ({
-            loader: require.resolve(`url-loader`),
-            options: {
-                limit: urlLoaderLimit,
-                name: fileLoaderFileName(options.folder),
-                fallback: require.resolve(`file-loader`),
-            },
-        }),
-        // TODO find a better solution to avoid conflicts with the ideal-image plugin
-        // TODO this may require a little breaking change for ideal-image users?
-        // Maybe with the ideal image plugin, all md images should be "ideal"?
-        // This is used to force url-loader+file-loader on markdown images
-        // https://webpack.js.org/concepts/loaders/#inline
-        inlineMarkdownImageFileLoader: `!url-loader?limit=${urlLoaderLimit}&name=${fileLoaderFileName('images')}&fallback=file-loader!`,
-        inlineMarkdownLinkFileLoader: `!file-loader?name=${fileLoaderFileName('files')}!`,
-    };
-    const rules = {
-        /**
-         * Loads image assets, inlines images via a data URI if they are below
-         * the size threshold
-         */
-        images: () => ({
-            use: [loaders.url({ folder: 'images' })],
-            test: /\.(ico|jpg|jpeg|png|gif|webp)(\?.*)?$/,
-        }),
-        fonts: () => ({
-            use: [loaders.url({ folder: 'fonts' })],
-            test: /\.(woff|woff2|eot|ttf|otf)$/,
-        }),
-        /**
-         * Loads audio and video and inlines them via a data URI if they are below
-         * the size threshold
-         */
-        media: () => ({
-            use: [loaders.url({ folder: 'medias' })],
-            test: /\.(mp4|webm|ogv|wav|mp3|m4a|aac|oga|flac)$/,
-        }),
-        svg: () => ({
-            test: /\.svg?$/,
-            oneOf: [
-                {
-                    use: [
-                        {
-                            loader: '@svgr/webpack',
-                            options: {
-                                prettier: false,
-                                svgo: true,
-                                svgoConfig: {
-                                    plugins: [
-                                        {
-                                            name: 'preset-default',
-                                            params: {
-                                                overrides: {
-                                                    removeViewBox: false,
-                                                },
-                                            },
-                                        },
-                                    ],
-                                },
-                                titleProp: true,
-                                ref: ![path_1.default],
-                            },
-                        },
-                    ],
-                    // We don't want to use SVGR loader for non-React source code
-                    // ie we don't want to use SVGR for CSS files...
-                    issuer: {
-                        and: [/\.(ts|tsx|js|jsx|md|mdx)$/],
-                    },
-                },
-                {
-                    use: [loaders.url({ folder: 'images' })],
-                },
-            ],
-        }),
-        otherAssets: () => ({
-            use: [loaders.file({ folder: 'files' })],
-            test: /\.(pdf|doc|docx|xls|xlsx|zip|rar)$/,
-        }),
-    };
-    return { loaders, rules };
-}
-exports.getFileLoaderUtils = getFileLoaderUtils;
 // Ensure the certificate and key provided are valid and if not
 // throw an easy to debug error
 function validateKeyAndCerts({ cert, key, keyFile, crtFile, }) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4258",
+  "version": "0.0.0-4263",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,11 +41,12 @@
     "@babel/runtime": "^7.16.3",
     "@babel/runtime-corejs3": "^7.16.3",
     "@babel/traverse": "^7.16.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4258",
+    "@docusaurus/cssnano-preset": "0.0.0-4263",
+    "@docusaurus/mdx-loader": "0.0.0-4263",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4258",
-    "@docusaurus/utils-common": "0.0.0-4258",
-    "@docusaurus/utils-validation": "0.0.0-4258",
+    "@docusaurus/utils": "0.0.0-4263",
+    "@docusaurus/utils-common": "0.0.0-4263",
+    "@docusaurus/utils-validation": "0.0.0-4263",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^6.0.0",
     "autoprefixer": "^10.3.5",
@@ -107,8 +108,8 @@
     "webpackbar": "^5.0.0-3"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4258",
-    "@docusaurus/types": "0.0.0-4258",
+    "@docusaurus/module-type-aliases": "0.0.0-4263",
+    "@docusaurus/types": "0.0.0-4263",
     "@types/copy-webpack-plugin": "^8.0.1",
     "@types/css-minimizer-webpack-plugin": "^3.0.2",
     "@types/detect-port": "^1.3.0",
@@ -127,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "8da10a91f6ab5e25e3d23ce2719bc4b512ee754d"
+  "gitHead": "c04a978ae6fdf49ddbeb2259c3f79c5d820eb243"
 }

package/lib/constants.d.ts

@@ -1,19 +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.
- */
-export declare const NODE_MAJOR_VERSION: number;
-export declare const NODE_MINOR_VERSION: number;
-export declare const DEFAULT_BUILD_DIR_NAME = "build";
-export declare const DEFAULT_CONFIG_FILE_NAME = "docusaurus.config.js";
-export declare const BABEL_CONFIG_FILE_NAME: string;
-export declare const GENERATED_FILES_DIR_NAME: string;
-export declare const SRC_DIR_NAME = "src";
-export declare const STATIC_DIR_NAME = "static";
-export declare const OUTPUT_STATIC_ASSETS_DIR_NAME = "assets";
-export declare const THEME_PATH: string;
-export declare const DEFAULT_PORT = 3000;
-export declare const DEFAULT_PLUGIN_ID = "default";
-export declare const WEBPACK_URL_LOADER_LIMIT: string | number;

package/lib/constants.js

@@ -1,26 +0,0 @@
-"use strict";
-/**
- * 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.
- */
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBPACK_URL_LOADER_LIMIT = exports.DEFAULT_PLUGIN_ID = exports.DEFAULT_PORT = exports.THEME_PATH = exports.OUTPUT_STATIC_ASSETS_DIR_NAME = exports.STATIC_DIR_NAME = exports.SRC_DIR_NAME = exports.GENERATED_FILES_DIR_NAME = exports.BABEL_CONFIG_FILE_NAME = exports.DEFAULT_CONFIG_FILE_NAME = exports.DEFAULT_BUILD_DIR_NAME = exports.NODE_MINOR_VERSION = exports.NODE_MAJOR_VERSION = void 0;
-exports.NODE_MAJOR_VERSION = parseInt(process.versions.node.split('.')[0], 10);
-exports.NODE_MINOR_VERSION = parseInt(process.versions.node.split('.')[1], 10);
-// Can be overridden with cli option --out-dir
-exports.DEFAULT_BUILD_DIR_NAME = 'build';
-// Can be overridden with cli option --config
-exports.DEFAULT_CONFIG_FILE_NAME = 'docusaurus.config.js';
-exports.BABEL_CONFIG_FILE_NAME = process.env.DOCUSAURUS_BABEL_CONFIG_FILE_NAME || 'babel.config.js';
-exports.GENERATED_FILES_DIR_NAME = process.env.DOCUSAURUS_GENERATED_FILES_DIR_NAME || '.docusaurus';
-exports.SRC_DIR_NAME = 'src';
-exports.STATIC_DIR_NAME = 'static';
-exports.OUTPUT_STATIC_ASSETS_DIR_NAME = 'assets'; // files handled by webpack, hashed (can be cached aggressively)
-exports.THEME_PATH = `${exports.SRC_DIR_NAME}/theme`;
-exports.DEFAULT_PORT = 3000;
-exports.DEFAULT_PLUGIN_ID = 'default';
-// Temporary fix for https://github.com/facebook/docusaurus/issues/5493
-exports.WEBPACK_URL_LOADER_LIMIT = (_a = process.env.WEBPACK_URL_LOADER_LIMIT) !== null && _a !== void 0 ? _a : 10000;