wovn-nextjs 0.0.23 → 0.0.26

package/bin/wovn-nextjs

@@ -38,6 +38,15 @@ async function main() {
         if (process.env.WOVN_DEBUG) {
             console.dir(context, {depth: null})
         }
+    } else if (command === 'update' && context.projectToken && context.hostname) {
+        context.wovnJsData = await httpsRequest(`https://data.wovn.io/js_data/json/1/${context.projectToken}/?u=http%3A%2F%2F${context.hostname}`).then(body => JSON.parse(body.toString()))
+        await walkTsxAndJsx(context, transform)
+        await reportToWovn(context)
+        await overwriteInitializationProcess(context)
+        await createMiddlewareFile(context)
+        if (process.env.WOVN_DEBUG) {
+            console.dir(context, {depth: null})
+        }
     } else if (command === 'enable' && context.projectToken && context.hostname) {
         context.wovnJsData = await httpsRequest(`https://data.wovn.io/js_data/json/1/${context.projectToken}/?u=http%3A%2F%2F${context.hostname}`).then(body => JSON.parse(body.toString()))
         await walkTsxAndJsx(context, transform)
@@ -257,7 +266,7 @@ setTranslations(JSON.parse(${ JSON.stringify(JSON.stringify(context.wovnJsData))
 state.projectToken = ${ JSON.stringify(context.projectToken) }
 state.sourceLanguage = ${ JSON.stringify(context.wovnJsData.language) }
 state.languages = ${ JSON.stringify(context.wovnJsData.convert_langs?.map((lang) => lang.code) || []) };
-wovnMiddlewareConfig.matcher = ${ JSON.stringify(targetLanguages.map(language => '/' + language + '/:path*')) }`
+wovnProxyMiddlewareConfig.matcher = ${ JSON.stringify(targetLanguages.map(language => '/' + language + '/:path*')) }`
     await overwriteJavaScriptFiles('index.js', code => code.split(appendMarker)[0] + indexCode)
     await overwriteJavaScriptFiles('server.js', code => code.split(appendMarker)[0] + serverCode)
 }
@@ -282,7 +291,7 @@ async function overwriteJavaScriptFiles(filename, convert) {
 
 async function overwriteTsxAndJsxFiles(context, convert) {
     const promises = []
-    await walkTsxAndJsx(async (context, source) => {
+    await walkTsxAndJsx(context, async (context, source) => {
         const convertedSource = convert(context, source)
         if (source !== convertedSource) {
             promises.push(fsp.writeFile(context.pathname, convertedSource))
@@ -417,12 +426,12 @@ function isTranslatableAttribute(tag, attr, attrs) {
     return targets && targets.includes(attr)
 }
 
-const middlewarePath = path.join(buildDir, 'middleware.js')
-const targetMiddlewarePaths = ['', 'src'].flatMap(dir => ['.js', '.ts'].flatMap(ext => path.join(buildDir, dir, 'middleware' + ext)))
+const proxyPath = path.join(buildDir, 'proxy.js')
+const targetMiddlewarePaths = ['', 'src'].flatMap(dir => ['.js', '.ts'].flatMap(ext => path.join(buildDir, dir, 'proxy' + ext)))
 
 async function canMiddlewareDelete() {
     try {
-        return (await fsp.readFile(middlewarePath, 'utf-8')).startsWith('// wovn-nextjs-command-appended')
+        return (await fsp.readFile(proxyPath, 'utf-8')).startsWith('// wovn-nextjs-command-appended')
     } catch (e) {
         if (e.message.startsWith('ENOENT:')) {
             return true
@@ -434,21 +443,23 @@ async function canMiddlewareDelete() {
 
 async function createMiddlewareFile(context) {
     const found = targetMiddlewarePaths.find(pathname => fs.existsSync(pathname))
-    if (found && found !== middlewarePath) {
+    if (found && found !== proxyPath) {
         return
     }
-    if (await canMiddlewareDelete(middlewarePath)) {
-        await fsp.writeFile(middlewarePath, `// wovn-nextjs-command-appended
-import { wovnMiddleware as middleware, wovnMiddlewareConfig as config } from 'wovn-nextjs/server';
-export { middleware, config }
+    if (await canMiddlewareDelete(proxyPath)) {
+        await fsp.writeFile(proxyPath, `// wovn-nextjs-command-appended
+import { wovnProxyMiddleware as proxy, wovnProxyMiddlewareConfig } from 'wovn-nextjs/server';
+export { proxy }
+export const config = {}
+Object.assign(config, wovnProxyMiddlewareConfig)
 `)
     }
 }
 
 async function unlinkMiddlewareFileSafely() {
-    if (await canMiddlewareDelete(middlewarePath)) {
+    if (await canMiddlewareDelete(proxyPath)) {
         try {
-            await fsp.unlink(middlewarePath)
+            await fsp.unlink(proxyPath)
         } catch {
             // ignore the error
         }

package/dist/cjs/index.d.ts

@@ -1,6 +1,6 @@
-import type { UrlObject } from "url";
 import { AppContext, AppProps } from "next/app";
 import * as React from "react";
+import { LinkProps } from "next/link";
 import { NextRouter } from "next/router";
 import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
 export declare function t(source: string): string;
@@ -11,33 +11,7 @@ export declare function useTranslation(): {
         changeLanguage(language: string): void;
     };
 };
-export declare const Link: React.ForwardRefExoticComponent<Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, keyof {
-    href: string | UrlObject;
-    as?: string | UrlObject;
-    replace?: boolean;
-    scroll?: boolean;
-    shallow?: boolean;
-    passHref?: boolean;
-    prefetch?: boolean;
-    locale?: string | false;
-    legacyBehavior?: boolean;
-    onMouseEnter?: any;
-    onTouchStart?: any;
-    onClick?: any;
-}> & {
-    href: string | UrlObject;
-    as?: string | UrlObject;
-    replace?: boolean;
-    scroll?: boolean;
-    shallow?: boolean;
-    passHref?: boolean;
-    prefetch?: boolean;
-    locale?: string | false;
-    legacyBehavior?: boolean;
-    onMouseEnter?: any;
-    onTouchStart?: any;
-    onClick?: any;
-} & {
+export declare const Link: React.ForwardRefExoticComponent<Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, keyof LinkProps<any>> & LinkProps<any> & {
     children?: React.ReactNode | undefined;
 } & React.RefAttributes<HTMLAnchorElement>>;
 export declare function usePageRouter(): NextRouter;

package/dist/cjs/index.js

@@ -18,6 +18,8 @@ const server_2 = require("./server");
 const format_url_1 = require("next/dist/shared/lib/router/utils/format-url");
 const router_1 = require("next/router");
 const navigation_1 = require("next/navigation");
+const react_1 = require("react");
+const router_context_shared_runtime_1 = require("next/dist/shared/lib/router-context.shared-runtime");
 function t(source) {
     return wovnInternalT(source);
 }
@@ -31,7 +33,10 @@ function currentLanguage() {
     }
 }
 function useTranslation() {
-    const router = wovnAsyncLocalStorage.getStore() ? (0, router_1.useRouter)() : (0, navigation_1.useRouter)();
+    const isPageRouter = !!(0, react_1.useContext)(router_context_shared_runtime_1.RouterContext);
+    const router = isPageRouter ?
+        (0, router_1.useRouter)() :
+        (0, navigation_1.useRouter)();
     return {
         t,
         i18n: {
@@ -167,7 +172,7 @@ function fetchJsonDataIfNeeded() {
             if (res.status === 200) {
                 res.json().then(setTranslations);
             }
-        });
+        }).catch(e => { }); // Ignore error because most translations are already embedded by deploy
     }
 }
 function translate(source) {
@@ -188,7 +193,8 @@ function get(key) {
     if (server_1.state.isServer) {
         try {
             const s = wovnAsyncLocalStorage.getStore();
-            return s ? s[key] : (0, server_2.headers)().get(key);
+            const t = server_2.workUnitAsyncStorage.getStore();
+            return s ? s[key] : t ? t["headers"]?.get(key) : '';
         }
         catch (e) {
             return e instanceof Error ? `(${e.message})` : '';

package/dist/cjs/server.d.ts

@@ -1,4 +1,4 @@
-export { headers } from "next/headers";
+export { workUnitAsyncStorage } from 'next/dist/server/app-render/work-unit-async-storage.external';
 import { type MiddlewareConfig, NextRequest, NextResponse } from "next/server";
 declare const state: {
     isServer: boolean;
@@ -13,9 +13,9 @@ declare const state: {
         data: string;
     }[]>>;
 };
-declare const wovnMiddlewareConfig: MiddlewareConfig & {
+declare const wovnProxyMiddlewareConfig: MiddlewareConfig & {
     matcher: string[];
 };
-export declare function wovnMiddleware(request: NextRequest): NextResponse<unknown>;
-export { state, wovnMiddlewareConfig };
+export declare function wovnProxyMiddleware(request: NextRequest): NextResponse<unknown>;
+export { state, wovnProxyMiddlewareConfig };
 export declare function log(...args: any[]): void;

package/dist/cjs/server.js

@@ -1,11 +1,11 @@
 "use strict";
 // This will be compiled into .next/server/src/middleware.js that has limitations: https://vercel.com/docs/functions/edge-middleware/limitations
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wovnMiddlewareConfig = exports.state = exports.headers = void 0;
-exports.wovnMiddleware = wovnMiddleware;
+exports.wovnProxyMiddlewareConfig = exports.state = exports.workUnitAsyncStorage = void 0;
+exports.wovnProxyMiddleware = wovnProxyMiddleware;
 exports.log = log;
-var headers_1 = require("next/headers"); // To avoid Next.js errors because index.ts has 'use client' and can not import next/headers
-Object.defineProperty(exports, "headers", { enumerable: true, get: function () { return headers_1.headers; } });
+var work_unit_async_storage_external_1 = require("next/dist/server/app-render/work-unit-async-storage.external"); // To avoid Next.js errors because index.ts has 'use client' and can not import next/headers
+Object.defineProperty(exports, "workUnitAsyncStorage", { enumerable: true, get: function () { return work_unit_async_storage_external_1.workUnitAsyncStorage; } });
 const server_1 = require("next/server");
 const state = {
     isServer: typeof window === 'undefined',
@@ -19,8 +19,8 @@ const state = {
     rawTranslations: {} // [source]?.[currentLanguage()]?.[0]?.data == translation
 };
 exports.state = state;
-const wovnMiddlewareConfig = { matcher: [] }; // this values will be override by wovn-nextjs build command
-exports.wovnMiddlewareConfig = wovnMiddlewareConfig;
+const wovnProxyMiddlewareConfig = { matcher: [] }; // this values will be override by wovn-nextjs build command
+exports.wovnProxyMiddlewareConfig = wovnProxyMiddlewareConfig;
 function rewritePath(targetLanguages, request) {
     if (request.nextUrl.pathname.startsWith('/_next') || request.nextUrl.pathname.startsWith('/favicon')) {
         return server_1.NextResponse.next();
@@ -46,7 +46,7 @@ function rewritePath(targetLanguages, request) {
     log('do not rewrite', request.nextUrl.pathname);
     return server_1.NextResponse.next({ headers });
 }
-function wovnMiddleware(request) {
+function wovnProxyMiddleware(request) {
     return rewritePath(state.languages.filter(l => l !== state.sourceLanguage), request);
 }
 // for debug

package/dist/esm/index.d.ts

@@ -1,6 +1,6 @@
-import type { UrlObject } from "url";
 import { AppContext, AppProps } from "next/app";
 import * as React from "react";
+import { LinkProps } from "next/link";
 import { NextRouter } from "next/router";
 import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
 export declare function t(source: string): string;
@@ -11,33 +11,7 @@ export declare function useTranslation(): {
         changeLanguage(language: string): void;
     };
 };
-export declare const Link: React.ForwardRefExoticComponent<Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, keyof {
-    href: string | UrlObject;
-    as?: string | UrlObject;
-    replace?: boolean;
-    scroll?: boolean;
-    shallow?: boolean;
-    passHref?: boolean;
-    prefetch?: boolean;
-    locale?: string | false;
-    legacyBehavior?: boolean;
-    onMouseEnter?: React.MouseEventHandler<HTMLAnchorElement>;
-    onTouchStart?: React.TouchEventHandler<HTMLAnchorElement>;
-    onClick?: React.MouseEventHandler<HTMLAnchorElement>;
-}> & {
-    href: string | UrlObject;
-    as?: string | UrlObject;
-    replace?: boolean;
-    scroll?: boolean;
-    shallow?: boolean;
-    passHref?: boolean;
-    prefetch?: boolean;
-    locale?: string | false;
-    legacyBehavior?: boolean;
-    onMouseEnter?: React.MouseEventHandler<HTMLAnchorElement>;
-    onTouchStart?: React.TouchEventHandler<HTMLAnchorElement>;
-    onClick?: React.MouseEventHandler<HTMLAnchorElement>;
-} & {
+export declare const Link: React.ForwardRefExoticComponent<Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, keyof LinkProps<any>> & LinkProps<any> & {
     children?: React.ReactNode | undefined;
 } & React.RefAttributes<HTMLAnchorElement>>;
 export declare function usePageRouter(): NextRouter;

package/dist/esm/index.js

@@ -3,10 +3,12 @@ import { state, log } from "./server";
 import App from "next/app";
 import * as React from "react";
 import NextLink from "next/link";
-import { headers } from "./server";
+import { workUnitAsyncStorage } from "./server";
 import { formatUrl } from "next/dist/shared/lib/router/utils/format-url";
 import { useRouter as useInternalPageRouter } from "next/router";
 import { useRouter as useInternalAppRouter } from "next/navigation";
+import { useContext } from "react";
+import { RouterContext } from "next/dist/shared/lib/router-context.shared-runtime";
 export function t(source) {
     return wovnInternalT(source);
 }
@@ -20,7 +22,10 @@ export function currentLanguage() {
     }
 }
 export function useTranslation() {
-    const router = wovnAsyncLocalStorage.getStore() ? useInternalPageRouter() : useInternalAppRouter();
+    const isPageRouter = !!useContext(RouterContext);
+    const router = isPageRouter ?
+        useInternalPageRouter() :
+        useInternalAppRouter();
     return {
         t,
         i18n: {
@@ -156,7 +161,7 @@ function fetchJsonDataIfNeeded() {
             if (res.status === 200) {
                 res.json().then(setTranslations);
             }
-        });
+        }).catch(e => { }); // Ignore error because most translations are already embedded by deploy
     }
 }
 function translate(source) {
@@ -177,7 +182,8 @@ function get(key) {
     if (state.isServer) {
         try {
             const s = wovnAsyncLocalStorage.getStore();
-            return s ? s[key] : headers().get(key);
+            const t = workUnitAsyncStorage.getStore();
+            return s ? s[key] : t ? t["headers"]?.get(key) : '';
         }
         catch (e) {
             return e instanceof Error ? `(${e.message})` : '';

package/dist/esm/server.d.ts

@@ -1,4 +1,4 @@
-export { headers } from "next/headers";
+export { workUnitAsyncStorage } from 'next/dist/server/app-render/work-unit-async-storage.external';
 import { type MiddlewareConfig, NextRequest, NextResponse } from "next/server";
 declare const state: {
     isServer: boolean;
@@ -13,9 +13,9 @@ declare const state: {
         data: string;
     }[]>>;
 };
-declare const wovnMiddlewareConfig: MiddlewareConfig & {
+declare const wovnProxyMiddlewareConfig: MiddlewareConfig & {
     matcher: string[];
 };
-export declare function wovnMiddleware(request: NextRequest): NextResponse<unknown>;
-export { state, wovnMiddlewareConfig };
+export declare function wovnProxyMiddleware(request: NextRequest): NextResponse<unknown>;
+export { state, wovnProxyMiddlewareConfig };
 export declare function log(...args: any[]): void;

package/dist/esm/server.js

@@ -1,5 +1,5 @@
 // This will be compiled into .next/server/src/middleware.js that has limitations: https://vercel.com/docs/functions/edge-middleware/limitations
-export { headers } from "next/headers"; // To avoid Next.js errors because index.ts has 'use client' and can not import next/headers
+export { workUnitAsyncStorage } from 'next/dist/server/app-render/work-unit-async-storage.external'; // To avoid Next.js errors because index.ts has 'use client' and can not import next/headers
 import { NextResponse } from "next/server";
 const state = {
     isServer: typeof window === 'undefined',
@@ -12,7 +12,7 @@ const state = {
     translations: {}, // [language][major][minor] == translation
     rawTranslations: {} // [source]?.[currentLanguage()]?.[0]?.data == translation
 };
-const wovnMiddlewareConfig = { matcher: [] }; // this values will be override by wovn-nextjs build command
+const wovnProxyMiddlewareConfig = { matcher: [] }; // this values will be override by wovn-nextjs build command
 function rewritePath(targetLanguages, request) {
     if (request.nextUrl.pathname.startsWith('/_next') || request.nextUrl.pathname.startsWith('/favicon')) {
         return NextResponse.next();
@@ -38,10 +38,10 @@ function rewritePath(targetLanguages, request) {
     log('do not rewrite', request.nextUrl.pathname);
     return NextResponse.next({ headers });
 }
-export function wovnMiddleware(request) {
+export function wovnProxyMiddleware(request) {
     return rewritePath(state.languages.filter(l => l !== state.sourceLanguage), request);
 }
-export { state, wovnMiddlewareConfig };
+export { state, wovnProxyMiddlewareConfig };
 // for debug
 export function log(...args) {
     if (state.debug) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wovn-nextjs",
-  "version": "0.0.23",
+  "version": "0.0.26",
   "description": "Localize the Next.js web application without changing the code",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -41,26 +41,26 @@
   "author": "",
   "license": "UNLICENSED",
   "volta": {
-    "node": "20.16.0"
+    "node": "v24.4.1"
   },
   "devDependencies": {
-    "@types/react": "^18.3.7",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
     "jsdom": "^25.0.0",
     "tsx": "^4.19.1",
-    "typescript": "5.5.4",
+    "typescript": "5.8.3",
     "typescript-eslint": "^8.0.0"
   },
   "bundledDependencies": [
     "typescript-eslint"
   ],
   "peerDependencies": {
-    "@types/node": "^20.0.0",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "next": "^14.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "@types/node": "^24.0.0",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
+    "next": "^16.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "bundleDependencies": [
     "typescript-eslint"