@bleedingdev/modern-js-plugin-i18n 3.5.0-ultramodern.2 → 3.5.0-ultramodern.20

package/dist/cjs/server/index.js

@@ -167,6 +167,14 @@ const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
     const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
     return localizedUrl;
 };
+const createLocaleRedirectResponse = (location)=>new Response(null, {
+        status: 302,
+        headers: {
+            'Cache-Control': 'private, no-store',
+            Location: location,
+            Vary: 'Accept-Language, Cookie'
+        }
+    });
 const i18nServerPlugin = (options)=>({
         name: '@modern-js/plugin-i18n/server',
         setup: (api)=>{
@@ -235,12 +243,12 @@ const i18nServerPlugin = (options)=>({
                                     if (i18nextDetector) detectedLanguage = c.get('language') || null;
                                     const targetLanguage = detectedLanguage || fallbackLanguage;
                                     const localizedUrl = buildLocalizedUrl(c.req, originUrlPath, targetLanguage, languages, localisedUrls);
-                                    return c.redirect(localizedUrl);
+                                    return createLocaleRedirectResponse(localizedUrl);
                                 }
                                 const localisedUrlsConfig = (0, localisedUrls_js_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
                                 if (localisedUrlsConfig.enabled) {
                                     const expectedUrl = buildLocalizedUrl(c.req, originUrlPath, language, languages, localisedUrls);
-                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return c.redirect(expectedUrl);
+                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return createLocaleRedirectResponse(expectedUrl);
                                 }
                                 await next();
                             }

package/dist/esm/server/index.mjs

@@ -132,6 +132,14 @@ const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
     const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
     return localizedUrl;
 };
+const createLocaleRedirectResponse = (location)=>new Response(null, {
+        status: 302,
+        headers: {
+            'Cache-Control': 'private, no-store',
+            Location: location,
+            Vary: 'Accept-Language, Cookie'
+        }
+    });
 const i18nServerPlugin = (options)=>({
         name: '@modern-js/plugin-i18n/server',
         setup: (api)=>{
@@ -200,12 +208,12 @@ const i18nServerPlugin = (options)=>({
                                     if (i18nextDetector) detectedLanguage = c.get('language') || null;
                                     const targetLanguage = detectedLanguage || fallbackLanguage;
                                     const localizedUrl = buildLocalizedUrl(c.req, originUrlPath, targetLanguage, languages, localisedUrls);
-                                    return c.redirect(localizedUrl);
+                                    return createLocaleRedirectResponse(localizedUrl);
                                 }
                                 const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
                                 if (localisedUrlsConfig.enabled) {
                                     const expectedUrl = buildLocalizedUrl(c.req, originUrlPath, language, languages, localisedUrls);
-                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return c.redirect(expectedUrl);
+                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return createLocaleRedirectResponse(expectedUrl);
                                 }
                                 await next();
                             }

package/dist/esm-node/server/index.mjs

@@ -133,6 +133,14 @@ const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
     const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
     return localizedUrl;
 };
+const createLocaleRedirectResponse = (location)=>new Response(null, {
+        status: 302,
+        headers: {
+            'Cache-Control': 'private, no-store',
+            Location: location,
+            Vary: 'Accept-Language, Cookie'
+        }
+    });
 const i18nServerPlugin = (options)=>({
         name: '@modern-js/plugin-i18n/server',
         setup: (api)=>{
@@ -201,12 +209,12 @@ const i18nServerPlugin = (options)=>({
                                     if (i18nextDetector) detectedLanguage = c.get('language') || null;
                                     const targetLanguage = detectedLanguage || fallbackLanguage;
                                     const localizedUrl = buildLocalizedUrl(c.req, originUrlPath, targetLanguage, languages, localisedUrls);
-                                    return c.redirect(localizedUrl);
+                                    return createLocaleRedirectResponse(localizedUrl);
                                 }
                                 const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
                                 if (localisedUrlsConfig.enabled) {
                                     const expectedUrl = buildLocalizedUrl(c.req, originUrlPath, language, languages, localisedUrls);
-                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return c.redirect(expectedUrl);
+                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return createLocaleRedirectResponse(expectedUrl);
                                 }
                                 await next();
                             }

package/dist/types/shared/localisedUrls.d.ts

@@ -1,4 +1,10 @@
-import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
+export type LocalisedRoute = {
+    type: 'nested' | 'page';
+    path?: string;
+    id?: string;
+    children?: LocalisedRoute[];
+    [key: string]: any;
+};
 export type LocalisedUrlPathMap = Record<string, string>;
 export type LocalisedUrlsMap = Record<string, LocalisedUrlPathMap>;
 export type LocalisedUrlsOption = boolean | LocalisedUrlsMap;
@@ -21,8 +27,8 @@ export declare const normalisePathname: (pathname: string) => string;
  * failing the build for every route missing from a map they never wrote.
  */
 export declare const resolveLocalisedUrlsConfig: (option: LocalisedUrlsOption | undefined) => ResolvedLocalisedUrlsConfig;
-export declare const validateLocalisedUrls: (routes: (NestedRouteForCli | PageRoute)[], languages: string[], localisedUrls: LocalisedUrlsMap) => void;
-export declare const applyLocalisedUrlsToRoutes: (routes: (NestedRouteForCli | PageRoute)[], languages: string[], localisedUrls: LocalisedUrlsMap) => (NestedRouteForCli | PageRoute)[];
+export declare const validateLocalisedUrls: (routes: LocalisedRoute[], languages: string[], localisedUrls: LocalisedUrlsMap) => void;
+export declare const applyLocalisedUrlsToRoutes: (routes: LocalisedRoute[], languages: string[], localisedUrls: LocalisedUrlsMap) => LocalisedRoute[];
 export declare const matchPathPattern: (pathname: string, pattern: string) => Record<string, string> | null;
 export declare const buildPathFromPattern: (pattern: string, params: Record<string, string>) => string;
 export declare const resolveLocalisedPath: (pathname: string, targetLanguage: string, languages: string[], localisedUrls: LocalisedUrlsMap) => string;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.2",
+  "version": "3.5.0-ultramodern.20",
   "engines": {
     "node": ">=20"
   },
@@ -97,15 +97,15 @@
     "i18next-fs-backend": "^2.6.6",
     "i18next-http-backend": "^4.0.0",
     "i18next-http-middleware": "^3.9.7",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.2",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.2",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.2",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.2"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.20",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.20",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.20",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.20",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.20",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.20"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.5.0-ultramodern.2",
+    "@modern-js/runtime": "3.5.0-ultramodern.20",
     "i18next": ">=26.3.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
@@ -129,8 +129,8 @@
     "react-i18next": "17.0.8",
     "ts-node": "^10.9.2",
     "typescript": "^6.0.3",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.2",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.2"
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.20",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.20"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/server/index.ts

@@ -328,6 +328,16 @@ const buildLocalizedUrl = (
   return localizedUrl;
 };
 
+const createLocaleRedirectResponse = (location: string): Response =>
+  new Response(null, {
+    status: 302,
+    headers: {
+      'Cache-Control': 'private, no-store',
+      Location: location,
+      Vary: 'Accept-Language, Cookie',
+    },
+  });
+
 export const i18nServerPlugin = (options: I18nPluginOptions): ServerPlugin => ({
   name: '@modern-js/plugin-i18n/server',
   setup: api => {
@@ -475,7 +485,7 @@ export const i18nServerPlugin = (options: I18nPluginOptions): ServerPlugin => ({
                   languages,
                   localisedUrls,
                 );
-                return c.redirect(localizedUrl);
+                return createLocaleRedirectResponse(localizedUrl);
               }
               const localisedUrlsConfig =
                 resolveLocalisedUrlsConfig(localisedUrls);
@@ -488,7 +498,7 @@ export const i18nServerPlugin = (options: I18nPluginOptions): ServerPlugin => ({
                   localisedUrls,
                 );
                 if (expectedUrl !== `${pathname}${url.search}${url.hash}`) {
-                  return c.redirect(expectedUrl);
+                  return createLocaleRedirectResponse(expectedUrl);
                 }
               }
               await next();

package/src/shared/localisedUrls.ts

@@ -1,4 +1,10 @@
-import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
+export type LocalisedRoute = {
+  type: 'nested' | 'page';
+  path?: string;
+  id?: string;
+  children?: LocalisedRoute[];
+  [key: string]: any;
+};
 
 export type LocalisedUrlPathMap = Record<string, string>;
 export type LocalisedUrlsMap = Record<string, LocalisedUrlPathMap>;
@@ -144,11 +150,11 @@ const ensureLocalisedUrlsForPath = (
 };
 
 export const validateLocalisedUrls = (
-  routes: (NestedRouteForCli | PageRoute)[],
+  routes: LocalisedRoute[],
   languages: string[],
   localisedUrls: LocalisedUrlsMap,
 ) => {
-  const visit = (route: NestedRouteForCli | PageRoute, parentPath: string) => {
+  const visit = (route: LocalisedRoute, parentPath: string) => {
     const canonicalPath = joinPath(parentPath, route.path);
     if (isLocalisableRoutePath(route.path)) {
       ensureLocalisedUrlsForPath(canonicalPath, languages, localisedUrls);
@@ -191,12 +197,12 @@ const getLocalisedRoutePaths = (
 };
 
 const transformLocalisedRoute = (
-  route: NestedRouteForCli | PageRoute,
+  route: LocalisedRoute,
   parentCanonicalPath: string,
   parentLocalisedPaths: Record<string, string>,
   languages: string[],
   localisedUrls: LocalisedUrlsMap,
-): (NestedRouteForCli | PageRoute)[] => {
+): LocalisedRoute[] => {
   const canonicalPath = joinPath(parentCanonicalPath, route.path);
   const localisedUrlEntry = isLocalisableRoutePath(route.path)
     ? ensureLocalisedUrlsForPath(canonicalPath, languages, localisedUrls)
@@ -224,7 +230,7 @@ const transformLocalisedRoute = (
   const baseRoute = {
     ...route,
     ...(children ? { children } : {}),
-  } as NestedRouteForCli | PageRoute;
+  } as LocalisedRoute;
 
   if (!localisedUrlEntry) {
     return [baseRoute];
@@ -243,7 +249,7 @@ const transformLocalisedRoute = (
 const legalRouteIdPart = (value: string): string =>
   value.replace(/[^a-zA-Z0-9_$-]+/g, '_').replace(/^_+|_+$/g, '') || 'index';
 
-const suffixRouteIds = <T extends NestedRouteForCli | PageRoute>(
+const suffixRouteIds = <T extends LocalisedRoute>(
   route: T,
   suffix: string,
 ): T => {
@@ -260,11 +266,11 @@ const suffixRouteIds = <T extends NestedRouteForCli | PageRoute>(
 };
 
 const cloneRouteWithLocalisedPath = (
-  route: NestedRouteForCli | PageRoute,
+  route: LocalisedRoute,
   path: string,
   index: number,
   canonicalPath: string,
-): NestedRouteForCli | PageRoute => {
+): LocalisedRoute => {
   const leadingLocaleParam = getLeadingLocaleParam(route.path);
   const localisedPath = leadingLocaleParam
     ? normaliseRoutePath(`${leadingLocaleParam}/${path}`)
@@ -272,7 +278,7 @@ const cloneRouteWithLocalisedPath = (
   const routeWithPath = {
     ...route,
     path: localisedPath,
-  } as NestedRouteForCli | PageRoute;
+  } as LocalisedRoute;
   // Language-agnostic source pattern; lets downstream codegen collapse the
   // localized physical variants back to one canonical route.
   (routeWithPath as { modernCanonicalPath?: string }).modernCanonicalPath =
@@ -284,10 +290,10 @@ const cloneRouteWithLocalisedPath = (
 };
 
 export const applyLocalisedUrlsToRoutes = (
-  routes: (NestedRouteForCli | PageRoute)[],
+  routes: LocalisedRoute[],
   languages: string[],
   localisedUrls: LocalisedUrlsMap,
-): (NestedRouteForCli | PageRoute)[] => {
+): LocalisedRoute[] => {
   const rootLocalisedPaths = languages.reduce<Record<string, string>>(
     (acc, language) => {
       acc[language] = '/';

package/tests/linkTypes.test.ts

@@ -3,10 +3,21 @@ import path from 'node:path';
 
 const fixtureDir = path.resolve(__dirname, 'type-fixture');
 
-const tsgoBin = path.join(
-  path.dirname(require.resolve('@typescript/native-preview/package.json')),
-  'bin/tsgo.js',
-);
+function resolveTsgoBin() {
+  const pkgPath = require.resolve('@typescript/native-preview/package.json');
+  const pkgDir = path.dirname(pkgPath);
+  const pkg = require(pkgPath) as {
+    bin?:
+      | string
+      | {
+          tsgo?: string;
+        };
+  };
+  const binEntry = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.tsgo;
+  return path.resolve(pkgDir, binEntry ?? 'bin/tsgo.js');
+}
+
+const tsgoBin = resolveTsgoBin();
 
 describe('Link type-level tests', () => {
   test('fixture type-checks correctly: valid uses compile, invalid uses are rejected', () => {

package/tests/localisedUrls.test.ts

@@ -509,7 +509,6 @@ describe('i18n server API prefix skips', () => {
           header: () => ({ host: 'localhost' }),
         },
         get: () => null,
-        redirect: (url: string) => ({ redirectedTo: url }),
       }) as any;
 
     // Sanity: well-formed non-canonical slugs still redirect.
@@ -517,7 +516,10 @@ describe('i18n server API prefix skips', () => {
       createContext('/cs/products/bota'),
       async () => {},
     );
-    expect(redirected).toEqual({ redirectedTo: '/cs/produkty/bota' });
+    expect(redirected.status).toBe(302);
+    expect(redirected.headers.get('location')).toBe('/cs/produkty/bota');
+    expect(redirected.headers.get('cache-control')).toBe('private, no-store');
+    expect(redirected.headers.get('vary')).toBe('Accept-Language, Cookie');
 
     // Malformed encoding must fall through to next() instead of throwing.
     let nextCalls = 0;