@mercurjs/dashboard-sdk 2.3.4-canary.7 → 2.3.4-canary.8

package/dist/vite.cjs

@@ -620,14 +620,46 @@ function findI18nIndex(srcDir) {
   }
   return null;
 }
-function generateI18n({ srcDir }) {
+function generateI18n({ srcDir, pluginExtensions }) {
   const indexFile = findI18nIndex(srcDir);
-  if (!indexFile) {
-    return `export default {}`;
+  const imports = [
+    ...indexFile ? [`import appI18n from "${normalizePath(indexFile)}"`] : [],
+    ...pluginExtensions.map(
+      (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
+    )
+  ];
+  const sources = [
+    ...pluginExtensions.map((_, i) => `(__plugin${i}.i18nModule ?? {})`),
+    ...indexFile ? ["appI18n"] : []
+  ];
+  return `${imports.join("\n")}
+
+function deepMerge(target, source) {
+  const result = { ...target }
+  for (const key of Object.keys(source)) {
+    const a = target[key]
+    const b = source[key]
+    result[key] =
+      a && b && typeof a === "object" && typeof b === "object" && !Array.isArray(a) && !Array.isArray(b)
+        ? deepMerge(a, b)
+        : b
   }
-  const importPath = normalizePath(indexFile);
-  return `import i18nResources from "${importPath}"
-export default i18nResources`;
+  return result
+}
+
+function mergeResources(target, source) {
+  const result = { ...target }
+  for (const lng of Object.keys(source)) {
+    result[lng] = { ...(result[lng] ?? {}) }
+    for (const ns of Object.keys(source[lng])) {
+      result[lng][ns] = deepMerge(result[lng][ns] ?? {}, source[lng][ns])
+    }
+  }
+  return result
+}
+
+export default [${sources.join(", ")}].reduce(mergeResources, {})
+`;
 }
 
 // src/widgets.ts

package/dist/vite.js

@@ -600,14 +600,46 @@ function findI18nIndex(srcDir) {
   }
   return null;
 }
-function generateI18n({ srcDir }) {
+function generateI18n({ srcDir, pluginExtensions }) {
   const indexFile = findI18nIndex(srcDir);
-  if (!indexFile) {
-    return `export default {}`;
+  const imports = [
+    ...indexFile ? [`import appI18n from "${normalizePath(indexFile)}"`] : [],
+    ...pluginExtensions.map(
+      (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
+    )
+  ];
+  const sources = [
+    ...pluginExtensions.map((_, i) => `(__plugin${i}.i18nModule ?? {})`),
+    ...indexFile ? ["appI18n"] : []
+  ];
+  return `${imports.join("\n")}
+
+function deepMerge(target, source) {
+  const result = { ...target }
+  for (const key of Object.keys(source)) {
+    const a = target[key]
+    const b = source[key]
+    result[key] =
+      a && b && typeof a === "object" && typeof b === "object" && !Array.isArray(a) && !Array.isArray(b)
+        ? deepMerge(a, b)
+        : b
   }
-  const importPath = normalizePath(indexFile);
-  return `import i18nResources from "${importPath}"
-export default i18nResources`;
+  return result
+}
+
+function mergeResources(target, source) {
+  const result = { ...target }
+  for (const lng of Object.keys(source)) {
+    result[lng] = { ...(result[lng] ?? {}) }
+    for (const ns of Object.keys(source[lng])) {
+      result[lng][ns] = deepMerge(result[lng][ns] ?? {}, source[lng][ns])
+    }
+  }
+  return result
+}
+
+export default [${sources.join(", ")}].reduce(mergeResources, {})
+`;
 }
 
 // src/widgets.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/dashboard-sdk",
-  "version": "2.3.4-canary.7",
+  "version": "2.3.4-canary.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",