@docusaurus/utils 3.10.1-canary-6615 → 3.10.1-canary-6616

package/lib/moduleUtils.d.ts

@@ -4,5 +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 declare function loadFreshModule(modulePath: string): Promise<unknown>;
+export declare function loadFreshModule(modulePath: string, options?: {
+    default?: true;
+}): Promise<unknown>;
 //# sourceMappingURL=moduleUtils.d.ts.map

package/lib/moduleUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moduleUtils.d.ts","sourceRoot":"","sources":["../src/moduleUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B1E"}
+{"version":3,"file":"moduleUtils.d.ts","sourceRoot":"","sources":["../src/moduleUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoBH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,GACA,OAAO,CAAC,OAAO,CAAC,CA+BlB"}

package/lib/moduleUtils.js

@@ -8,29 +8,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadFreshModule = loadFreshModule;
 const tslib_1 = require("tslib");
-const jiti_1 = tslib_1.__importDefault(require("jiti"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const jiti_1 = require("jiti");
+const DEBUG = false;
+const jiti = (0, jiti_1.createJiti)(__filename, {
+    // Transpilation cache, can be safely enabled
+    fsCache: true,
+    // Bypass Node.js runtime require cache for hot reloads
+    moduleCache: false,
+    interopDefault: true,
+    debug: DEBUG,
+});
 /*
 jiti is able to load ESM, CJS, JSON, TS modules
  */
-async function loadFreshModule(modulePath) {
+async function loadFreshModule(modulePath, options) {
     if (typeof modulePath !== 'string') {
         throw new Error(logger_1.default.interpolate `Invalid module path of type "name=${typeof modulePath}" with value "name=${modulePath}"`);
     }
     try {
-        const load = (0, jiti_1.default)(__filename, {
-            // Transpilation cache, can be safely enabled
-            cache: true,
-            // Bypass Node.js runtime require cache
-            // Same as "import-fresh" package we used previously
-            requireCache: false,
-            // Only take into consideration the default export
-            // For now we don't need named exports
-            // This also helps normalize return value for both CJS/ESM/TS modules
-            interopDefault: true,
-            // debug: true,
+        const module = await jiti.import(modulePath, {
+            default: options?.default,
         });
-        return load(modulePath);
+        if (DEBUG) {
+            console.log('Jiti module loaded', {
+                modulePath,
+                options,
+                type: typeof module,
+                keys: module && typeof module === 'object'
+                    ? Object.keys(module)
+                    : undefined,
+                module,
+            });
+        }
+        return module;
     }
     catch (error) {
         throw new Error(logger_1.default.interpolate `Docusaurus could not load module at path path=${modulePath}`, { cause: error });

package/lib/moduleUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"moduleUtils.js","sourceRoot":"","sources":["../src/moduleUtils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAQH,0CA2BC;;AAjCD,wDAAwB;AACxB,wEAAwC;AAExC;;GAEG;AACI,KAAK,UAAU,eAAe,CAAC,UAAkB;IACtD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,gBAAM,CAAC,WAAW,CAAA,qCAAqC,OAAO,UAAU,sBAAsB,UAAU,GAAG,CAC5G,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,cAAI,EAAC,UAAU,EAAE;YAC5B,6CAA6C;YAC7C,KAAK,EAAE,IAAI;YACX,uCAAuC;YACvC,oDAAoD;YACpD,YAAY,EAAE,KAAK;YACnB,kDAAkD;YAClD,sCAAsC;YACtC,qEAAqE;YACrE,cAAc,EAAE,IAAI;YACpB,eAAe;SAChB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,gBAAM,CAAC,WAAW,CAAA,iDAAiD,UAAU,EAAE,EAC/E,EAAC,KAAK,EAAE,KAAK,EAAC,CACf,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"moduleUtils.js","sourceRoot":"","sources":["../src/moduleUtils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAoBH,0CAoCC;;AAtDD,wEAAwC;AACxC,+BAAgC;AAEhC,MAAM,KAAK,GAAG,KAAK,CAAC;AAEpB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,UAAU,EAAE;IAClC,6CAA6C;IAC7C,OAAO,EAAE,IAAI;IACb,uDAAuD;IACvD,WAAW,EAAE,KAAK;IAElB,cAAc,EAAE,IAAI;IACpB,KAAK,EAAE,KAAK;CACb,CAAC,CAAC;AAEH;;GAEG;AACI,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,OAEC;IAED,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,gBAAM,CAAC,WAAW,CAAA,qCAAqC,OAAO,UAAU,sBAAsB,UAAU,GAAG,CAC5G,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YAC3C,OAAO,EAAE,OAAO,EAAE,OAAO;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBAChC,UAAU;gBACV,OAAO;gBACP,IAAI,EAAE,OAAO,MAAM;gBACnB,IAAI,EACF,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;oBAClC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;oBACrB,CAAC,CAAC,SAAS;gBACf,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,gBAAM,CAAC,WAAW,CAAA,iDAAiD,UAAU,EAAE,EAC/E,EAAC,KAAK,EAAE,KAAK,EAAC,CACf,CAAC;IACJ,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils",
-  "version": "3.10.1-canary-6615",
+  "version": "3.10.1-canary-6616",
   "description": "Node utility functions for Docusaurus packages.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "3.10.1-canary-6615",
-    "@docusaurus/types": "3.10.1-canary-6615",
-    "@docusaurus/utils-common": "3.10.1-canary-6615",
+    "@docusaurus/logger": "3.10.1-canary-6616",
+    "@docusaurus/types": "3.10.1-canary-6616",
+    "@docusaurus/utils-common": "3.10.1-canary-6616",
     "escape-string-regexp": "^4.0.0",
     "execa": "^5.1.1",
     "file-loader": "^6.2.0",
@@ -28,7 +28,7 @@
     "github-slugger": "^1.5.0",
     "globby": "^11.1.0",
     "gray-matter": "^4.0.3",
-    "jiti": "^1.20.0",
+    "jiti": "^2.7.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "micromatch": "^4.0.5",
@@ -51,5 +51,5 @@
     "dedent": "^0.7.0",
     "tmp-promise": "^3.0.3"
   },
-  "gitHead": "166a09a60f6faa1bb8f16ef456d1e5de2788d98d"
+  "gitHead": "dbee2f840c422aa17fa8dd47665cbe3a8a04f788"
 }

package/src/moduleUtils.ts

@@ -5,33 +5,54 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import jiti from 'jiti';
 import logger from '@docusaurus/logger';
+import {createJiti} from 'jiti';
+
+const DEBUG = false;
+
+const jiti = createJiti(__filename, {
+  // Transpilation cache, can be safely enabled
+  fsCache: true,
+  // Bypass Node.js runtime require cache for hot reloads
+  moduleCache: false,
+
+  interopDefault: true,
+  debug: DEBUG,
+});
 
 /*
 jiti is able to load ESM, CJS, JSON, TS modules
  */
-export async function loadFreshModule(modulePath: string): Promise<unknown> {
+export async function loadFreshModule(
+  modulePath: string,
+  options?: {
+    default?: true; // Use this when only the default export matters
+  },
+): Promise<unknown> {
   if (typeof modulePath !== 'string') {
     throw new Error(
       logger.interpolate`Invalid module path of type "name=${typeof modulePath}" with value "name=${modulePath}"`,
     );
   }
   try {
-    const load = jiti(__filename, {
-      // Transpilation cache, can be safely enabled
-      cache: true,
-      // Bypass Node.js runtime require cache
-      // Same as "import-fresh" package we used previously
-      requireCache: false,
-      // Only take into consideration the default export
-      // For now we don't need named exports
-      // This also helps normalize return value for both CJS/ESM/TS modules
-      interopDefault: true,
-      // debug: true,
+    const module = await jiti.import(modulePath, {
+      default: options?.default,
     });
 
-    return load(modulePath);
+    if (DEBUG) {
+      console.log('Jiti module loaded', {
+        modulePath,
+        options,
+        type: typeof module,
+        keys:
+          module && typeof module === 'object'
+            ? Object.keys(module)
+            : undefined,
+        module,
+      });
+    }
+
+    return module;
   } catch (error) {
     throw new Error(
       logger.interpolate`Docusaurus could not load module at path path=${modulePath}`,