@docusaurus/utils 4.0.0-canary-6928 → 4.0.0-canary-6929

package/lib/constants.d.ts

@@ -64,10 +64,12 @@ export declare const DEFAULT_PORT: number;
 /** Default plugin ID. */
 export declare const DEFAULT_PLUGIN_ID = "default";
 /**
- * Allow overriding the limit after which the url loader will no longer inline
- * assets.
+ * Max size in bytes under which assets (images, fonts, medias) are inlined in
+ * the bundles as base64 data URLs, instead of being emitted as separate files.
+ * Overrides the default max size when the `DOCUSAURUS_ASSET_INLINE_MAX_SIZE`
+ * env variable is set.
  *
  * @see https://github.com/facebook/docusaurus/issues/5493
  */
-export declare const WEBPACK_URL_LOADER_LIMIT: string | number;
+export declare const ASSET_INLINE_MAX_SIZE: number | undefined;
 //# sourceMappingURL=constants.d.ts.map

package/lib/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,QAG9B,CAAC;AACF,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,QAG9B,CAAC;AAEF,+BAA+B;AAC/B,eAAO,MAAM,kBAAkB,QAE4B,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,UAAU,CAAC;AAE9C;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,sBAAsB,CAAC;AAE5D,qDAAqD;AACrD,eAAO,MAAM,sBAAsB,QACiC,CAAC;AAErE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAC6B,CAAC;AAEnE;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC;;;GAGG;AACH,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,6BAA6B,WAAW,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,UAAU,cAA0B,CAAC;AAElD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,2BAA2B,cAAc,CAAC;AAEvD,gDAAgD;AAChD,eAAO,MAAM,YAAY,QAEjB,CAAC;AAET,yBAAyB;AACzB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,iBACU,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,QAG9B,CAAC;AACF,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,QAG9B,CAAC;AAEF,+BAA+B;AAC/B,eAAO,MAAM,kBAAkB,QAE4B,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,UAAU,CAAC;AAE9C;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,sBAAsB,CAAC;AAE5D,qDAAqD;AACrD,eAAO,MAAM,sBAAsB,QACiC,CAAC;AAErE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAC6B,CAAC;AAEnE;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC;;;GAGG;AACH,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,6BAA6B,WAAW,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,UAAU,cAA0B,CAAC;AAElD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,2BAA2B,cAAc,CAAC;AAEvD,gDAAgD;AAChD,eAAO,MAAM,YAAY,QAEjB,CAAC;AAET,yBAAyB;AACzB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,GAAG,SAGhC,CAAC"}

package/lib/constants.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBPACK_URL_LOADER_LIMIT = exports.DEFAULT_PLUGIN_ID = exports.DEFAULT_PORT = exports.CODE_TRANSLATIONS_FILE_NAME = exports.DEFAULT_I18N_DIR_NAME = exports.THEME_PATH = exports.OUTPUT_STATIC_ASSETS_DIR_NAME = exports.DEFAULT_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.DOCUSAURUS_VERSION = exports.NODE_MINOR_VERSION = exports.NODE_MAJOR_VERSION = void 0;
+exports.ASSET_INLINE_MAX_SIZE = exports.DEFAULT_PLUGIN_ID = exports.DEFAULT_PORT = exports.CODE_TRANSLATIONS_FILE_NAME = exports.DEFAULT_I18N_DIR_NAME = exports.THEME_PATH = exports.OUTPUT_STATIC_ASSETS_DIR_NAME = exports.DEFAULT_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.DOCUSAURUS_VERSION = exports.NODE_MINOR_VERSION = exports.NODE_MAJOR_VERSION = void 0;
 /** Node major version, directly read from env. */
 exports.NODE_MAJOR_VERSION = parseInt(process.versions.node.split('.')[0], 10);
 /** Node minor version, directly read from env. */
@@ -71,10 +71,15 @@ exports.DEFAULT_PORT = process.env.PORT
 /** Default plugin ID. */
 exports.DEFAULT_PLUGIN_ID = 'default';
 /**
- * Allow overriding the limit after which the url loader will no longer inline
- * assets.
+ * Max size in bytes under which assets (images, fonts, medias) are inlined in
+ * the bundles as base64 data URLs, instead of being emitted as separate files.
+ * Overrides the default max size when the `DOCUSAURUS_ASSET_INLINE_MAX_SIZE`
+ * env variable is set.
  *
  * @see https://github.com/facebook/docusaurus/issues/5493
  */
-exports.WEBPACK_URL_LOADER_LIMIT = process.env.WEBPACK_URL_LOADER_LIMIT ?? 10000;
+exports.ASSET_INLINE_MAX_SIZE = process.env
+    .DOCUSAURUS_ASSET_INLINE_MAX_SIZE
+    ? parseInt(process.env.DOCUSAURUS_ASSET_INLINE_MAX_SIZE, 10)
+    : undefined;
 //# sourceMappingURL=constants.js.map

package/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kDAAkD;AACrC,QAAA,kBAAkB,GAAG,QAAQ,CACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,EACpC,EAAE,CACH,CAAC;AACF,kDAAkD;AACrC,QAAA,kBAAkB,GAAG,QAAQ,CACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,EACpC,EAAE,CACH,CAAC;AAEF,+BAA+B;AAClB,QAAA,kBAAkB;AAC7B,iEAAiE;AAChE,OAAO,CAAC,iBAAiB,CAAuB,CAAC,OAAO,CAAC;AAE5D;;;GAGG;AACU,QAAA,sBAAsB,GAAG,OAAO,CAAC;AAE9C;;;;;;GAMG;AACU,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAE5D,qDAAqD;AACxC,QAAA,sBAAsB,GACjC,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,iBAAiB,CAAC;AAErE;;;GAGG;AACU,QAAA,wBAAwB,GACnC,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,aAAa,CAAC;AAEnE;;;GAGG;AACU,QAAA,YAAY,GAAG,KAAK,CAAC;AAElC;;;GAGG;AACU,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAEhD;;;GAGG;AACU,QAAA,6BAA6B,GAAG,QAAQ,CAAC;AAEtD;;;GAGG;AACU,QAAA,UAAU,GAAG,GAAG,QAAA,YAAY,QAAQ,CAAC;AAElD;;;GAGG;AACU,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAE5C;;GAEG;AACU,QAAA,2BAA2B,GAAG,WAAW,CAAC;AAEvD,gDAAgD;AACnC,QAAA,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI;IAC1C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IAChC,CAAC,CAAC,IAAI,CAAC;AAET,yBAAyB;AACZ,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C;;;;;GAKG;AACU,QAAA,wBAAwB,GACnC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,KAAK,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kDAAkD;AACrC,QAAA,kBAAkB,GAAG,QAAQ,CACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,EACpC,EAAE,CACH,CAAC;AACF,kDAAkD;AACrC,QAAA,kBAAkB,GAAG,QAAQ,CACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,EACpC,EAAE,CACH,CAAC;AAEF,+BAA+B;AAClB,QAAA,kBAAkB;AAC7B,iEAAiE;AAChE,OAAO,CAAC,iBAAiB,CAAuB,CAAC,OAAO,CAAC;AAE5D;;;GAGG;AACU,QAAA,sBAAsB,GAAG,OAAO,CAAC;AAE9C;;;;;;GAMG;AACU,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAE5D,qDAAqD;AACxC,QAAA,sBAAsB,GACjC,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,iBAAiB,CAAC;AAErE;;;GAGG;AACU,QAAA,wBAAwB,GACnC,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,aAAa,CAAC;AAEnE;;;GAGG;AACU,QAAA,YAAY,GAAG,KAAK,CAAC;AAElC;;;GAGG;AACU,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAEhD;;;GAGG;AACU,QAAA,6BAA6B,GAAG,QAAQ,CAAC;AAEtD;;;GAGG;AACU,QAAA,UAAU,GAAG,GAAG,QAAA,YAAY,QAAQ,CAAC;AAElD;;;GAGG;AACU,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAE5C;;GAEG;AACU,QAAA,2BAA2B,GAAG,WAAW,CAAC;AAEvD,gDAAgD;AACnC,QAAA,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI;IAC1C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IAChC,CAAC,CAAC,IAAI,CAAC;AAET,yBAAyB;AACZ,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C;;;;;;;GAOG;AACU,QAAA,qBAAqB,GAAuB,OAAO,CAAC,GAAG;KACjE,gCAAgC;IACjC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,EAAE,CAAC;IAC5D,CAAC,CAAC,SAAS,CAAC"}

package/lib/index.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export { NODE_MAJOR_VERSION, NODE_MINOR_VERSION, DOCUSAURUS_VERSION, DEFAULT_BUILD_DIR_NAME, DEFAULT_CONFIG_FILE_NAME, BABEL_CONFIG_FILE_NAME, GENERATED_FILES_DIR_NAME, SRC_DIR_NAME, DEFAULT_STATIC_DIR_NAME, OUTPUT_STATIC_ASSETS_DIR_NAME, THEME_PATH, DEFAULT_I18N_DIR_NAME, CODE_TRANSLATIONS_FILE_NAME, DEFAULT_PORT, DEFAULT_PLUGIN_ID, WEBPACK_URL_LOADER_LIMIT, } from './constants';
+export { NODE_MAJOR_VERSION, NODE_MINOR_VERSION, DOCUSAURUS_VERSION, DEFAULT_BUILD_DIR_NAME, DEFAULT_CONFIG_FILE_NAME, BABEL_CONFIG_FILE_NAME, GENERATED_FILES_DIR_NAME, SRC_DIR_NAME, DEFAULT_STATIC_DIR_NAME, OUTPUT_STATIC_ASSETS_DIR_NAME, THEME_PATH, DEFAULT_I18N_DIR_NAME, CODE_TRANSLATIONS_FILE_NAME, DEFAULT_PORT, DEFAULT_PLUGIN_ID, ASSET_INLINE_MAX_SIZE, } from './constants';
 export { generate, readOutputHTMLFile } from './emitUtils';
 export { mergeTranslations, updateTranslationFileMessages, getPluginI18nPath, getLocaleConfig, } from './i18nUtils';
 export { mapAsyncSequential, findAsyncSequential } from './jsUtils';
@@ -17,7 +17,7 @@ export { type ContentPaths, type SourceToPermalink, resolveMarkdownLinkPathname,
 export { type SluggerOptions, type Slugger, createSlugger } from './slugger';
 export { isNameTooLong, shortName, posixPath, toMessageRelativeFilePath, aliasedSitePath, aliasedSitePathToRelativePath, escapePath, addTrailingPathSeparator, } from './pathUtils';
 export { md5Hash, simpleHash, docuHash } from './hashUtils';
-export { getFileLoaderUtils, getWebpackLoaderCompilerName, type WebpackCompilerName, } from './webpackUtils';
+export { getAssetRuleUtils, findAssetRule, createAssetRequest, getWebpackLoaderCompilerName, type AssetRequestType, type WebpackCompilerName, } from './webpackUtils';
 export { loadFreshModule } from './moduleUtils';
 export { getDataFilePath, readDataFile, getContentPathList, findFolderContainingFile, getFolderContainingFile, } from './dataFileUtils';
 export { isDraft, isUnlisted } from './contentVisibilityUtils';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,EACxB,YAAY,EACZ,uBAAuB,EACvB,6BAA6B,EAC7B,UAAU,EACV,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAC,MAAM,aAAa,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,6BAA6B,EAC7B,iBAAiB,EACjB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,kBAAkB,EAAE,mBAAmB,EAAC,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,YAAY,EACZ,UAAU,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,YAAY,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,KAAK,GAAG,EACR,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,aAAa,EACb,0BAA0B,EAC1B,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,KAAK,eAAe,EACpB,KAAK,qBAAqB,GAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,KAAK,cAAc,EAAE,KAAK,OAAO,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AAC3E,OAAO,EACL,aAAa,EACb,SAAS,EACT,SAAS,EACT,yBAAyB,EACzB,eAAe,EACf,6BAA6B,EAC7B,UAAU,EACV,wBAAwB,GACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAC1D,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAC5B,KAAK,mBAAmB,GACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAE3C,OAAO,EACL,kBAAkB,EAClB,KAAK,cAAc,EACnB,KAAK,qBAAqB,GAC3B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,EACxB,YAAY,EACZ,uBAAuB,EACvB,6BAA6B,EAC7B,UAAU,EACV,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,EACZ,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAC,MAAM,aAAa,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,6BAA6B,EAC7B,iBAAiB,EACjB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,kBAAkB,EAAE,mBAAmB,EAAC,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,YAAY,EACZ,UAAU,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,YAAY,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,KAAK,GAAG,EACR,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,aAAa,EACb,0BAA0B,EAC1B,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,KAAK,eAAe,EACpB,KAAK,qBAAqB,GAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,KAAK,cAAc,EAAE,KAAK,OAAO,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AAC3E,OAAO,EACL,aAAa,EACb,SAAS,EACT,SAAS,EACT,yBAAyB,EACzB,eAAe,EACf,6BAA6B,EAC7B,UAAU,EACV,wBAAwB,GACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAC1D,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EAClB,4BAA4B,EAC5B,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,GACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAE3C,OAAO,EACL,kBAAkB,EAClB,KAAK,cAAc,EACnB,KAAK,qBAAqB,GAC3B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,QAAQ,CAAC"}

package/lib/index.js

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveMarkdownLinkPathname = exports.writeMarkdownHeadingId = exports.escapeMarkdownHeadingIds = exports.parseMarkdownHeadingId = exports.parseMarkdownFile = exports.parseMarkdownContentTitle = exports.DEFAULT_PARSE_FRONT_MATTER = exports.createExcerpt = exports.admonitionTitleToDirectiveLabel = exports.unwrapMdxCodeBlocks = exports.getTagVisibility = exports.groupTaggedItems = exports.buildSshUrl = exports.buildHttpsUrl = exports.hasSSHProtocol = exports.serializeURLPath = exports.toURLPath = exports.parseURLOrPath = exports.parseLocalURLPath = exports.parseURLPath = exports.resolvePathname = exports.isValidPathname = exports.encodePath = exports.fileToPath = exports.getEditUrl = exports.normalizeUrl = exports.findAsyncSequential = exports.mapAsyncSequential = exports.getLocaleConfig = exports.getPluginI18nPath = exports.updateTranslationFileMessages = exports.mergeTranslations = exports.readOutputHTMLFile = exports.generate = exports.WEBPACK_URL_LOADER_LIMIT = exports.DEFAULT_PLUGIN_ID = exports.DEFAULT_PORT = exports.CODE_TRANSLATIONS_FILE_NAME = exports.DEFAULT_I18N_DIR_NAME = exports.THEME_PATH = exports.OUTPUT_STATIC_ASSETS_DIR_NAME = exports.DEFAULT_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.DOCUSAURUS_VERSION = exports.NODE_MINOR_VERSION = exports.NODE_MAJOR_VERSION = void 0;
-exports.reportInlineTags = exports.normalizeTags = exports.TEST_VCS = exports.getVcsPreset = exports.VcsPresetNames = exports.readLastUpdateData = exports.flattenRoutes = exports.isUnlisted = exports.isDraft = exports.getFolderContainingFile = exports.findFolderContainingFile = exports.getContentPathList = exports.readDataFile = exports.getDataFilePath = exports.loadFreshModule = exports.getWebpackLoaderCompilerName = exports.getFileLoaderUtils = exports.docuHash = exports.simpleHash = exports.md5Hash = exports.addTrailingPathSeparator = exports.escapePath = exports.aliasedSitePathToRelativePath = exports.aliasedSitePath = exports.toMessageRelativeFilePath = exports.posixPath = exports.shortName = exports.isNameTooLong = exports.createSlugger = void 0;
+exports.resolveMarkdownLinkPathname = exports.writeMarkdownHeadingId = exports.escapeMarkdownHeadingIds = exports.parseMarkdownHeadingId = exports.parseMarkdownFile = exports.parseMarkdownContentTitle = exports.DEFAULT_PARSE_FRONT_MATTER = exports.createExcerpt = exports.admonitionTitleToDirectiveLabel = exports.unwrapMdxCodeBlocks = exports.getTagVisibility = exports.groupTaggedItems = exports.buildSshUrl = exports.buildHttpsUrl = exports.hasSSHProtocol = exports.serializeURLPath = exports.toURLPath = exports.parseURLOrPath = exports.parseLocalURLPath = exports.parseURLPath = exports.resolvePathname = exports.isValidPathname = exports.encodePath = exports.fileToPath = exports.getEditUrl = exports.normalizeUrl = exports.findAsyncSequential = exports.mapAsyncSequential = exports.getLocaleConfig = exports.getPluginI18nPath = exports.updateTranslationFileMessages = exports.mergeTranslations = exports.readOutputHTMLFile = exports.generate = exports.ASSET_INLINE_MAX_SIZE = exports.DEFAULT_PLUGIN_ID = exports.DEFAULT_PORT = exports.CODE_TRANSLATIONS_FILE_NAME = exports.DEFAULT_I18N_DIR_NAME = exports.THEME_PATH = exports.OUTPUT_STATIC_ASSETS_DIR_NAME = exports.DEFAULT_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.DOCUSAURUS_VERSION = exports.NODE_MINOR_VERSION = exports.NODE_MAJOR_VERSION = void 0;
+exports.reportInlineTags = exports.normalizeTags = exports.TEST_VCS = exports.getVcsPreset = exports.VcsPresetNames = exports.readLastUpdateData = exports.flattenRoutes = exports.isUnlisted = exports.isDraft = exports.getFolderContainingFile = exports.findFolderContainingFile = exports.getContentPathList = exports.readDataFile = exports.getDataFilePath = exports.loadFreshModule = exports.getWebpackLoaderCompilerName = exports.createAssetRequest = exports.findAssetRule = exports.getAssetRuleUtils = exports.docuHash = exports.simpleHash = exports.md5Hash = exports.addTrailingPathSeparator = exports.escapePath = exports.aliasedSitePathToRelativePath = exports.aliasedSitePath = exports.toMessageRelativeFilePath = exports.posixPath = exports.shortName = exports.isNameTooLong = exports.createSlugger = void 0;
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "NODE_MAJOR_VERSION", { enumerable: true, get: function () { return constants_1.NODE_MAJOR_VERSION; } });
 Object.defineProperty(exports, "NODE_MINOR_VERSION", { enumerable: true, get: function () { return constants_1.NODE_MINOR_VERSION; } });
@@ -24,7 +24,7 @@ Object.defineProperty(exports, "DEFAULT_I18N_DIR_NAME", { enumerable: true, get:
 Object.defineProperty(exports, "CODE_TRANSLATIONS_FILE_NAME", { enumerable: true, get: function () { return constants_1.CODE_TRANSLATIONS_FILE_NAME; } });
 Object.defineProperty(exports, "DEFAULT_PORT", { enumerable: true, get: function () { return constants_1.DEFAULT_PORT; } });
 Object.defineProperty(exports, "DEFAULT_PLUGIN_ID", { enumerable: true, get: function () { return constants_1.DEFAULT_PLUGIN_ID; } });
-Object.defineProperty(exports, "WEBPACK_URL_LOADER_LIMIT", { enumerable: true, get: function () { return constants_1.WEBPACK_URL_LOADER_LIMIT; } });
+Object.defineProperty(exports, "ASSET_INLINE_MAX_SIZE", { enumerable: true, get: function () { return constants_1.ASSET_INLINE_MAX_SIZE; } });
 var emitUtils_1 = require("./emitUtils");
 Object.defineProperty(exports, "generate", { enumerable: true, get: function () { return emitUtils_1.generate; } });
 Object.defineProperty(exports, "readOutputHTMLFile", { enumerable: true, get: function () { return emitUtils_1.readOutputHTMLFile; } });
@@ -83,7 +83,9 @@ Object.defineProperty(exports, "md5Hash", { enumerable: true, get: function () {
 Object.defineProperty(exports, "simpleHash", { enumerable: true, get: function () { return hashUtils_1.simpleHash; } });
 Object.defineProperty(exports, "docuHash", { enumerable: true, get: function () { return hashUtils_1.docuHash; } });
 var webpackUtils_1 = require("./webpackUtils");
-Object.defineProperty(exports, "getFileLoaderUtils", { enumerable: true, get: function () { return webpackUtils_1.getFileLoaderUtils; } });
+Object.defineProperty(exports, "getAssetRuleUtils", { enumerable: true, get: function () { return webpackUtils_1.getAssetRuleUtils; } });
+Object.defineProperty(exports, "findAssetRule", { enumerable: true, get: function () { return webpackUtils_1.findAssetRule; } });
+Object.defineProperty(exports, "createAssetRequest", { enumerable: true, get: function () { return webpackUtils_1.createAssetRequest; } });
 Object.defineProperty(exports, "getWebpackLoaderCompilerName", { enumerable: true, get: function () { return webpackUtils_1.getWebpackLoaderCompilerName; } });
 var moduleUtils_1 = require("./moduleUtils");
 Object.defineProperty(exports, "loadFreshModule", { enumerable: true, get: function () { return moduleUtils_1.loadFreshModule; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/webpackUtils.d.ts

@@ -7,20 +7,37 @@
 import type { RuleSetRule, LoaderContext } from 'webpack';
 export type WebpackCompilerName = 'server' | 'client';
 export declare function getWebpackLoaderCompilerName(context: LoaderContext<unknown>): WebpackCompilerName;
-type AssetFolder = 'images' | 'files' | 'fonts' | 'medias';
-type FileLoaderUtils = {
-    loaders: {
-        file: (options: {
-            folder: AssetFolder;
-        }) => RuleSetRule;
-        url: (options: {
-            folder: AssetFolder;
-        }) => RuleSetRule;
-        inlineMarkdownImageFileLoader: string;
-        inlineMarkdownAssetImageFileLoader: string;
-        inlineMarkdownLinkFileLoader: string;
-    };
+/**
+ * How an asset request created with `createAssetRequest()` is handled:
+ * - `image`: emitted as an image file, or inlined as a data URL if small
+ * - `image-file`: always emitted as an image file, never inlined
+ * - `file`: always emitted as a file, whatever its extension
+ */
+export type AssetRequestType = 'image' | 'image-file' | 'file';
+/**
+ * Creates a request that always resolves to an asset URL string, for
+ * Docusaurus-generated code (Markdown images, links, front matter assets...).
+ *
+ * The `!` prefix disables the configured normal loaders, and the resource query
+ * selects a dedicated asset rule. This way, other plugins (ideal-image,
+ * SVGR...) do not transform those assets.
+ * See https://webpack.js.org/concepts/loaders/#inline
+ *
+ * @param assetPath the already escaped asset path to require
+ * @param search an optional user-provided query string, starting with `?`
+ */
+export declare function createAssetRequest({ assetPath, search, type, }: {
+    assetPath: string;
+    search?: string;
+    type: AssetRequestType;
+}): string;
+type AssetRuleUtils = {
     rules: {
+        /**
+         * The single rule handling all assets, made of the rules below.
+         * It is a `oneOf` rule: the first matching child rule wins.
+         */
+        assets: () => RuleSetRule;
         images: () => RuleSetRule;
         svgs: () => RuleSetRule;
         fonts: () => RuleSetRule;
@@ -29,9 +46,20 @@ type FileLoaderUtils = {
     };
 };
 /**
- * Returns unified loader configurations to be used for various file types.
+ * Returns the bundler asset module rules to be used for various file types.
  * Inspired by https://github.com/gatsbyjs/gatsby/blob/8e6e021014da310b9cc7d02e58c9b3efe938c665/packages/gatsby/src/utils/webpack-utils.ts#L447
  */
-export declare function getFileLoaderUtils(isServer: boolean): FileLoaderUtils;
+export declare function getAssetRuleUtils(isServer: boolean): AssetRuleUtils;
+/**
+ * Finds a rule in the asset `oneOf` rule, so that plugins can enhance it.
+ * The rule is found by comparing its `test` condition.
+ */
+export declare function findAssetRule({ rules, test, }: {
+    rules: RuleSetRule[];
+    test: RuleSetRule['test'];
+}): {
+    parentRules: RuleSetRule[];
+    rule: RuleSetRule;
+} | undefined;
 export {};
 //# sourceMappingURL=webpackUtils.d.ts.map

package/lib/webpackUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpackUtils.d.ts","sourceRoot":"","sources":["../src/webpackUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAExD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEtD,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAC9B,mBAAmB,CAWrB;AAED,KAAK,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE3D,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE;QACP,IAAI,EAAE,CAAC,OAAO,EAAE;YAAC,MAAM,EAAE,WAAW,CAAA;SAAC,KAAK,WAAW,CAAC;QACtD,GAAG,EAAE,CAAC,OAAO,EAAE;YAAC,MAAM,EAAE,WAAW,CAAA;SAAC,KAAK,WAAW,CAAC;QACrD,6BAA6B,EAAE,MAAM,CAAC;QACtC,kCAAkC,EAAE,MAAM,CAAC;QAC3C,4BAA4B,EAAE,MAAM,CAAC;KACtC,CAAC;IACF,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,WAAW,CAAC;QAC1B,IAAI,EAAE,MAAM,WAAW,CAAC;QACxB,KAAK,EAAE,MAAM,WAAW,CAAC;QACzB,KAAK,EAAE,MAAM,WAAW,CAAC;QACzB,WAAW,EAAE,MAAM,WAAW,CAAC;KAChC,CAAC;CACH,CAAC;AAoHF;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,GAAG,eAAe,CAErE"}
+{"version":3,"file":"webpackUtils.d.ts","sourceRoot":"","sources":["../src/webpackUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAExD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEtD,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAC9B,mBAAmB,CAWrB;AAID;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,YAAY,GAAG,MAAM,CAAC;AAI/D;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,SAAS,EACT,MAAM,EACN,IAAI,GACL,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;CACxB,GAAG,MAAM,CAGT;AAED,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE;QACL;;;WAGG;QACH,MAAM,EAAE,MAAM,WAAW,CAAC;QAC1B,MAAM,EAAE,MAAM,WAAW,CAAC;QAC1B,IAAI,EAAE,MAAM,WAAW,CAAC;QACxB,KAAK,EAAE,MAAM,WAAW,CAAC;QACzB,KAAK,EAAE,MAAM,WAAW,CAAC;QACzB,WAAW,EAAE,MAAM,WAAW,CAAC;KAChC,CAAC;CACH,CAAC;AAyFF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,GAAG,cAAc,CAEnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,IAAI,GACL,EAAE;IACD,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC3B,GAAG;IAAC,WAAW,EAAE,WAAW,EAAE,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAC,GAAG,SAAS,CAgB9D"}

package/lib/webpackUtils.js

@@ -7,10 +7,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebpackLoaderCompilerName = getWebpackLoaderCompilerName;
-exports.getFileLoaderUtils = getFileLoaderUtils;
+exports.createAssetRequest = createAssetRequest;
+exports.getAssetRuleUtils = getAssetRuleUtils;
+exports.findAssetRule = findAssetRule;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const pathUtils_1 = require("./pathUtils");
 const constants_1 = require("./constants");
 function getWebpackLoaderCompilerName(context) {
     const compilerName = context._compiler?.name;
@@ -22,90 +23,117 @@ function getWebpackLoaderCompilerName(context) {
             throw new Error(`Cannot get valid Docusaurus webpack compiler name. Found compilerName=${compilerName}`);
     }
 }
-// TODO this historical code is quite messy
-//  We should try to get rid of it and move to assets pipeline
-function createFileLoaderUtils({ isServer, }) {
-    // Files/images < urlLoaderLimit will be inlined as base64 strings directly in
-    // the html
-    const urlLoaderLimit = constants_1.WEBPACK_URL_LOADER_LIMIT;
-    const fileLoaderFileName = (folder) => node_path_1.default.posix.join(constants_1.OUTPUT_STATIC_ASSETS_DIR_NAME, folder, '[name]-[contenthash].[ext]');
-    const loaders = {
-        file: (options) => ({
-            loader: require.resolve(`file-loader`),
-            options: {
-                name: fileLoaderFileName(options.folder),
-                emitFile: !isServer,
-            },
-        }),
-        url: (options) => ({
-            loader: require.resolve('url-loader'),
-            options: {
-                limit: urlLoaderLimit,
-                name: fileLoaderFileName(options.folder),
-                fallback: require.resolve('file-loader'),
-                emitFile: !isServer,
-            },
-        }),
-        // TODO 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: `!${(0, pathUtils_1.escapePath)(require.resolve('url-loader'))}?limit=${urlLoaderLimit}&name=${fileLoaderFileName('images')}&fallback=${(0, pathUtils_1.escapePath)(require.resolve('file-loader'))}${isServer ? `&emitFile=false` : ''}!`,
-        inlineMarkdownAssetImageFileLoader: `!${(0, pathUtils_1.escapePath)(require.resolve('file-loader'))}?name=${fileLoaderFileName('images')}${isServer ? `&emitFile=false` : ''}!`,
-        inlineMarkdownLinkFileLoader: `!${(0, pathUtils_1.escapePath)(require.resolve('file-loader'))}?name=${fileLoaderFileName('files')}${isServer ? `&emitFile=false` : ''}!`,
-    };
-    const notTextImport = { type: { not: 'text' } };
+const AssetRequestQueryParam = 'docusaurus-asset';
+/**
+ * Creates a request that always resolves to an asset URL string, for
+ * Docusaurus-generated code (Markdown images, links, front matter assets...).
+ *
+ * The `!` prefix disables the configured normal loaders, and the resource query
+ * selects a dedicated asset rule. This way, other plugins (ideal-image,
+ * SVGR...) do not transform those assets.
+ * See https://webpack.js.org/concepts/loaders/#inline
+ *
+ * @param assetPath the already escaped asset path to require
+ * @param search an optional user-provided query string, starting with `?`
+ */
+function createAssetRequest({ assetPath, search, type, }) {
+    const query = `${AssetRequestQueryParam}=${type}`;
+    return `!${assetPath}${search ? `${search}&${query}` : `?${query}`}`;
+}
+function createAssetRuleUtils({ isServer }) {
+    const generator = (folder) => ({
+        filename: node_path_1.default.posix.join(constants_1.OUTPUT_STATIC_ASSETS_DIR_NAME, folder, '[name]-[contenthash][ext]'),
+        // The server compilation does not need to emit assets
+        emit: !isServer,
+    });
+    // An asset emitted as a file, or inlined as a data URL if small enough
+    const asset = (folder) => ({
+        type: 'asset',
+        parser: { dataUrlCondition: { maxSize: constants_1.ASSET_INLINE_MAX_SIZE ?? 10000 } },
+        generator: generator(folder),
+    });
+    // An asset always emitted as a file
+    const assetResource = (folder) => ({
+        type: 'asset/resource',
+        generator: generator(folder),
+    });
+    const assetRequestRule = (type, rule) => ({
+        resourceQuery: new RegExp(`[?&]${AssetRequestQueryParam}=${type}(?:&|$)`),
+        ...rule,
+    });
     const rules = {
-        /**
-         * Loads image assets, inlines images via a data URI if they are below
-         * the size threshold
-         */
+        assets: () => ({
+            with: { type: { not: 'text' } },
+            oneOf: [
+                // Requests created with createAssetRequest() come first on purpose
+                // They must not be handled by other asset rules (ideal-image, SVGR...)
+                assetRequestRule('image', asset('images')),
+                assetRequestRule('image-file', assetResource('images')),
+                assetRequestRule('file', assetResource('files')),
+                rules.images(),
+                rules.svgs(),
+                rules.fonts(),
+                rules.media(),
+                rules.otherAssets(),
+            ],
+        }),
         images: () => ({
-            use: [loaders.url({ folder: 'images' })],
-            test: /\.(?:ico|jpe?g|png|gif|webp|avif)(?:\?.*)?$/i,
-            with: notTextImport,
+            test: /\.(?:ico|jpe?g|png|gif|webp|avif)$/i,
+            ...asset('images'),
         }),
         /**
          * The SVG rule is isolated on purpose: our SVGR plugin enhances it
          * See https://github.com/facebook/docusaurus/pull/10820
          */
         svgs: () => ({
-            use: [loaders.url({ folder: 'images' })],
             test: /\.svg$/i,
-            with: notTextImport,
+            ...asset('images'),
         }),
         fonts: () => ({
-            use: [loaders.url({ folder: 'fonts' })],
             test: /\.(?:woff2?|eot|ttf|otf)$/i,
-            with: notTextImport,
+            ...asset('fonts'),
         }),
-        /**
-         * 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|avi|mov|mkv|mpg|mpeg|vob|wmv|m4v|webm|ogv|wav|mp3|m4a|aac|oga|flac)$/i,
-            with: notTextImport,
+            ...asset('medias'),
         }),
         otherAssets: () => ({
-            use: [loaders.file({ folder: 'files' })],
             test: /\.(?:pdf|docx?|xlsx?|zip|rar)$/i,
-            with: notTextImport,
+            ...assetResource('files'),
         }),
     };
-    return { loaders, rules };
+    return { rules };
 }
-const FileLoaderUtilsMap = {
-    server: createFileLoaderUtils({ isServer: true }),
-    client: createFileLoaderUtils({ isServer: false }),
+const AssetRuleUtilsMap = {
+    server: createAssetRuleUtils({ isServer: true }),
+    client: createAssetRuleUtils({ isServer: false }),
 };
 /**
- * Returns unified loader configurations to be used for various file types.
+ * Returns the bundler asset module rules to be used for various file types.
  * Inspired by https://github.com/gatsbyjs/gatsby/blob/8e6e021014da310b9cc7d02e58c9b3efe938c665/packages/gatsby/src/utils/webpack-utils.ts#L447
  */
-function getFileLoaderUtils(isServer) {
-    return isServer ? FileLoaderUtilsMap.server : FileLoaderUtilsMap.client;
+function getAssetRuleUtils(isServer) {
+    return isServer ? AssetRuleUtilsMap.server : AssetRuleUtilsMap.client;
+}
+/**
+ * Finds a rule in the asset `oneOf` rule, so that plugins can enhance it.
+ * The rule is found by comparing its `test` condition.
+ */
+function findAssetRule({ rules, test, }) {
+    for (const rule of rules) {
+        if (String(rule.test) === String(test)) {
+            return { parentRules: rules, rule };
+        }
+        if (rule.oneOf) {
+            const result = findAssetRule({
+                rules: rule.oneOf,
+                test,
+            });
+            if (result) {
+                return result;
+            }
+        }
+    }
+    return undefined;
 }
 //# sourceMappingURL=webpackUtils.js.map

package/lib/webpackUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpackUtils.js","sourceRoot":"","sources":["../src/webpackUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpackUtils.js","sourceRoot":"","sources":["../src/webpackUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils",
-  "version": "4.0.0-canary-6928",
+  "version": "4.0.0-canary-6929",
   "description": "Node utility functions for Docusaurus packages.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -15,11 +15,10 @@
   "license": "MIT",
   "dependencies": {
     "@11ty/gray-matter": "^3.0.0",
-    "@docusaurus/fs": "4.0.0-canary-6928",
-    "@docusaurus/logger": "4.0.0-canary-6928",
-    "@docusaurus/types": "4.0.0-canary-6928",
+    "@docusaurus/fs": "4.0.0-canary-6929",
+    "@docusaurus/logger": "4.0.0-canary-6929",
+    "@docusaurus/types": "4.0.0-canary-6929",
     "execa": "^10.0.1",
-    "file-loader": "^6.2.0",
     "github-slugger": "^2.0.0",
     "jiti": "^2.7.0",
     "js-yaml": "^5.4.1",
@@ -27,7 +26,6 @@
     "p-queue": "^9.3.3",
     "resolve-pathname": "^3.0.0",
     "tslib": "^2.8.1",
-    "url-loader": "^4.1.1",
     "utility-types": "^3.11.0",
     "webpack": "^5.111.0"
   },

package/src/constants.ts

@@ -91,10 +91,14 @@ export const DEFAULT_PORT = process.env.PORT
 export const DEFAULT_PLUGIN_ID = 'default';
 
 /**
- * Allow overriding the limit after which the url loader will no longer inline
- * assets.
+ * Max size in bytes under which assets (images, fonts, medias) are inlined in
+ * the bundles as base64 data URLs, instead of being emitted as separate files.
+ * Overrides the default max size when the `DOCUSAURUS_ASSET_INLINE_MAX_SIZE`
+ * env variable is set.
  *
  * @see https://github.com/facebook/docusaurus/issues/5493
  */
-export const WEBPACK_URL_LOADER_LIMIT =
-  process.env.WEBPACK_URL_LOADER_LIMIT ?? 10000;
+export const ASSET_INLINE_MAX_SIZE: number | undefined = process.env
+  .DOCUSAURUS_ASSET_INLINE_MAX_SIZE
+  ? parseInt(process.env.DOCUSAURUS_ASSET_INLINE_MAX_SIZE, 10)
+  : undefined;

package/src/index.ts

@@ -21,7 +21,7 @@ export {
   CODE_TRANSLATIONS_FILE_NAME,
   DEFAULT_PORT,
   DEFAULT_PLUGIN_ID,
-  WEBPACK_URL_LOADER_LIMIT,
+  ASSET_INLINE_MAX_SIZE,
 } from './constants';
 export {generate, readOutputHTMLFile} from './emitUtils';
 export {
@@ -93,8 +93,11 @@ export {
 } from './pathUtils';
 export {md5Hash, simpleHash, docuHash} from './hashUtils';
 export {
-  getFileLoaderUtils,
+  getAssetRuleUtils,
+  findAssetRule,
+  createAssetRequest,
   getWebpackLoaderCompilerName,
+  type AssetRequestType,
   type WebpackCompilerName,
 } from './webpackUtils';
 export {loadFreshModule} from './moduleUtils';

package/src/webpackUtils.ts

@@ -6,9 +6,8 @@
  */
 
 import path from 'node:path';
-import {escapePath} from './pathUtils';
 import {
-  WEBPACK_URL_LOADER_LIMIT,
+  ASSET_INLINE_MAX_SIZE,
   OUTPUT_STATIC_ASSETS_DIR_NAME,
 } from './constants';
 import type {RuleSetRule, LoaderContext} from 'webpack';
@@ -32,15 +31,48 @@ export function getWebpackLoaderCompilerName(
 
 type AssetFolder = 'images' | 'files' | 'fonts' | 'medias';
 
-type FileLoaderUtils = {
-  loaders: {
-    file: (options: {folder: AssetFolder}) => RuleSetRule;
-    url: (options: {folder: AssetFolder}) => RuleSetRule;
-    inlineMarkdownImageFileLoader: string;
-    inlineMarkdownAssetImageFileLoader: string;
-    inlineMarkdownLinkFileLoader: string;
-  };
+/**
+ * How an asset request created with `createAssetRequest()` is handled:
+ * - `image`: emitted as an image file, or inlined as a data URL if small
+ * - `image-file`: always emitted as an image file, never inlined
+ * - `file`: always emitted as a file, whatever its extension
+ */
+export type AssetRequestType = 'image' | 'image-file' | 'file';
+
+const AssetRequestQueryParam = 'docusaurus-asset';
+
+/**
+ * Creates a request that always resolves to an asset URL string, for
+ * Docusaurus-generated code (Markdown images, links, front matter assets...).
+ *
+ * The `!` prefix disables the configured normal loaders, and the resource query
+ * selects a dedicated asset rule. This way, other plugins (ideal-image,
+ * SVGR...) do not transform those assets.
+ * See https://webpack.js.org/concepts/loaders/#inline
+ *
+ * @param assetPath the already escaped asset path to require
+ * @param search an optional user-provided query string, starting with `?`
+ */
+export function createAssetRequest({
+  assetPath,
+  search,
+  type,
+}: {
+  assetPath: string;
+  search?: string;
+  type: AssetRequestType;
+}): string {
+  const query = `${AssetRequestQueryParam}=${type}`;
+  return `!${assetPath}${search ? `${search}&${query}` : `?${query}`}`;
+}
+
+type AssetRuleUtils = {
   rules: {
+    /**
+     * The single rule handling all assets, made of the rules below.
+     * It is a `oneOf` rule: the first matching child rule wins.
+     */
+    assets: () => RuleSetRule;
     images: () => RuleSetRule;
     svgs: () => RuleSetRule;
     fonts: () => RuleSetRule;
@@ -49,77 +81,58 @@ type FileLoaderUtils = {
   };
 };
 
-// TODO this historical code is quite messy
-//  We should try to get rid of it and move to assets pipeline
-function createFileLoaderUtils({
-  isServer,
-}: {
-  isServer: boolean;
-}): FileLoaderUtils {
-  // Files/images < urlLoaderLimit will be inlined as base64 strings directly in
-  // the html
-  const urlLoaderLimit = WEBPACK_URL_LOADER_LIMIT;
-
-  const fileLoaderFileName = (folder: AssetFolder) =>
-    path.posix.join(
+function createAssetRuleUtils({isServer}: {isServer: boolean}): AssetRuleUtils {
+  const generator = (folder: AssetFolder) => ({
+    filename: path.posix.join(
       OUTPUT_STATIC_ASSETS_DIR_NAME,
       folder,
-      '[name]-[contenthash].[ext]',
-    );
-
-  const loaders: FileLoaderUtils['loaders'] = {
-    file: (options: {folder: AssetFolder}) => ({
-      loader: require.resolve(`file-loader`),
-      options: {
-        name: fileLoaderFileName(options.folder),
-        emitFile: !isServer,
-      },
+      '[name]-[contenthash][ext]',
+    ),
+    // The server compilation does not need to emit assets
+    emit: !isServer,
+  });
+
+  // An asset emitted as a file, or inlined as a data URL if small enough
+  const asset = (folder: AssetFolder): RuleSetRule => ({
+    type: 'asset',
+    parser: {dataUrlCondition: {maxSize: ASSET_INLINE_MAX_SIZE ?? 10000}},
+    generator: generator(folder),
+  });
+
+  // An asset always emitted as a file
+  const assetResource = (folder: AssetFolder): RuleSetRule => ({
+    type: 'asset/resource',
+    generator: generator(folder),
+  });
+
+  const assetRequestRule = (
+    type: AssetRequestType,
+    rule: RuleSetRule,
+  ): RuleSetRule => ({
+    resourceQuery: new RegExp(`[?&]${AssetRequestQueryParam}=${type}(?:&|$)`),
+    ...rule,
+  });
+
+  const rules: AssetRuleUtils['rules'] = {
+    assets: () => ({
+      with: {type: {not: 'text'}},
+      oneOf: [
+        // Requests created with createAssetRequest() come first on purpose
+        // They must not be handled by other asset rules (ideal-image, SVGR...)
+        assetRequestRule('image', asset('images')),
+        assetRequestRule('image-file', assetResource('images')),
+        assetRequestRule('file', assetResource('files')),
+        rules.images(),
+        rules.svgs(),
+        rules.fonts(),
+        rules.media(),
+        rules.otherAssets(),
+      ],
     }),
-    url: (options: {folder: AssetFolder}) => ({
-      loader: require.resolve('url-loader'),
-      options: {
-        limit: urlLoaderLimit,
-        name: fileLoaderFileName(options.folder),
-        fallback: require.resolve('file-loader'),
-        emitFile: !isServer,
-      },
-    }),
-
-    // TODO 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: `!${escapePath(
-      require.resolve('url-loader'),
-    )}?limit=${urlLoaderLimit}&name=${fileLoaderFileName(
-      'images',
-    )}&fallback=${escapePath(require.resolve('file-loader'))}${
-      isServer ? `&emitFile=false` : ''
-    }!`,
-    inlineMarkdownAssetImageFileLoader: `!${escapePath(
-      require.resolve('file-loader'),
-    )}?name=${fileLoaderFileName('images')}${
-      isServer ? `&emitFile=false` : ''
-    }!`,
-    inlineMarkdownLinkFileLoader: `!${escapePath(
-      require.resolve('file-loader'),
-    )}?name=${fileLoaderFileName('files')}${
-      isServer ? `&emitFile=false` : ''
-    }!`,
-  };
-
-  const notTextImport: RuleSetRule['with'] = {type: {not: 'text'}};
 
-  const rules: FileLoaderUtils['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|jpe?g|png|gif|webp|avif)(?:\?.*)?$/i,
-      with: notTextImport,
+      test: /\.(?:ico|jpe?g|png|gif|webp|avif)$/i,
+      ...asset('images'),
     }),
 
     /**
@@ -127,46 +140,66 @@ function createFileLoaderUtils({
      * See https://github.com/facebook/docusaurus/pull/10820
      */
     svgs: () => ({
-      use: [loaders.url({folder: 'images'})],
       test: /\.svg$/i,
-      with: notTextImport,
+      ...asset('images'),
     }),
 
     fonts: () => ({
-      use: [loaders.url({folder: 'fonts'})],
       test: /\.(?:woff2?|eot|ttf|otf)$/i,
-      with: notTextImport,
+      ...asset('fonts'),
     }),
 
-    /**
-     * 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|avi|mov|mkv|mpg|mpeg|vob|wmv|m4v|webm|ogv|wav|mp3|m4a|aac|oga|flac)$/i,
-      with: notTextImport,
+      ...asset('medias'),
     }),
 
     otherAssets: () => ({
-      use: [loaders.file({folder: 'files'})],
       test: /\.(?:pdf|docx?|xlsx?|zip|rar)$/i,
-      with: notTextImport,
+      ...assetResource('files'),
     }),
   };
 
-  return {loaders, rules};
+  return {rules};
 }
 
-const FileLoaderUtilsMap = {
-  server: createFileLoaderUtils({isServer: true}),
-  client: createFileLoaderUtils({isServer: false}),
+const AssetRuleUtilsMap = {
+  server: createAssetRuleUtils({isServer: true}),
+  client: createAssetRuleUtils({isServer: false}),
 };
 
 /**
- * Returns unified loader configurations to be used for various file types.
+ * Returns the bundler asset module rules to be used for various file types.
  * Inspired by https://github.com/gatsbyjs/gatsby/blob/8e6e021014da310b9cc7d02e58c9b3efe938c665/packages/gatsby/src/utils/webpack-utils.ts#L447
  */
-export function getFileLoaderUtils(isServer: boolean): FileLoaderUtils {
-  return isServer ? FileLoaderUtilsMap.server : FileLoaderUtilsMap.client;
+export function getAssetRuleUtils(isServer: boolean): AssetRuleUtils {
+  return isServer ? AssetRuleUtilsMap.server : AssetRuleUtilsMap.client;
+}
+
+/**
+ * Finds a rule in the asset `oneOf` rule, so that plugins can enhance it.
+ * The rule is found by comparing its `test` condition.
+ */
+export function findAssetRule({
+  rules,
+  test,
+}: {
+  rules: RuleSetRule[];
+  test: RuleSetRule['test'];
+}): {parentRules: RuleSetRule[]; rule: RuleSetRule} | undefined {
+  for (const rule of rules) {
+    if (String(rule.test) === String(test)) {
+      return {parentRules: rules, rule};
+    }
+    if (rule.oneOf) {
+      const result = findAssetRule({
+        rules: rule.oneOf as RuleSetRule[],
+        test,
+      });
+      if (result) {
+        return result;
+      }
+    }
+  }
+  return undefined;
 }