@lingui/conf 5.4.1 → 5.5.0

package/dist/index.cjs

@@ -5,6 +5,7 @@ const jestValidate = require('jest-validate');
 const path = require('path');
 const fs = require('fs');
 const cosmiconfig = require('cosmiconfig');
+const jiti = require('jiti');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -283,10 +284,14 @@ function makeConfig(userConfig, opts = {}) {
   }
   config = setCldrParentLocales(config);
   config = normalizeRuntimeConfigModule(config);
-  return replaceRootDir(
+  const out = replaceRootDir(
     config,
     config.rootDir
   );
+  return {
+    ...out,
+    resolvedConfigPath: opts.resolvedConfigPath
+  };
 }
 const defaultConfig = {
   catalogs: [
@@ -378,12 +383,10 @@ function configExists(path2) {
   return path2 && fs__default.existsSync(path2);
 }
 function JitiLoader() {
-  return (filepath, content) => {
-    const opts = {
-      interopDefault: true
-    };
-    const jiti = require("jiti")(__filename, opts);
-    return jiti(filepath);
+  return (filepath) => {
+    const jiti$1 = jiti.createJiti(__filename);
+    const mod = jiti$1(filepath);
+    return mod?.default ?? mod;
   };
 }
 const moduleName = "lingui";
@@ -432,7 +435,7 @@ function getConfig({
       rootDir: result ? path__default.dirname(result.filepath) : defaultRootDir,
       ...userConfig
     },
-    { skipValidation }
+    { skipValidation, resolvedConfigPath: result.filepath }
   );
 }
 

package/dist/index.d.cts

@@ -310,6 +310,7 @@ type LinguiConfig = {
 };
 type ModuleSourceNormalized = readonly [module: string, specifier: string];
 type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
+    resolvedConfigPath?: string;
     fallbackLocales?: FallbackLocales;
     runtimeConfigModule: {
         i18n: ModuleSourceNormalized;
@@ -320,6 +321,7 @@ type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
 
 declare function makeConfig(userConfig: Partial<LinguiConfig>, opts?: {
     skipValidation?: boolean;
+    resolvedConfigPath?: string;
 }): LinguiConfigNormalized;
 
 /**

package/dist/index.d.mts

@@ -310,6 +310,7 @@ type LinguiConfig = {
 };
 type ModuleSourceNormalized = readonly [module: string, specifier: string];
 type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
+    resolvedConfigPath?: string;
     fallbackLocales?: FallbackLocales;
     runtimeConfigModule: {
         i18n: ModuleSourceNormalized;
@@ -320,6 +321,7 @@ type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
 
 declare function makeConfig(userConfig: Partial<LinguiConfig>, opts?: {
     skipValidation?: boolean;
+    resolvedConfigPath?: string;
 }): LinguiConfigNormalized;
 
 /**

package/dist/index.d.ts

@@ -310,6 +310,7 @@ type LinguiConfig = {
 };
 type ModuleSourceNormalized = readonly [module: string, specifier: string];
 type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
+    resolvedConfigPath?: string;
     fallbackLocales?: FallbackLocales;
     runtimeConfigModule: {
         i18n: ModuleSourceNormalized;
@@ -320,6 +321,7 @@ type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
 
 declare function makeConfig(userConfig: Partial<LinguiConfig>, opts?: {
     skipValidation?: boolean;
+    resolvedConfigPath?: string;
 }): LinguiConfigNormalized;
 
 /**

package/dist/index.mjs

@@ -3,6 +3,7 @@ import { validate, multipleValidOptions } from 'jest-validate';
 import path from 'path';
 import fs from 'fs';
 import { cosmiconfigSync } from 'cosmiconfig';
+import { createJiti } from 'jiti';
 
 function replaceRootDir(config, rootDir) {
   return function replaceDeep(value, rootDir2) {
@@ -275,10 +276,14 @@ function makeConfig(userConfig, opts = {}) {
   }
   config = setCldrParentLocales(config);
   config = normalizeRuntimeConfigModule(config);
-  return replaceRootDir(
+  const out = replaceRootDir(
     config,
     config.rootDir
   );
+  return {
+    ...out,
+    resolvedConfigPath: opts.resolvedConfigPath
+  };
 }
 const defaultConfig = {
   catalogs: [
@@ -370,12 +375,10 @@ function configExists(path2) {
   return path2 && fs.existsSync(path2);
 }
 function JitiLoader() {
-  return (filepath, content) => {
-    const opts = {
-      interopDefault: true
-    };
-    const jiti = require("jiti")(__filename, opts);
-    return jiti(filepath);
+  return (filepath) => {
+    const jiti = createJiti(__filename);
+    const mod = jiti(filepath);
+    return mod?.default ?? mod;
   };
 }
 const moduleName = "lingui";
@@ -424,7 +427,7 @@ function getConfig({
       rootDir: result ? path.dirname(result.filepath) : defaultRootDir,
       ...userConfig
     },
-    { skipValidation }
+    { skipValidation, resolvedConfigPath: result.filepath }
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/conf",
-  "version": "5.4.1",
+  "version": "5.5.0",
   "sideEffects": false,
   "description": "Get lingui configuration from package.json",
   "keywords": [
@@ -33,7 +33,7 @@
     "@babel/runtime": "^7.20.13",
     "cosmiconfig": "^8.0.0",
     "jest-validate": "^29.4.3",
-    "jiti": "^1.17.1",
+    "jiti": "^2.5.1",
     "picocolors": "^1.1.1"
   },
   "files": [
@@ -45,5 +45,5 @@
     "@lingui/jest-mocks": "*",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "296f115904bae526cd4b4807bbdc373b2e50822b"
+  "gitHead": "26700f071cd540651822b7f786d3c1d07c9d8625"
 }