npm - nuxt-i18n-micro - Versions diffs - 4.0.1 → 4.1.1 - Mend

nuxt-i18n-micro 4.0.1 → 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

package/dist/client/200.html +1 -1
package/dist/client/404.html +1 -1
package/dist/client/_nuxt/builds/latest.json +1 -1
package/dist/client/_nuxt/builds/meta/4cf3c3ff-2c34-458a-8031-474a528c7231.json +1 -0
package/dist/client/index.html +1 -1
package/dist/module.d.mts +4 -2
package/dist/module.json +1 -1
package/dist/module.mjs +90 -50
package/dist/runtime/composables/useI18nLocale.js +1 -1
package/dist/runtime/plugins/01.plugin.d.ts +11 -11
package/dist/runtime/plugins/01.plugin.js +4 -2
package/dist/runtime/plugins/06.redirect.js +4 -3
package/dist/runtime/server/internal/dev-live-translations.js +4 -1
package/dist/runtime/server/internal/translation-watcher.d.ts +2 -0
package/dist/runtime/server/internal/translation-watcher.js +5 -9
package/dist/runtime/server/utils/server-loader.js +5 -2
package/dist/runtime/server/utils/translation-server-middleware.d.ts +7 -2
package/dist/runtime/server/utils/translation-server-middleware.js +36 -3
package/dist/runtime/server/utils/warn-once.d.ts +1 -0
package/dist/runtime/server/utils/warn-once.js +6 -0
package/dist/runtime/utils/formatter.d.ts +9 -0
package/dist/runtime/utils/formatter.js +7 -0
package/dist/runtime/utils/hooks.d.ts +8 -0
package/dist/runtime/utils/hooks.js +10 -0
package/dist/runtime/utils/i18n-api.d.ts +10 -7
package/dist/runtime/utils/i18n-api.js +13 -4
package/dist/runtime/utils/i18n-config.js +21 -4
package/dist/runtime/utils/i18n-navigation.js +30 -9
package/dist/runtime/utils/nuxt-i18n.d.ts +3 -9
package/dist/runtime/utils/nuxt-i18n.js +0 -7
package/dist/types.d.mts +1 -1
package/internals.d.mts +6 -0
package/package.json +6 -6
package/dist/client/_nuxt/builds/meta/356b87e3-45dd-4f80-a40a-b649665c1844.json +0 -1

package/dist/client/200.html CHANGED Viewed

	@@ -1 +1 @@
1	- <!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><script type="importmap">{"imports":{"#entry":"/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"}}</script><link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.PSWtHhay.css" crossorigin><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BVna_KKx.js"><script type="module" src="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js" crossorigin></script><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-404.xs3fxhVJ.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CmvObVGq.js"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CPz_jhsD.js"><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-500.C2S-4iLg.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bw81RhAv.js"></head><body><div id="__nuxt"></div><div id="teleports"></div><script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"~~356b87e3~~-~~45dd~~-~~4f80~~-~~a40a~~-~~b649665c1844~~",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},~~1793785774795~~,false]</script></body></html>
1	+ <!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><script type="importmap">{"imports":{"#entry":"/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"}}</script><link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.PSWtHhay.css" crossorigin><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BVna_KKx.js"><script type="module" src="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js" crossorigin></script><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-404.xs3fxhVJ.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CmvObVGq.js"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CPz_jhsD.js"><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-500.C2S-4iLg.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bw81RhAv.js"></head><body><div id="__nuxt"></div><div id="teleports"></div><script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"4cf3c3ff-2c34-458a-8031-474a528c7231",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1794130971663,false]</script></body></html>

package/dist/client/404.html CHANGED Viewed

	@@ -1 +1 @@
1	- <!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><script type="importmap">{"imports":{"#entry":"/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"}}</script><link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.PSWtHhay.css" crossorigin><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BVna_KKx.js"><script type="module" src="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js" crossorigin></script><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-404.xs3fxhVJ.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CmvObVGq.js"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CPz_jhsD.js"><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-500.C2S-4iLg.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bw81RhAv.js"></head><body><div id="__nuxt"></div><div id="teleports"></div><script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"~~356b87e3~~-~~45dd~~-~~4f80~~-~~a40a~~-~~b649665c1844~~",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},~~1793785774795~~,false]</script></body></html>
1	+ <!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><script type="importmap">{"imports":{"#entry":"/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"}}</script><link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.PSWtHhay.css" crossorigin><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BVna_KKx.js"><script type="module" src="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js" crossorigin></script><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-404.xs3fxhVJ.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CmvObVGq.js"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CPz_jhsD.js"><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-500.C2S-4iLg.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bw81RhAv.js"></head><body><div id="__nuxt"></div><div id="teleports"></div><script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"4cf3c3ff-2c34-458a-8031-474a528c7231",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1794130971664,false]</script></body></html>

package/dist/client/_nuxt/builds/latest.json CHANGED Viewed

	@@ -1 +1 @@
1	- {"id":"~~356b87e3~~-~~45dd~~-~~4f80~~-~~a40a~~-~~b649665c1844~~","timestamp":~~1793785771623~~}
1	+ {"id":"4cf3c3ff-2c34-458a-8031-474a528c7231","timestamp":1794130968604}

package/dist/client/_nuxt/builds/meta/4cf3c3ff-2c34-458a-8031-474a528c7231.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"id":"4cf3c3ff-2c34-458a-8031-474a528c7231","timestamp":1794130968604,"prerendered":[]}

package/dist/client/index.html CHANGED Viewed

	@@ -1 +1 @@
1	- <!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><script type="importmap">{"imports":{"#entry":"/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"}}</script><link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.PSWtHhay.css" crossorigin><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BVna_KKx.js"><script type="module" src="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js" crossorigin></script><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-404.xs3fxhVJ.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CmvObVGq.js"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CPz_jhsD.js"><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-500.C2S-4iLg.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bw81RhAv.js"></head><body><div id="__nuxt"></div><div id="teleports"></div><script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"~~356b87e3~~-~~45dd~~-~~4f80~~-~~a40a~~-~~b649665c1844~~",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},~~1793785774795~~,false]</script></body></html>
1	+ <!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><script type="importmap">{"imports":{"#entry":"/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"}}</script><link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.PSWtHhay.css" crossorigin><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js"><link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BVna_KKx.js"><script type="module" src="/__nuxt-i18n-micro/_nuxt/DKUOBR6F.js" crossorigin></script><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-404.xs3fxhVJ.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CmvObVGq.js"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CPz_jhsD.js"><link rel="prefetch" as="style" crossorigin href="/__nuxt-i18n-micro/_nuxt/error-500.C2S-4iLg.css"><link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bw81RhAv.js"></head><body><div id="__nuxt"></div><div id="teleports"></div><script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"4cf3c3ff-2c34-458a-8031-474a528c7231",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1794130971665,false]</script></body></html>

package/dist/module.d.mts CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import { HookResult } from '@nuxt/schema';
-import { ModuleOptions } from '@i18n-micro/types';
-export { Getter, GlobalLocaleRoutes, Locale, LocaleCode, ModuleOptions, PluralFunc, Strategies } from '@i18n-micro/types';
+import { I18nBeforeLocaleSwitchContext, ModuleOptions } from '@i18n-micro/types';
+export { Getter, GlobalLocaleRoutes, I18nBeforeLocaleSwitchContext, Locale, LocaleCode, ModuleOptions, PluralFunc, Strategies } from '@i18n-micro/types';
 import { PluginsInjections } from '../dist/runtime/plugins/01.plugin.js';
 export { PluginsInjections } from '../dist/runtime/plugins/01.plugin.js';
@@ -16,6 +16,8 @@ declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, fa
  */
 interface ModuleRuntimeHooks {
     'i18n:register': (registerModule: (translations: unknown, locale?: string) => void, locale: string) => HookResult;
+    /** Before the page switches to another locale: set `ctx.to` to switch to another one, `ctx.cancel = true` to stay. */
+    'i18n:beforeLocaleSwitch': (ctx: I18nBeforeLocaleSwitchContext) => HookResult;
 }
 declare module '#app' {
     interface RuntimeNuxtHooks extends ModuleRuntimeHooks {

package/dist/module.json CHANGED Viewed

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.18.0"
   },
-  "version": "4.0.1",
+  "version": "4.1.1",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs CHANGED Viewed

@@ -1,22 +1,22 @@
 import * as fs from 'node:fs';
 import fs__default, { existsSync, mkdirSync, writeFileSync, readdirSync, statSync, readFileSync } from 'node:fs';
-import path, { join, dirname, relative, basename, resolve } from 'node:path';
+import path, { resolve, dirname, join, relative, basename, isAbsolute } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { defaultPlural, isNoPrefixStrategy } from '@i18n-micro/core';
 import { forwardSlashes, trimLeadingSlashes, isInternalPath } from '@i18n-micro/utils/app-path';
-import { readTranslationFile, resolveLiveTranslationDirs, translationRelativePath } from '../dist/runtime/server/internal/translation-watcher.js';
+import { readTranslationFile, translationRelativePath, resolveLiveTranslationDirs } from '../dist/runtime/server/internal/translation-watcher.js';
 import { isLocaleAllowedForUnlocalizedRoute, normalizePath, routeKey, nameOfPath, RouteGenerator, localesOutsideMatcher, pageNames } from '@i18n-micro/route-strategy';
 import { configForHost } from '@i18n-micro/utils/domains';
 import { createHash } from 'node:crypto';
 import { globby } from 'globby';
 import { deepMergeTranslationsRecursive } from '@i18n-micro/utils/deep-merge';
+import { additionalTranslationRoots, isInsideDir, resolveTranslationFile } from '@i18n-micro/utils/load-dir';
 import { PREMERGED_ROOT_PAGE, mergeSourceTranslations, PREMERGED_ROOT_MARK, mergeOverRoot, buildFallbackLocaleChain } from '@i18n-micro/utils/merge-source';
 import { gzipSync, brotliCompressSync, constants } from 'node:zlib';
 import { resolveTranslationPayloadCachePolicy } from '@i18n-micro/utils/payload-url';
 import { useNuxt, addDevServerHandler, defineNuxtModule, useLogger, createResolver, addImportsDir, addPlugin, addRouteMiddleware, addPluginTemplate, addServerImports, addServerHandler, addComponentsDir, addVitePlugin, addTemplate, addTypeTemplate, resolvePath, addPrerenderRoutes } from '@nuxt/kit';
 import sirv from 'sirv';
 import { startSubprocess, addCustomTab, onDevToolsInitialized, extendServerRpc } from '@nuxt/devtools-kit';
-import { isInsideDir, resolveTranslationFile } from '@i18n-micro/utils/load-dir';
 import { fromNodeMiddleware, defineEventHandler, proxyRequest } from 'h3';
 import { joinURL } from 'ufo';
 import { DomainPathStrategy, createPathStrategy } from '@i18n-micro/path-strategy';
@@ -61,24 +61,14 @@ ${read}`;
 function mergeAdditionalRootLocaleFiles(rootDirs, additionalDirNames, locale, primaryContent = {}) {
   if (!additionalDirNames.length) return primaryContent;
   let content = {};
-  for (const dirName of additionalDirNames) {
-    for (const rootDir of rootDirs) {
-      content = deepMergeTranslationsRecursive(content, readTranslationFile(join(rootDir, dirName, `${locale}.json`)));
-    }
-  }
+  for (const dir of additionalTranslationRoots(rootDirs, additionalDirNames))
+    content = deepMergeTranslationsRecursive(content, readTranslationFile(join(dir, `${locale}.json`)));
   return deepMergeTranslationsRecursive(content, primaryContent);
 }
 function listAdditionalRootLocales(rootDirs, additionalDirNames) {
   const locales = /* @__PURE__ */ new Set();
-  for (const dirName of additionalDirNames) {
-    for (const rootDir of rootDirs) {
-      const dir = join(rootDir, dirName);
-      if (!existsSync(dir)) continue;
-      for (const name of readdirSync(dir)) {
-        if (!name.endsWith(".json")) continue;
-        locales.add(name.slice(0, -".json".length));
-      }
-    }
+  for (const dir of additionalTranslationRoots(rootDirs, additionalDirNames).filter((path) => existsSync(path))) {
+    for (const name of readdirSync(dir)) if (name.endsWith(".json")) locales.add(name.slice(0, -".json".length));
   }
   return [...locales];
 }
@@ -130,7 +120,7 @@ async function namingDeepFile(rootDirs, dirNames, step) {
     await step();
   } catch (error) {
     if (!(error instanceof RangeError) || !error.message.includes("call stack")) throw error;
-    const dirs = rootDirs.flatMap((root) => dirNames.map((name) => join(root, name))).filter((dir) => existsSync(dir));
+    const dirs = rootDirs.flatMap((root) => dirNames.map((name) => resolve(root, name))).filter((dir) => existsSync(dir));
     const files = (await Promise.all(dirs.map((cwd) => globby("**/*.json", { cwd, absolute: true })))).flat();
     const [deepest] = files.map((file) => ({ file, depth: depthOf(readTranslationFile(file)) })).sort((a, b) => b.depth - a.depth);
     if (!deepest) throw error;
@@ -142,7 +132,13 @@ async function preMergeLocales(options) {
 }
 async function writeChunks(options) {
   const { rootDirs, translationDirName, outputDir, locales, globalFallbackLocale, disablePageLocales, additionalTranslationDirs } = options;
-  const { routeNames = [], rootDelta = false } = options;
+  const { routeNames = [], rootDelta = false, linkedMessages = false } = options;
+  const warned = /* @__PURE__ */ new Set();
+  const warn = (message) => {
+    if (warned.has(message)) return;
+    warned.add(message);
+    options.warn?.(message);
+  };
   const merged = await mergedFiles(rootDirs, translationDirName, outputDir, additionalTranslationDirs);
   const pages = /* @__PURE__ */ new Set([...[...merged.keys()].filter((f) => f.startsWith("pages/")).map((f) => dirname(f).slice("pages/".length)), ...routeNames]);
   const targets = disablePageLocales || pages.size === 0 ? ["index"] : [...pages, ...pages.has("index") ? [] : ["index"]];
@@ -152,7 +148,10 @@ async function writeChunks(options) {
     locales,
     globalFallbackLocale,
     disablePageLocales,
-    readLocaleFile: (relativePath) => merged.get(relativePath) ?? {}
+    readLocaleFile: (relativePath) => merged.get(relativePath) ?? {},
+    // the root and every page resolved alike: a delta is taken between the resolved trees
+    linkedMessages,
+    warn
   });
   const write = (page, locale, data) => {
     const targetPath = join(outputDir, page, locale, "data.json");
@@ -184,6 +183,13 @@ async function buildTranslationSourceLayers(rootDirs, translationDirName, output
   });
 }
+function resolvePayloadHostSources(options, env = process.env) {
+  return {
+    apiBaseClientHost: env.NUXT_I18N_APP_BASE_CLIENT_HOST || options.apiBaseClientHost || void 0,
+    apiBaseServerHost: env.NUXT_I18N_APP_BASE_SERVER_HOST || options.apiBaseServerHost || void 0,
+    apiBaseUrl: env.NUXT_I18N_APP_BASE_URL || options.apiBaseUrl || "_locales"
+  };
+}
 const DEFAULT_TRANSLATION_PAYLOAD_WARN_FILE_COUNT = 500;
 const DEFAULT_TRANSLATION_PAYLOAD_WARN_SIZE_BYTES = 10 * 1024 * 1024;
 function resolveTranslationPayloadOptions(options) {
@@ -275,6 +281,10 @@ function getTranslationPayloadSizeWarning(stats, thresholds) {
   return `Generated translation payloads are large (${stats.fileCount} files, ${formatBytes(stats.totalBytes)}). Consider translationPayloads.mode: 'source' for public output, hosting payloads externally, or disabling unused public/prerender outputs.`;
 }
+function localesByLayerPriority(layers, merged = []) {
+  return [...layers.flatMap((layer) => layer.config.i18n?.locales ?? []), ...merged];
+}
 function collectJsonFiles(dir) {
   return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
     const fullPath = join(dir, entry.name);
@@ -342,12 +352,14 @@ function hashTranslationSources(rootDirs, translationDirName, additionalTranslat
     }
     hashFiles(dir, files);
   };
+  const relativeExtras = additionalTranslationDirs.filter((extra) => !isAbsolute(extra));
   for (const rootDir of rootDirs) {
     hashDir(join(rootDir, translationDirName));
-    for (const extra of additionalTranslationDirs) {
+    for (const extra of relativeExtras) {
       hashAdditionalRootLocales(join(rootDir, extra));
     }
   }
+  for (const extra of new Set(additionalTranslationDirs.filter((dir) => isAbsolute(dir)))) hashAdditionalRootLocales(extra);
   return seen > 0 ? hash.digest("hex").slice(0, 16) : null;
 }
 const NITRO_MIN_COMPRESS_BYTES = 1024;
@@ -451,7 +463,8 @@ function setupDevToolsUI(options, rootDirs) {
         const extraDir = file.startsWith("additional:") ? (options.additionalTranslationDirs ?? []).find((dir) => file.startsWith(`additional:${dir}/`)) : void 0;
         if (file.startsWith("additional:") && !extraDir) throw new Error(`Not a configured additional translation directory: ${file}`);
         const relativeFile = extraDir ? file.slice(`additional:${extraDir}/`.length) : file;
-        const target = [...rootDirs].reverse().map((rootDir) => resolveTranslationFile(path.join(rootDir, extraDir ?? (options.translationDir || "locales")), relativeFile)).find((candidate) => candidate !== null);
+        const dirs = extraDir ? additionalTranslationRoots(rootDirs, [extraDir]) : rootDirs.map((rootDir) => path.join(rootDir, options.translationDir || "locales"));
+        const target = dirs.reverse().map((dir) => resolveTranslationFile(dir, relativeFile)).find((candidate) => candidate !== null);
         if (!target) throw new Error(`File not found in the translation directories: ${file}`);
         fs.writeFileSync(target, JSON.stringify(content, null, 2), "utf-8");
       },
@@ -484,14 +497,12 @@ function setupDevToolsUI(options, rootDirs) {
           const pagesDir = path.join(localesDir, "pages");
           processDirectory(localesDir, localesDir);
           processDirectory(pagesDir, localesDir);
-          for (const extra of options.additionalTranslationDirs ?? []) {
-            const extraDir = path.join(rootDir, extra);
-            if (!fs.existsSync(extraDir)) continue;
+        }
+        for (const extra of options.additionalTranslationDirs ?? []) {
+          for (const extraDir of additionalTranslationRoots(rootDirs, [extra]).filter((dir) => fs.existsSync(dir))) {
             for (const name of fs.readdirSync(extraDir)) {
-              if (!name.endsWith(".json")) continue;
               const filePath = path.join(extraDir, name);
-              if (!fs.statSync(filePath).isFile()) continue;
-              readFile(`additional:${extra}/${name}`, filePath);
+              if (name.endsWith(".json") && fs.statSync(filePath).isFile()) readFile(`additional:${extra}/${name}`, filePath);
             }
           }
         }
@@ -499,8 +510,10 @@ function setupDevToolsUI(options, rootDirs) {
       }
     };
     const rpc = extendServerRpc(DEVTOOLS_RPC_NAMESPACE, functions);
-    const directories = [options.translationDir || "locales", ...options.additionalTranslationDirs ?? []];
-    const roots = rootDirs.flatMap((root) => directories.map((dir) => resolve(root, dir)));
+    const roots = [
+      ...rootDirs.map((root) => resolve(root, options.translationDir || "locales")),
+      ...additionalTranslationRoots(rootDirs, options.additionalTranslationDirs)
+    ];
     let timer;
     nuxt.hook("builder:watch", (_event, watched) => {
       const file = resolve(nuxt.options.srcDir, watched);
@@ -881,6 +894,8 @@ function extractDefineI18nRouteData(content, filePath) {
       warnUnextractable(filePath, result.error);
       return null;
     }
+    if (result.config === false) return false;
+    if (!result.config || typeof result.config !== "object") return null;
     return normalizeDefineConfig(result.config);
   } catch {
     return null;
@@ -919,6 +934,10 @@ function mergeDefineI18nRouteMeta(entries, config) {
   const routeDisableMeta = { ...config.routeDisableMeta };
   const fromPages = {};
   for (const { routePath, config: page } of entries) {
+    if (page === false) {
+      fromPages[routePath] = false;
+      continue;
+    }
     if (Array.isArray(page.locales)) routeLocales[routePath] = page.locales;
     else if (page.locales) routeLocales[routePath] = Object.keys(page.locales);
     if (page.localeRoutes) fromPages[routePath] = page.localeRoutes;
@@ -936,7 +955,7 @@ function collectDefineI18nRouteMetaFromFiles(pageFiles, rootDirs) {
     if (!rootDir) continue;
     try {
       const config = extractDefineI18nRouteData(readFileSync(pageFile, "utf-8"), pageFile);
-      if (!config) continue;
+      if (config === null) continue;
       entries.push({
         routePath: pageFilePathToRoutePath(pageFile, rootDir),
         config
@@ -967,12 +986,13 @@ declare module '#app' {
 export {}`;
 }
+const REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 const DEFAULT_CANONICAL_QUERY_WHITELIST = ["page", "sort", "filter", "search", "q", "query", "tag"];
 function isLiveDictionary(options, mode, serverHost) {
   return mode === "source" || Boolean(options.cacheTtl) || Boolean(serverHost);
 }
 function buildFullConfig(params) {
-  const { options, nuxt, defaultLocale, apiConfig, translationPayloadMode, locales, translationsHash, publicPayloads, rootDelta } = params;
+  const { options, nuxt, defaultLocale, apiConfig, translationPayloadMode, locales, publicPayloads, rootDelta } = params;
   const noScripts = nuxt.options.features.noScripts;
   return {
     locales: locales ?? [],
@@ -985,12 +1005,16 @@ function buildFullConfig(params) {
     defaultLocale,
     fallbackLocale: options.fallbackLocale ?? void 0,
     localeCookie: options.localeCookie ?? null,
+    // set only when it is not the default: 06.redirect reads it
+    redirectStatusCode: options.redirectStatusCode ?? void 0,
+    // only a build that writes a cookie ships its attributes
+    localeCookieOptions: options.localeCookie || nuxt.options?.router?.options?.hashMode ? options.localeCookieOptions : void 0,
     autoDetectLanguage: options.autoDetectLanguage,
     autoDetectPath: options.autoDetectPath || "/",
     strategy: options.strategy,
-    // the `?v=` of payload URLs: a fingerprint of the translations, as a timestamp would make clients re-download
-    // what never changed. `options.dateBuild` wins even when it is `0`/`''`: that opts out of busting.
-    dateBuild: options.dateBuild ?? translationsHash ?? Date.now(),
+    // the `?v=` of payload URLs: a fingerprint of the translations (set at modules:done), as a timestamp would make
+    // clients re-download what never changed. `options.dateBuild` wins even when it is `0`/`''`: that opts out of busting.
+    dateBuild: options.dateBuild ?? Date.now(),
     hashMode: nuxt.options?.router?.options?.hashMode ?? false,
     trailingSlash: options.trailingSlash ?? nuxt.options.experimental?.defaults?.nuxtLink?.trailingSlash,
     apiBaseUrl: apiConfig.apiBaseUrl,
@@ -1027,6 +1051,8 @@ function buildPrivateConfig(options, nuxt, rootDirs, apiConfig, locales, payload
     additionalTranslationDirs: options.additionalTranslationDirs ?? [],
     apiBaseServerHost: apiConfig.apiBaseServerHost,
     serverTranslationPreload: options.serverTranslationPreload ?? false,
+    // read where a server merges source files (mode 'source', dev): set only when on
+    linkedMessages: options.linkedMessages || void 0,
     cacheStorage: options.cacheStorage,
     cacheStorageBuild: nuxt.options.buildId,
     payloadFsDir,
@@ -1145,6 +1171,7 @@ const module$1 = defineNuxtModule({
     httpCacheDuration: 31536e3
   },
   async setup(options, nuxt) {
+    options.locales = localesByLayerPriority(nuxt.options._layers, options.locales);
     const defaultLocale = process.env.DEFAULT_LOCALE || options.defaultLocale || "en";
     let isSSG = false;
     const logger = useLogger("nuxt-i18n-micro");
@@ -1159,6 +1186,13 @@ const module$1 = defineNuxtModule({
       options.localeCookie = "user-locale";
       logger.info("Strategy 'no_prefix': localeCookie automatically set to 'user-locale' for locale persistence.");
     }
+    if (options.redirectStatusCode !== void 0 && !REDIRECT_STATUSES.has(options.redirectStatusCode)) {
+      logger.warn(`redirectStatusCode ${options.redirectStatusCode} is none of 301, 302, 303, 307, 308; 302 is used.`);
+      options.redirectStatusCode = void 0;
+    }
+    if (options.localeCookieOptions?.sameSite === "none" && !options.localeCookieOptions.secure) {
+      logger.warn("localeCookieOptions: sameSite 'none' needs secure: true, or browsers reject the locale cookie.");
+    }
     if (options.strategy !== "no_prefix" && options.redirects !== false && !options.localeCookie) {
       logger.info(
         "Redirects are enabled but localeCookie is not set. Locale-based redirects will not remember user's locale preference across page reloads. Set `localeCookie: 'user-locale'` to enable cookie-based locale persistence for redirects."
@@ -1169,10 +1203,11 @@ const module$1 = defineNuxtModule({
     const mergedLocalesDir = resolve(nuxt.options.buildDir, "i18n-merged");
     const sourceLocalesDir = resolve(nuxt.options.buildDir, "i18n-source");
     const translationDirName = options.translationDir || "locales";
-    const translationsHash = options.dateBuild === void 0 ? hashTranslationSources(
+    const extraDirs = options.additionalTranslationDirs ??= [];
+    const fingerprint = () => options.dateBuild === void 0 ? hashTranslationSources(
       rootDirs,
       translationDirName,
-      options.additionalTranslationDirs,
+      extraDirs,
       JSON.stringify([options.fallbackLocale, options.disablePageLocales, (options.locales ?? []).map((l) => [l.code, l.fallbackLocale])])
     ) : null;
     const translationPayloads = resolveTranslationPayloadOptions(options);
@@ -1184,7 +1219,8 @@ const module$1 = defineNuxtModule({
     })) {
       logger.warn(warning);
     }
-    const rawServerHost = process.env.NUXT_I18N_APP_BASE_SERVER_HOST ?? options.apiBaseServerHost ?? void 0;
+    const payloadSources = resolvePayloadHostSources(options);
+    const rawServerHost = payloadSources.apiBaseServerHost;
     if (!translationPayloads.serverAssets && !translationPayloads.publicAssets && !rawServerHost) {
       throw new Error(
         "nuxt-i18n-micro: local SSR payloads are disabled (serverAssets/publicAssets false) and apiBaseServerHost is not set. SSR would load empty translations."
@@ -1200,10 +1236,11 @@ const module$1 = defineNuxtModule({
       localeInfosByCode.set(locale.code, {
         code: locale.code,
         fallbackLocale: prev?.fallbackLocale ?? locale.fallbackLocale,
+        iso: prev?.iso ?? locale.iso,
         disabled: prev?.disabled ?? locale.disabled
       });
     }
-    const localeInfos = [...localeInfosByCode.values()].filter((locale) => !locale.disabled).map(({ code, fallbackLocale }) => ({ code, fallbackLocale }));
+    const localeInfos = [...localeInfosByCode.values()].filter((locale) => !locale.disabled).map(({ code, fallbackLocale, iso }) => ({ code, fallbackLocale, iso }));
     let routeNames = [];
     nuxt.hook("build:before", async () => {
       if (translationPayloads.mode === "source") {
@@ -1220,7 +1257,9 @@ const module$1 = defineNuxtModule({
           additionalTranslationDirs: options.additionalTranslationDirs,
           routeNames,
           // dev reads live files, and a prerender merges what it reads like any server
-          rootDelta: !nuxt.options.dev && translationPayloads.rootDelta
+          rootDelta: !nuxt.options.dev && translationPayloads.rootDelta,
+          linkedMessages: options.linkedMessages,
+          warn: (message) => logger.warn(message)
         });
         logger.info(`Pre-merged translations from ${rootDirs.length} layer(s) into ${mergedLocalesDir}`);
       }
@@ -1236,12 +1275,12 @@ const module$1 = defineNuxtModule({
     } = mergeDefineI18nRouteMeta(collectDefineI18nRouteMetaFromFiles(pageFiles, rootDirs), options);
     const resolvedStrategyPath = await resolveEntry("@i18n-micro/path-strategy");
     const resolvedHelpersPath = await resolveEntry("@i18n-micro/core/helpers");
-    let apiBaseClientHost = process.env.NUXT_I18N_APP_BASE_CLIENT_HOST ?? options.apiBaseClientHost ?? void 0;
+    let apiBaseClientHost = payloadSources.apiBaseClientHost;
     if (apiBaseClientHost?.endsWith("/")) {
       apiBaseClientHost = apiBaseClientHost.slice(0, -1);
     }
     const apiBaseServerHost = rawServerHost?.endsWith("/") ? rawServerHost.slice(0, -1) : rawServerHost;
-    const rawUrl = process.env.NUXT_I18N_APP_BASE_URL ?? options.apiBaseUrl ?? "_locales";
+    const rawUrl = payloadSources.apiBaseUrl;
     if (rawUrl.startsWith("http://") || rawUrl.startsWith("https://")) {
       throw new Error("Nuxt-i18n-micro: Please use NUXT_I18N_APP_BASE_CLIENT_HOST or NUXT_I18N_APP_BASE_SERVER_HOST instead.");
     }
@@ -1271,8 +1310,12 @@ const module$1 = defineNuxtModule({
       translationPayloadMode: translationPayloads.mode,
       publicPayloads: translationPayloads.mode === "premerged" && translationPayloads.publicAssets,
       rootDelta: !nuxt.options.dev && translationPayloads.mode === "premerged" && translationPayloads.rootDelta && !options.disablePageLocales && (translationPayloads.publicAssets || Boolean(options.apiBaseClientHost)),
-      locales: routeGenerator.locales ?? [],
-      translationsHash
+      locales: routeGenerator.locales ?? []
+    });
+    nuxt.hook("modules:done", () => {
+      for (const dir of nuxt.options.i18n?.additionalTranslationDirs ?? [])
+        if (!extraDirs.includes(dir)) extraDirs.push(dir);
+      fullConfig.dateBuild = fingerprint() ?? fullConfig.dateBuild;
     });
     const generateDomain = process.env.NUXT_I18N_DOMAIN;
     const buildConfig = generateDomain ? configForHost(fullConfig, generateDomain) : fullConfig;
@@ -1366,16 +1409,13 @@ export default defineNuxtPlugin(() => ({ provide: { defineI18nRoute: async () =>
       });
     }
     if (nuxt.options.dev && (options.hmr ?? true)) {
-      const translationDirs = resolveLiveTranslationDirs({
-        rootDirs,
-        translationDir: translationDirName,
-        additionalTranslationDirs: options.additionalTranslationDirs
-      });
+      let translationDirs;
+      const liveDirs = () => translationDirs ??= resolveLiveTranslationDirs({ rootDirs, translationDir: translationDirName, additionalTranslationDirs: extraDirs });
       addVitePlugin(
         {
           name: "i18n-micro:translations-hmr",
           hotUpdate({ file }) {
-            if (this.environment.name !== "client" || !translationRelativePath(file, translationDirs)) return;
+            if (this.environment.name !== "client" || !translationRelativePath(file, liveDirs())) return;
             this.environment.hot.send({ type: "custom", event: TRANSLATIONS_HMR_EVENT });
             return [];
           }

package/dist/runtime/composables/useI18nLocale.js CHANGED Viewed

@@ -13,7 +13,7 @@ export function useI18nLocale() {
   const localeState = useState("i18n-locale", () => null);
   const localeCookieName = getLocaleCookieName(i18nConfig);
   const hashCookieName = getHashCookieName(i18nConfig);
-  const cookieRef = (name) => cookies && name ? useCookie(name, getLocaleCookieOptions()) : { value: null };
+  const cookieRef = (name) => cookies && name ? useCookie(name, getLocaleCookieOptions(i18nConfig.localeCookieOptions)) : { value: null };
   const localeCookie = cookieRef(localeCookieName);
   const hashCookie = cookieRef(hashCookieName);
   const syncLocale = (locale) => {

package/dist/runtime/plugins/01.plugin.d.ts CHANGED Viewed

@@ -17,8 +17,8 @@ declare const _default: import("nuxt/app").Plugin<{
         defaultLocale: () => string;
         getLocales: () => Locale[];
         getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-        t: (key: TranslationKey, params?: Params, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
-        ts: (key: TranslationKey, params?: Params, defaultValue?: string, routeContext?: unknown) => string;
+        t: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
+        ts: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
         _t: (route: RouteLocationNormalizedLoaded) => TranslationFn<CleanTranslation>;
         _ts: (route: RouteLocationNormalizedLoaded) => TranslationFn<string>;
         tc: (key: TranslationKey, count: number | Params, defaultValue?: string) => string;
@@ -49,7 +49,7 @@ declare const _default: import("nuxt/app").Plugin<{
         loadPageTranslations: (locale: string, routeName: string, translations: Translations) => Promise<void>;
         setMissingHandler: (handler: MissingHandler | null) => void;
     };
-    defineI18nRoute: ReturnType<({ getLocale, mergeTranslations }: Pick<NuxtI18nPluginProvide, "getLocale" | "mergeTranslations">) => ({ locales }: DefineI18nRouteConfig) => Promise<void>>;
+    defineI18nRoute: ReturnType<({ getLocale, mergeTranslations }: Pick<NuxtI18nPluginProvide, "getLocale" | "mergeTranslations">) => (config: DefineI18nRouteConfig | false) => Promise<void>>;
     helper: {
         mergeTranslation(locale: string, routeName: string, newTranslations: Translations): Promise<void>;
     };
@@ -61,8 +61,8 @@ declare const _default: import("nuxt/app").Plugin<{
     defaultLocale: () => string;
     getLocales: () => Locale[];
     getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-    t: (key: TranslationKey, params?: Params, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
-    ts: (key: TranslationKey, params?: Params, defaultValue?: string, routeContext?: unknown) => string;
+    t: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
+    ts: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
     _t: (route: RouteLocationNormalizedLoaded) => TranslationFn<CleanTranslation>;
     _ts: (route: RouteLocationNormalizedLoaded) => TranslationFn<string>;
     tc: (key: TranslationKey, count: number | Params, defaultValue?: string) => string;
@@ -105,8 +105,8 @@ declare const _default: import("nuxt/app").Plugin<{
         defaultLocale: () => string;
         getLocales: () => Locale[];
         getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-        t: (key: TranslationKey, params?: Params, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
-        ts: (key: TranslationKey, params?: Params, defaultValue?: string, routeContext?: unknown) => string;
+        t: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
+        ts: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
         _t: (route: RouteLocationNormalizedLoaded) => TranslationFn<CleanTranslation>;
         _ts: (route: RouteLocationNormalizedLoaded) => TranslationFn<string>;
         tc: (key: TranslationKey, count: number | Params, defaultValue?: string) => string;
@@ -137,7 +137,7 @@ declare const _default: import("nuxt/app").Plugin<{
         loadPageTranslations: (locale: string, routeName: string, translations: Translations) => Promise<void>;
         setMissingHandler: (handler: MissingHandler | null) => void;
     };
-    defineI18nRoute: ReturnType<({ getLocale, mergeTranslations }: Pick<NuxtI18nPluginProvide, "getLocale" | "mergeTranslations">) => ({ locales }: DefineI18nRouteConfig) => Promise<void>>;
+    defineI18nRoute: ReturnType<({ getLocale, mergeTranslations }: Pick<NuxtI18nPluginProvide, "getLocale" | "mergeTranslations">) => (config: DefineI18nRouteConfig | false) => Promise<void>>;
     helper: {
         mergeTranslation(locale: string, routeName: string, newTranslations: Translations): Promise<void>;
     };
@@ -149,8 +149,8 @@ declare const _default: import("nuxt/app").Plugin<{
     defaultLocale: () => string;
     getLocales: () => Locale[];
     getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-    t: (key: TranslationKey, params?: Params, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
-    ts: (key: TranslationKey, params?: Params, defaultValue?: string, routeContext?: unknown) => string;
+    t: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
+    ts: (key: TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
     _t: (route: RouteLocationNormalizedLoaded) => TranslationFn<CleanTranslation>;
     _ts: (route: RouteLocationNormalizedLoaded) => TranslationFn<string>;
     tc: (key: TranslationKey, count: number | Params, defaultValue?: string) => string;
@@ -323,5 +323,5 @@ export interface NuxtAppOnlyInjections {
      * Register per-page locale configuration and translations from inside a component.
      * Merges into the active locale and re-applies when the locale changes.
      */
-    $defineI18nRoute: (routeDefinition: DefineI18nRouteConfig) => Promise<void>;
+    $defineI18nRoute: (routeDefinition: DefineI18nRouteConfig | false) => Promise<void>;
 }

package/dist/runtime/plugins/01.plugin.js CHANGED Viewed

@@ -12,7 +12,8 @@ import { useI18nLocale } from "../composables/useI18nLocale.js";
 import { createI18nProvide, createNuxtI18nPluginApi } from "../utils/i18n-api.js";
 import { useResolvedI18nConfig } from "../utils/i18n-config.js";
 import { setupI18nNavigation } from "../utils/i18n-navigation.js";
-import { formatterFor, NuxtI18n, NuxtTranslationLoader } from "../utils/nuxt-i18n.js";
+import { formatterFor } from "../utils/formatter.js";
+import { NuxtI18n, NuxtTranslationLoader } from "../utils/nuxt-i18n.js";
 import { ServerNuxtI18n } from "../utils/nuxt-i18n-server.js";
 import { setI18nDevtoolsBridge } from "../devtools/bridge.js";
 import { DEFAULT_SERVER_CACHE_SIZE } from "../utils/cache-keys.js";
@@ -174,7 +175,8 @@ export default defineNuxtPlugin({
         customMissingHandler.value = handler;
       },
       // a ref: a link rendered without the hash gets it back when hydration ends
-      isHydrating: () => !hydrated.value && nuxtApp.isHydrating === true
+      isHydrating: () => !hydrated.value && nuxtApp.isHydrating === true,
+      nuxtApp
     });
     if (import.meta.server) rewriteSwitcherLinks(nuxtApp, api.provide, i18nRouteParams, (path) => router.resolve(path).href);
     if (import.meta.dev && import.meta.client) {

package/dist/runtime/plugins/06.redirect.js CHANGED Viewed

@@ -41,7 +41,7 @@ export default defineNuxtPlugin({
     const urlLocale = i18nStrategy.getLocaleFromPath(path);
     const writeCookie = (locale) => {
       if (!cookieName) return;
-      const { watch: _watch, decode: _decode, ...options } = getLocaleCookieOptions();
+      const { watch: _watch, decode: _decode, ...options } = getLocaleCookieOptions(i18nConfig.localeCookieOptions);
       setCookie(event, cookieName, locale, options);
     };
     const redirectable = redirects && !urlless && !i18nConfig.hashMode && (urlLocale || i18nConfig.strategy !== "prefix_and_default");
@@ -49,8 +49,9 @@ export default defineNuxtPlugin({
     const router = useRouter();
     const served = i18nConfig.strategy !== "no_prefix" && (router.getRoutes().length === 0 || router.currentRoute.value.matched.length > 0);
     if (urlLocale && served && !(redirects && anyPath)) writeCookie(urlLocale);
+    const redirectCode = i18nConfig.redirectStatusCode ?? 302;
     if (i18nConfig.hashMode && alwaysPrefixed)
-      return navigateTo(`/#${applyTrailingSlash(path, i18nConfig.trailingSlash)}${url.search}`, { redirectCode: 302 });
+      return navigateTo(`/#${applyTrailingSlash(path, i18nConfig.trailingSlash)}${url.search}`, { redirectCode });
     if (!redirects || i18nConfig.hashMode) return;
     const preferred = redirectLocale({
       path,
@@ -69,7 +70,7 @@ export default defineNuxtPlugin({
     if (!target) return;
     if (anyPath && urlLocale) writeCookie(preferred);
     if (DEBUG) console.error("[i18n-redirect] REDIRECT", { path, target, preferred });
-    return navigateTo(applyTrailingSlash(target, i18nConfig.trailingSlash) + url.search + url.hash, { redirectCode: 302 });
+    return navigateTo(applyTrailingSlash(target, i18nConfig.trailingSlash) + url.search + url.hash, { redirectCode });
   }
 });
 function chosenState(state, urlLocale) {

package/dist/runtime/server/internal/dev-live-translations.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { createTranslationDirReader, mergeDevTranslations, resolveLiveTranslationDirs } from "./translation-watcher.js";
 import { toTranslations } from "@i18n-micro/utils/normalize";
 import { getI18nPrivateConfig } from "#i18n-internal/config";
+import { warnOnce } from "../utils/warn-once.js";
 export async function loadLiveDevTranslations(locale, pageName, config) {
   const privateConfig = getI18nPrivateConfig();
   const { translationRoots, additionalRoots } = resolveLiveTranslationDirs({
@@ -16,7 +17,9 @@ export async function loadLiveDevTranslations(locale, pageName, config) {
     locales: config.linkLocales ?? config.locales,
     fallbackLocale: config.fallbackLocale,
     disablePageLocales: config.disablePageLocales,
-    readLocaleFile
+    readLocaleFile,
+    linkedMessages: privateConfig.linkedMessages,
+    warn: warnOnce
   });
   return toTranslations(merged);
 }

package/dist/runtime/server/internal/translation-watcher.d.ts CHANGED Viewed

@@ -11,6 +11,8 @@ export interface DevTranslationMergeInput {
     fallbackLocale?: string;
     disablePageLocales?: boolean;
     readLocaleFile: (relativePath: string) => Record<string, unknown> | Promise<Record<string, unknown>>;
+    linkedMessages?: boolean;
+    warn?: (message: string) => void;
 }
 export interface HandleTranslationWatchChangeInput {
     relativePath: string;

package/dist/runtime/server/internal/translation-watcher.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { forwardSlashes } from "@i18n-micro/utils/app-path";
 import { deepMergeTranslationsRecursive } from "@i18n-micro/utils/deep-merge";
-import { parseJsonFile } from "@i18n-micro/utils/load-dir";
+import { additionalTranslationRoots, parseJsonFile } from "@i18n-micro/utils/load-dir";
 import { mergeSourceTranslations, normalizeConfiguredLocales } from "@i18n-micro/utils/merge-source";
 import { parseTranslationRelativePath } from "@i18n-micro/utils/parse-path";
 export function readTranslationFile(filePath) {
@@ -25,13 +25,7 @@ function skip(filePath, reason) {
 const WARNED = /* @__PURE__ */ new Set();
 export function resolveLiveTranslationDirs(input) {
   const translationRoots = input.rootDirs.map((root) => resolve(root, input.translationDir));
-  const additionalRoots = [];
-  for (const dir of input.additionalTranslationDirs ?? []) {
-    for (const root of input.rootDirs) {
-      additionalRoots.push(resolve(root, dir));
-    }
-  }
-  return { translationRoots, additionalRoots };
+  return { translationRoots, additionalRoots: additionalTranslationRoots(input.rootDirs, input.additionalTranslationDirs) };
 }
 export function translationRelativePath(filePath, dirs) {
   const inside = (root) => {
@@ -73,7 +67,9 @@ export async function mergeDevTranslations(input) {
     locales: effectiveLocales,
     globalFallbackLocale: input.fallbackLocale,
     disablePageLocales: input.disablePageLocales,
-    readLocaleFile: input.readLocaleFile
+    readLocaleFile: input.readLocaleFile,
+    linkedMessages: input.linkedMessages,
+    warn: input.warn
   });
 }
 export async function handleTranslationWatchChange(input) {

package/dist/runtime/server/utils/server-loader.js CHANGED Viewed

@@ -11,13 +11,14 @@ import { getI18nServerConfig } from "./locale-detector.js";
 import { getOrCreateServerTranslationCache } from "../internal/server-translation-cache.js";
 import { readSharedChunk, sharedChunkKey, writeSharedChunk } from "../internal/shared-cache.js";
 import { takeRootMark, toEntry } from "../../utils/translation-entry.js";
+import { warnOnce } from "./warn-once.js";
 const EMPTY = { data: {}, json: "{}" };
 export const NO_FILE = { data: {}, json: "{}" };
 const pending = /* @__PURE__ */ new Map();
 const requestBoundIo = typeof navigator !== "undefined" && navigator.userAgent === "Cloudflare-Workers";
 function runtimeHost() {
   try {
-    return process.env.NUXT_I18N_APP_BASE_SERVER_HOST;
+    return process.env.NUXT_I18N_APP_BASE_SERVER_HOST || void 0;
   } catch {
     return void 0;
   }
@@ -95,7 +96,9 @@ async function load(locale, page, config) {
         // a fallback may live on another domain: its file is still this build's
         locales: normalizeConfiguredLocales(config.linkLocales ?? config.locales),
         globalFallbackLocale: config.fallbackLocale,
-        disablePageLocales: config.disablePageLocales
+        disablePageLocales: config.disablePageLocales,
+        linkedMessages: getI18nPrivateConfig().linkedMessages,
+        warn: warnOnce
       }
     );
     return { entry: toEntry(data) };

package/dist/runtime/server/utils/translation-server-middleware.d.ts CHANGED Viewed

@@ -1,3 +1,8 @@
-import type { Params } from '@i18n-micro/types';
+import { BaseI18n } from '@i18n-micro/core';
+import type { TranslateParams } from '@i18n-micro/types';
 import type { H3Event } from 'h3';
-export declare const useTranslationServerMiddleware: (event: H3Event, defaultLocale?: string, currentLocale?: string) => Promise<(key: string, params?: Params, defaultValue?: string) => string>;
+type Helpers = Pick<BaseI18n, 'tc' | 'tn' | 'td' | 'tdr' | 'has'>;
+export declare const useTranslationServerMiddleware: (event: H3Event, defaultLocale?: string, currentLocale?: string) => Promise<((key: string, params?: TranslateParams, defaultValue?: string) => string) & Helpers>;
+/** `t` of `useTranslationServerMiddleware`, with the page's `tc`, `tn`, `td`, `tdr` and `has`. */
+export type ServerTranslate = Awaited<ReturnType<typeof useTranslationServerMiddleware>>;
+export {};

package/dist/runtime/server/utils/translation-server-middleware.js CHANGED Viewed

@@ -1,4 +1,6 @@
-import { interpolate, resolveTranslation } from "@i18n-micro/core";
+import { BaseI18n, interpolate, localeIsoMap, resolveTranslation, translationCacheKey } from "@i18n-micro/core";
+import { plural } from "#i18n-internal/plural";
+import { formatterFor } from "../../utils/formatter.js";
 import { getI18nServerConfig, getRequestLocale } from "./locale-detector.js";
 import { loadTranslationsFromServer } from "./server-loader.js";
 const I18N_CONTEXT_KEY = "__i18n_translations__";
@@ -16,8 +18,30 @@ async function dictionaryOf(event, locale) {
   }
   return loaded[locale] = chunk.data;
 }
+class DictionaryI18n extends BaseI18n {
+  constructor(locale, translations, config) {
+    super({
+      storage: { translations: /* @__PURE__ */ new Map([[translationCacheKey(locale, "index"), translations]]) },
+      plural,
+      formatter: formatterFor(config),
+      missingWarn: false,
+      localeIso: localeIsoMap(config.linkLocales ?? config.locales)
+    });
+    this.locale = locale;
+  }
+  getLocale() {
+    return this.locale;
+  }
+  getFallbackLocale() {
+    return this.locale;
+  }
+  getRoute() {
+    return "index";
+  }
+}
 export const useTranslationServerMiddleware = async (event, defaultLocale, currentLocale) => {
-  const locale = currentLocale || getRequestLocale(event, getI18nServerConfig(event), defaultLocale);
+  const config = getI18nServerConfig(event);
+  const locale = currentLocale || getRequestLocale(event, config, defaultLocale);
   const translations = await dictionaryOf(event, locale);
   function t(key, params, defaultValue) {
     const value = resolveTranslation(translations, key);
@@ -25,5 +49,14 @@ export const useTranslationServerMiddleware = async (event, defaultLocale, curre
     const str = typeof value === "string" ? value : String(value);
     return params ? interpolate(str, params) : str;
   }
-  return t;
+  let i18n;
+  const own = () => i18n ??= new DictionaryI18n(locale, translations, config);
+  const helpers = {
+    tc: (...args) => own().tc(...args),
+    tn: ((...args) => own().tn(...args)),
+    td: ((...args) => own().td(...args)),
+    tdr: (...args) => own().tdr(...args),
+    has: (...args) => own().has(...args)
+  };
+  return Object.assign(t, helpers);
 };

package/dist/runtime/server/utils/warn-once.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare function warnOnce(message: string): void;

package/dist/runtime/server/utils/warn-once.js ADDED Viewed

@@ -0,0 +1,6 @@
+const warned = /* @__PURE__ */ new Set();
+export function warnOnce(message) {
+  if (warned.has(message)) return;
+  warned.add(message);
+  console.warn(message);
+}

package/dist/runtime/utils/formatter.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import { FormatService } from '@i18n-micro/core';
+import type { ResolvedI18nConfig } from '@i18n-micro/types';
+/**
+ * The server's formatters. `Intl` objects are costly and depend only on what the service is built
+ * from, so requests share them: its input is this read-only config, and no request reaches it
+ * (`$tn` and `$td` pass the locale per call). One per resolved config: runtime overrides and hosts.
+ * No vue here: the page plugin and the Nitro helpers share it.
+ */
+export declare function formatterFor(config: ResolvedI18nConfig): FormatService;

package/dist/runtime/utils/formatter.js ADDED Viewed

@@ -0,0 +1,7 @@
+import { FormatService } from "@i18n-micro/core";
+const formatters = /* @__PURE__ */ new WeakMap();
+export function formatterFor(config) {
+  let formatter = formatters.get(config);
+  if (!formatter) formatters.set(config, formatter = new FormatService(config));
+  return formatter;
+}

package/dist/runtime/utils/hooks.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import type { I18nBeforeLocaleSwitchContext } from '@i18n-micro/types';
+import type { NuxtApp } from 'nuxt/app';
+/** What of the NuxtApp a hook needs. */
+export type HookHost = Pick<NuxtApp, 'hooks' | 'callHook'>;
+/** Has `name` a subscriber? `_hooks` is hookable's own, so without it the hook just runs. */
+export declare function hasSubscriber(nuxtApp: HookHost, name: string): boolean;
+/** `i18n:beforeLocaleSwitch`: what the subscribers decided, or null when nobody listens (no context is made). */
+export declare function beforeLocaleSwitch(nuxtApp: HookHost, from: string, to: string): Promise<I18nBeforeLocaleSwitchContext | null>;

package/dist/runtime/utils/hooks.js ADDED Viewed

@@ -0,0 +1,10 @@
+export function hasSubscriber(nuxtApp, name) {
+  const { _hooks: subscribers } = nuxtApp.hooks;
+  return !subscribers || Boolean(subscribers[name]?.length);
+}
+export async function beforeLocaleSwitch(nuxtApp, from, to) {
+  if (!hasSubscriber(nuxtApp, "i18n:beforeLocaleSwitch")) return null;
+  const ctx = { from, to, cancel: false };
+  await nuxtApp.callHook("i18n:beforeLocaleSwitch", ctx);
+  return ctx;
+}

package/dist/runtime/utils/i18n-api.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import type { DefineI18nRouteConfig, I18nRouteParams, MissingHandler, ResolvedI1
 import type { RouteLocationNamedRaw, RouteLocationNormalizedLoaded, RouteLocationResolved, RouteLocationResolvedGeneric, Router } from 'vue-router';
 import type { useI18nLocale } from '../composables/useI18nLocale.js';
 import type { NuxtI18n, NuxtTranslationLoader } from './nuxt-i18n.js';
+import { type HookHost } from './hooks.js';
 /** URL of a switch result: the strategy hands out a URL string or a resolved route (fullPath set). */
 export declare function switchedPath(switched: RouteLike | string): string;
 export interface NuxtI18nPluginApiDeps {
@@ -22,6 +23,8 @@ export interface NuxtI18nPluginApiDeps {
     }) => unknown;
     setMissingHandler: (handler: MissingHandler | null) => void;
     isHydrating: () => boolean;
+    /** For `i18n:beforeLocaleSwitch`. */
+    nuxtApp: HookHost;
 }
 export declare function createNuxtI18nPluginApi(deps: NuxtI18nPluginApiDeps): {
     helper: {
@@ -34,8 +37,8 @@ export declare function createNuxtI18nPluginApi(deps: NuxtI18nPluginApiDeps): {
         defaultLocale: () => string;
         getLocales: () => import("@i18n-micro/types").Locale[];
         getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-        t: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").Params, defaultValue?: string | null, routeContext?: unknown) => import("@i18n-micro/types").CleanTranslation;
-        ts: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").Params, defaultValue?: string, routeContext?: unknown) => string;
+        t: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => import("@i18n-micro/types").CleanTranslation;
+        ts: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
         _t: (route: RouteLocationNormalizedLoaded) => import("./nuxt-i18n.js").TranslationFn<import("@i18n-micro/types").CleanTranslation>;
         _ts: (route: RouteLocationNormalizedLoaded) => import("./nuxt-i18n.js").TranslationFn<string>;
         tc: (key: import("@i18n-micro/types").TranslationKey, count: number | import("@i18n-micro/types").Params, defaultValue?: string) => string;
@@ -71,7 +74,7 @@ export declare function createNuxtI18nPluginApi(deps: NuxtI18nPluginApiDeps): {
 export type NuxtI18nPluginApi = ReturnType<typeof createNuxtI18nPluginApi>;
 export type NuxtI18nPluginProvide = NuxtI18nPluginApi['provide'];
 /** The page's own translations: on the active locale, and again on each switch while the page lives. */
-declare function createDefineI18nRoute({ getLocale, mergeTranslations }: Pick<NuxtI18nPluginProvide, 'getLocale' | 'mergeTranslations'>): ({ locales }: DefineI18nRouteConfig) => Promise<void>;
+declare function createDefineI18nRoute({ getLocale, mergeTranslations }: Pick<NuxtI18nPluginProvide, 'getLocale' | 'mergeTranslations'>): (config: DefineI18nRouteConfig | false) => Promise<void>;
 export interface I18nProvideDeps {
     api: NuxtI18nPluginApi;
     i18nConfig: ResolvedI18nConfig;
@@ -98,8 +101,8 @@ export declare function createI18nProvide({ api: { helper, provide }, i18nConfig
             defaultLocale: () => string;
             getLocales: () => import("@i18n-micro/types").Locale[];
             getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-            t: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").Params, defaultValue?: string | null, routeContext?: unknown) => import("@i18n-micro/types").CleanTranslation;
-            ts: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").Params, defaultValue?: string, routeContext?: unknown) => string;
+            t: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => import("@i18n-micro/types").CleanTranslation;
+            ts: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
             _t: (route: RouteLocationNormalizedLoaded) => import("./nuxt-i18n.js").TranslationFn<import("@i18n-micro/types").CleanTranslation>;
             _ts: (route: RouteLocationNormalizedLoaded) => import("./nuxt-i18n.js").TranslationFn<string>;
             tc: (key: import("@i18n-micro/types").TranslationKey, count: number | import("@i18n-micro/types").Params, defaultValue?: string) => string;
@@ -142,8 +145,8 @@ export declare function createI18nProvide({ api: { helper, provide }, i18nConfig
         defaultLocale: () => string;
         getLocales: () => import("@i18n-micro/types").Locale[];
         getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, _locale?: string) => string;
-        t: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").Params, defaultValue?: string | null, routeContext?: unknown) => import("@i18n-micro/types").CleanTranslation;
-        ts: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").Params, defaultValue?: string, routeContext?: unknown) => string;
+        t: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string | null, routeContext?: unknown) => import("@i18n-micro/types").CleanTranslation;
+        ts: (key: import("@i18n-micro/types").TranslationKey, params?: import("@i18n-micro/types").TranslateParams, defaultValue?: string, routeContext?: unknown) => string;
         _t: (route: RouteLocationNormalizedLoaded) => import("./nuxt-i18n.js").TranslationFn<import("@i18n-micro/types").CleanTranslation>;
         _ts: (route: RouteLocationNormalizedLoaded) => import("./nuxt-i18n.js").TranslationFn<string>;
         tc: (key: import("@i18n-micro/types").TranslationKey, count: number | import("@i18n-micro/types").Params, defaultValue?: string) => string;

package/dist/runtime/utils/i18n-api.js CHANGED Viewed

@@ -2,7 +2,8 @@ import { isNoPrefixStrategy, urlPath } from "@i18n-micro/core";
 import { trimTrailingSlashes } from "@i18n-micro/utils/app-path";
 import { hasProtocol } from "ufo";
 import { getCurrentInstance, onActivated, watch } from "vue";
-import { domains, defineRoute, serverPathFallback } from "#build/i18n.strategy.mjs";
+import { domains, defineRoute, hooks, serverPathFallback } from "#build/i18n.strategy.mjs";
+import { beforeLocaleSwitch } from "./hooks.js";
 import { usePageRoute } from "./page-head.js";
 import { applyTrailingSlash } from "./trailing-slash.js";
 function toRouteLocationResolved(result) {
@@ -34,7 +35,8 @@ export function createNuxtI18nPluginApi(deps) {
     i18nRouteParams,
     navigateTo,
     setMissingHandler,
-    isHydrating
+    isHydrating,
+    nuxtApp
   } = deps;
   const { getEffectiveLocale, setLocale, isValidLocale } = localeState;
   const setLocaleState = (code) => {
@@ -116,6 +118,12 @@ export function createNuxtI18nPluginApi(deps) {
         return false;
       }
       const urlless = isNoPrefix || i18nConfig.hashMode;
+      const from = i18n.getLocale();
+      if (hooks && urlless && toLocale !== i18n.getLocale()) {
+        const ctx = await beforeLocaleSwitch(nuxtApp, i18n.getLocale(), toLocale);
+        if (ctx?.cancel) return false;
+        if (ctx && isValidLocale(ctx.to)) toLocale = ctx.to;
+      }
       const retry = getCurrentLocale() === toLocale && i18n.getLocale() !== toLocale;
       const route = router.currentRoute.value;
       const loaded = urlless || retry ? await loader.switchContext(toLocale, i18nStrategy.getPluginRouteName(route, toLocale)) : null;
@@ -129,7 +137,7 @@ export function createNuxtI18nPluginApi(deps) {
         if (!urlless) setLocaleState(i18n.getLocale());
         throw error;
       }
-      return loaded ?? i18n.getLocale() === toLocale;
+      return loaded ?? (i18n.getLocale() === toLocale || i18n.getLocale() !== from);
     },
     switchRoute: async (route, toLocale) => {
       return switchLocaleLogic(toLocale ?? getCurrentLocale(), i18nRouteParams.value, route);
@@ -158,7 +166,8 @@ export function createNuxtI18nPluginApi(deps) {
   return { helper, provide };
 }
 function createDefineI18nRoute({ getLocale, mergeTranslations }) {
-  return async ({ locales }) => {
+  return async (config) => {
+    const locales = config ? config.locales : void 0;
     if (!locales || Array.isArray(locales)) return;
     const apply = () => {
       const translations = locales[getLocale()];

package/dist/runtime/utils/i18n-config.js CHANGED Viewed

@@ -1,5 +1,7 @@
 import {
   applyI18nRuntimeOverrides,
+  applyLocaleBaseUrls,
+  readLocaleBaseUrls,
   createI18nConfigResolver,
   readI18nRuntimeOverrides
 } from "@i18n-micro/utils/runtime-config";
@@ -20,11 +22,22 @@ function overridesOf(config) {
   };
 }
 export function shippedOverrides(config, base) {
-  const shipped = overridesOf(config);
+  if (config === base) return null;
+  const shipped = Object.assign(overridesOf(config), originsOf(config, base));
   const built = overridesOf(base);
-  const same = shipped.defaultLocale === built.defaultLocale && shipped.fallbackLocale === built.fallbackLocale && shipped.domain === built.domain && shipped.dateBuild === built.dateBuild && String(shipped.disabledLocales) === String(built.disabledLocales);
+  const same = shipped.defaultLocale === built.defaultLocale && shipped.fallbackLocale === built.fallbackLocale && shipped.domain === built.domain && shipped.dateBuild === built.dateBuild && String(shipped.disabledLocales) === String(built.disabledLocales) && !shipped.metaBaseUrl && !shipped.localeBaseUrls;
   return same ? null : shipped;
 }
+function originsOf(config, base) {
+  const origins = {};
+  if (!config.domain && config.metaBaseUrl !== base.metaBaseUrl && config.metaBaseUrl) origins.metaBaseUrl = config.metaBaseUrl;
+  const built = base.locales ?? [];
+  const moved = (config.linkLocales ?? config.locales ?? []).filter(
+    (locale) => locale.baseUrl && locale.baseUrl !== built.find((entry) => entry.code === locale.code)?.baseUrl
+  );
+  if (moved.length) origins.localeBaseUrls = Object.fromEntries(moved.map((locale) => [locale.code, locale.baseUrl]));
+  return origins;
+}
 function resolve(nuxtApp) {
   const base = getI18nConfig();
   const shipped = useState("i18n-runtime-overrides", () => null);
@@ -34,10 +47,14 @@ function resolve(nuxtApp) {
     return config2;
   }
   if (nuxtApp.payload.serverRendered) {
-    const config2 = shipped.value ? applyI18nRuntimeOverrides(base, shipped.value, silent) : base;
+    const applied2 = shipped.value ? applyI18nRuntimeOverrides(base, shipped.value, silent) : base;
+    const config2 = domains && shipped.value ? applyLocaleBaseUrls(applied2, shipped.value, silent) : applied2;
     return domains && shipped.value?.domain ? configForHost(config2, shipped.value.domain) : config2;
   }
-  const config = applyI18nRuntimeOverrides(base, readI18nRuntimeOverrides(nuxtApp.$config.public));
+  const runtimePublic = nuxtApp.$config.public;
+  const overrides = readI18nRuntimeOverrides(runtimePublic);
+  const applied = applyI18nRuntimeOverrides(base, overrides);
+  const config = domains ? applyLocaleBaseUrls(applied, { ...overrides, localeBaseUrls: readLocaleBaseUrls(runtimePublic) }) : applied;
   return domains ? configForHost(config, location.host) : config;
 }
 export function useResolvedI18nConfig(nuxtApp) {

package/dist/runtime/utils/i18n-navigation.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { hooks } from "#build/i18n.strategy.mjs";
+import { beforeLocaleSwitch, hasSubscriber } from "./hooks.js";
 function createOutgoingWatch(nuxtApp, i18n) {
   let stopWaiting;
   let noElement = null;
@@ -29,12 +30,8 @@ function createOutgoingWatch(nuxtApp, i18n) {
   };
 }
 function createRegister(nuxtApp, { mergeTranslation }) {
-  const subscribed = () => {
-    const { _hooks: subscribers } = nuxtApp.hooks;
-    return !subscribers || Boolean(subscribers["i18n:register"]?.length);
-  };
   return async (locale, routeName) => {
-    if (!subscribed()) return;
+    if (!hasSubscriber(nuxtApp, "i18n:register")) return;
     const merges = [];
     const register = (translations, selectedLocale) => {
       merges.push(mergeTranslation(selectedLocale ?? locale, routeName, translations));
@@ -43,6 +40,21 @@ function createRegister(nuxtApp, { mergeTranslation }) {
     await Promise.all(merges);
   };
 }
+function createSwitchVerdict({ nuxtApp, i18n, api, locale: { isValidLocale } }) {
+  let redirectedTo = null;
+  return async (to, locale) => {
+    const from = i18n.getLocale();
+    const redirected = redirectedTo === locale;
+    redirectedTo = null;
+    if (!import.meta.client || nuxtApp.isHydrating || !from || locale === from || redirected) return void 0;
+    const ctx = await beforeLocaleSwitch(nuxtApp, from, locale);
+    if (!ctx) return void 0;
+    if (ctx.cancel) return false;
+    if (ctx.to === locale || !isValidLocale(ctx.to)) return void 0;
+    redirectedTo = ctx.to;
+    return api.provide.localeRoute(to, ctx.to);
+  };
+}
 export function setupI18nNavigation(deps) {
   const { nuxtApp, router, i18n, loader, i18nConfig, i18nStrategy, api, leavePage } = deps;
   const noPrefix = i18nConfig.strategy === "no_prefix";
@@ -51,10 +63,10 @@ export function setupI18nNavigation(deps) {
   const register = createRegister(nuxtApp, api.helper);
   const targets = /* @__PURE__ */ new WeakMap();
   if (hooks) nuxtApp.hooks.hookOnce("app:created", () => register(i18n.getLocale(), i18n.getCurrentRouteName()));
-  const loadTarget = async (to) => {
+  const targetLocale = (to) => (i18nConfig.hashMode ? i18nStrategy.getLocaleFromPath(to.path) : null) || api.provide.getLocale(to);
+  const switchVerdict = hooks ? createSwitchVerdict(deps) : void 0;
+  const loadTarget = async (to, locale) => {
     try {
-      const hashLocale = i18nConfig.hashMode ? i18nStrategy.getLocaleFromPath(to.path) : null;
-      const locale = hashLocale || api.provide.getLocale(to);
       const routeName = i18nStrategy.getPluginRouteName(to, locale);
       const changed = locale !== i18n.getLocale() || routeName !== i18n.getCurrentRouteName();
       return { locale, routeName, changed, data: changed ? await loader.fetchContext(locale, routeName) : null };
@@ -68,8 +80,17 @@ export function setupI18nNavigation(deps) {
     const paths = noPrefix ? to.matched.at(-1)?.meta.i18n?.paths : void 0;
     const customPath = paths?.[api.provide.getLocale(to)];
     if (customPath) return { path: customPath, query: to.query, hash: to.hash };
+    let locale;
+    try {
+      locale = targetLocale(to);
+    } catch (e) {
+      if (process.env.NODE_ENV !== "production") console.error("[i18n] Navigation error:", e);
+      return;
+    }
+    const verdict = switchVerdict && await switchVerdict(to, locale);
+    if (verdict !== void 0) return verdict;
     loader.invalidatePendingSwitches();
-    const target = await loadTarget(to);
+    const target = await loadTarget(to, locale);
     if (!target) return;
     targets.set(to, target);
     if (hooks) await register(target.locale, target.routeName);

package/dist/runtime/utils/nuxt-i18n.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { BaseI18n, FormatService, type BaseI18nOptions, type TranslationStorage } from '@i18n-micro/core';
-import type { CleanTranslation, ResolvedI18nConfig, Params, TranslationKey, Translations } from '@i18n-micro/types';
+import { BaseI18n, type BaseI18nOptions, type TranslationStorage } from '@i18n-micro/core';
+import type { CleanTranslation, TranslateParams, TranslationKey, Translations } from '@i18n-micro/types';
 import { type ShallowRef } from 'vue';
 import { type LoadOptions } from './storage.js';
-export type TranslationFn<T extends CleanTranslation> = (key: TranslationKey, params?: Params, defaultValue?: string | null) => T;
+export type TranslationFn<T extends CleanTranslation> = (key: TranslationKey, params?: TranslateParams, defaultValue?: string | null) => T;
 export interface RouteTranslationContext {
     locale: string;
     routeName: string;
@@ -19,12 +19,6 @@ export interface NuxtI18nOptions extends BaseI18nOptions {
      */
     cacheMaxSize?: number;
 }
-/**
- * The server's formatters. `Intl` objects are costly and depend only on what the service is built
- * from, so requests share them: its input is this read-only config, and no request reaches it
- * (`$tn` and `$td` pass the locale per call). One per resolved config: runtime overrides and hosts.
- */
-export declare function formatterFor(config: ResolvedI18nConfig): FormatService;
 export declare class NuxtI18n extends BaseI18n {
     readonly storage: TranslationStorage;
     private readonly cacheMaxSize;

package/dist/runtime/utils/nuxt-i18n.js CHANGED Viewed

@@ -1,6 +1,5 @@
 import {
   BaseI18n,
-  FormatService,
   mergeTranslationChunk,
   resolveCachedTranslation,
   setTranslationAtKey,
@@ -9,12 +8,6 @@ import {
 import { PREMERGED_ROOT_PAGE } from "@i18n-micro/utils/merge-source";
 import { shallowRef, triggerRef } from "vue";
 import { translationStorage } from "./storage.js";
-const formatters = /* @__PURE__ */ new WeakMap();
-export function formatterFor(config) {
-  let formatter = formatters.get(config);
-  if (!formatter) formatters.set(config, formatter = new FormatService(config));
-  return formatter;
-}
 export class NuxtI18n extends BaseI18n {
   storage;
   cacheMaxSize;

package/dist/types.d.mts CHANGED Viewed

@@ -4,7 +4,7 @@ declare module '#app' {
   interface RuntimeNuxtHooks extends ModuleRuntimeHooks {}
 }
-export { type Getter, type GlobalLocaleRoutes, type Locale, type LocaleCode, type ModuleOptions, type PluralFunc, type Strategies } from '@i18n-micro/types'
+export { type Getter, type GlobalLocaleRoutes, type I18nBeforeLocaleSwitchContext, type Locale, type LocaleCode, type ModuleOptions, type PluralFunc, type Strategies } from '@i18n-micro/types'
 export { type PluginsInjections } from '../dist/runtime/plugins/01.plugin.js'

package/internals.d.mts CHANGED Viewed

@@ -12,6 +12,8 @@ interface I18nPrivateConfig {
   debug: boolean
   translationDir: string
   additionalTranslationDirs?: string[]
+  /** `linkedMessages`, for servers that merge source files. */
+  linkedMessages?: boolean
   fallbackLocale?: string
   apiBaseUrl: string
   apiBaseClientHost?: string
@@ -108,6 +110,10 @@ declare module '#i18n-internal/strategy' {
   export function createI18nStrategy(router: I18nStrategyRouterLike): I18nStrategyInstance
 }
+declare module '#i18n-internal/plural' {
+  export const plural: import('@i18n-micro/types').PluralFunc
+}
 declare module '#i18n-internal/payload-source' {
   export const embeddedPayloads: boolean
   export function readPayload(relPath: string): Promise<Record<string, unknown>>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "description": "Fast, lightweight i18n for Nuxt with strategy-based routing and minimal overhead.",
   "keywords": [
     "i18n",
@@ -78,11 +78,11 @@
     "h3": "^1.15.11",
     "sirv": "^3.0.2",
     "ufo": "^1.6.4",
-    "@i18n-micro/core": "^2.0.1",
-    "@i18n-micro/types": "^2.0.1",
-    "@i18n-micro/path-strategy": "^2.0.1",
-    "@i18n-micro/utils": "^2.0.1",
-    "@i18n-micro/route-strategy": "^2.0.1"
+    "@i18n-micro/core": "^2.1.0",
+    "@i18n-micro/path-strategy": "^2.1.0",
+    "@i18n-micro/route-strategy": "^2.1.1",
+    "@i18n-micro/types": "^2.1.0",
+    "@i18n-micro/utils": "^2.1.0"
   },
   "devDependencies": {
     "@nuxt/devtools": "^3.4.2",

package/dist/client/_nuxt/builds/meta/356b87e3-45dd-4f80-a40a-b649665c1844.json DELETED Viewed

	@@ -1 +0,0 @@
1	- {"id":"356b87e3-45dd-4f80-a40a-b649665c1844","timestamp":1793785771623,"prerendered":[]}