react-intlayer 3.5.0 → 3.5.2
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.
- package/dist/cjs/vite/intlayerMiddlewarePlugin.cjs +1 -6
- package/dist/cjs/vite/intlayerMiddlewarePlugin.cjs.map +1 -1
- package/dist/cjs/vite/intlayerPlugin.cjs +3 -3
- package/dist/cjs/vite/intlayerPlugin.cjs.map +1 -1
- package/dist/esm/vite/intlayerMiddlewarePlugin.mjs +1 -6
- package/dist/esm/vite/intlayerMiddlewarePlugin.mjs.map +1 -1
- package/dist/esm/vite/intlayerPlugin.mjs +3 -3
- package/dist/esm/vite/intlayerPlugin.mjs.map +1 -1
- package/dist/types/vite/intlayerMiddlewarePlugin.d.ts.map +1 -1
- package/dist/types/vite/intlayerPlugin.d.ts.map +1 -1
- package/package.json +13 -13
|
@@ -66,12 +66,7 @@ const intLayerMiddlewarePlugin = (_pluginOptions = {}) => ({
|
|
|
66
66
|
return res.end();
|
|
67
67
|
}
|
|
68
68
|
if (pathLocale.toString() === defaultLocale.toString() && !prefixDefault) {
|
|
69
|
-
req.url = (0, import_core.getPathWithoutLocale)(
|
|
70
|
-
originalUrl,
|
|
71
|
-
prefixDefault,
|
|
72
|
-
pathLocale,
|
|
73
|
-
defaultLocale
|
|
74
|
-
);
|
|
69
|
+
req.url = (0, import_core.getPathWithoutLocale)(originalUrl, supportedLocales);
|
|
75
70
|
res.writeHead(301, { Location: req.url });
|
|
76
71
|
return res.end();
|
|
77
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/vite/intlayerMiddlewarePlugin.ts"],"sourcesContent":["import { getConfiguration, Locales } from '@intlayer/config';\nimport {\n getPathWithoutLocale,\n localeDetector as localeDetector,\n} from '@intlayer/core';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport { type Plugin } from 'vite';\n\nconst intlayerConfig = getConfiguration();\nconst { internationalization, middleware } = intlayerConfig;\n\nconst { locales: supportedLocales, defaultLocale } = internationalization;\nconst { cookieName, headerName, prefixDefault } = middleware;\n\n/**\n * A Vite plugin that integrates IntLayer middleware into the build process\n *\n * ```ts\n * // Example usage of the plugin in a Vite configuration\n * export default defineConfig({\n * plugins: [ intLayerMiddlewarePlugin() ],\n * });\n * ```\n */\nexport const intLayerMiddlewarePlugin = (_pluginOptions = {}): Plugin => ({\n name: 'vite-intlayer-middleware-plugin',\n\n configureServer: (server) => {\n // server.middlewares is a Connect instance; you can add middleware here\n server.middlewares.use((req, res, next) => {\n // Skip if request looks like a static asset or internal Vite request\n if (\n req.url?.startsWith('/node_modules') ||\n req.url?.startsWith('/@') ||\n req.url?.split('?')[0].match(/\\.[a-z]+$/i) // checks if URL has a file extension\n ) {\n return next();\n }\n\n const originalUrl = req.url ?? '/';\n\n const cookies = parseCookies(req.headers.cookie ?? '');\n const cookieLocale = cookies[cookieName];\n\n const headers = req.headers;\n const headerLocale = headers[headerName];\n\n const pathParts = originalUrl.split('?')[0].split('/').filter(Boolean);\n\n const firstPart = pathParts[0] as unknown as Locales;\n\n const pathLocale =\n pathParts[0] && supportedLocales.includes(firstPart)\n ? pathParts[0]\n : undefined;\n\n if (!pathLocale) {\n let locale;\n\n // Try to get the locale from the request cookies\n if (\n !locale &&\n cookieLocale &&\n supportedLocales.includes(cookieLocale as Locales)\n ) {\n locale = cookieLocale as Locales;\n }\n\n // Try to get the locale from the request headers\n if (\n !locale &&\n headerLocale &&\n supportedLocales.includes(headerLocale as Locales)\n ) {\n locale = headerLocale as Locales;\n }\n\n // Get the locale from the negotiator\n if (!locale) {\n const detectedLocale = localeDetector(\n headers as Record<string, string>,\n supportedLocales,\n defaultLocale\n );\n locale = detectedLocale;\n }\n\n // Instead of redirecting, try rewriting internally:\n req.url = formatUrlWithLocale(originalUrl, locale);\n\n if (req.url === originalUrl) {\n return next();\n }\n\n res.writeHead(301, { Location: req.url });\n return res.end();\n }\n\n if (\n pathLocale.toString() === defaultLocale.toString() &&\n !prefixDefault\n ) {\n req.url = getPathWithoutLocale(
|
|
1
|
+
{"version":3,"sources":["../../../src/vite/intlayerMiddlewarePlugin.ts"],"sourcesContent":["import { getConfiguration, Locales } from '@intlayer/config';\nimport {\n getPathWithoutLocale,\n localeDetector as localeDetector,\n} from '@intlayer/core';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport { type Plugin } from 'vite';\n\nconst intlayerConfig = getConfiguration();\nconst { internationalization, middleware } = intlayerConfig;\n\nconst { locales: supportedLocales, defaultLocale } = internationalization;\nconst { cookieName, headerName, prefixDefault } = middleware;\n\n/**\n * A Vite plugin that integrates IntLayer middleware into the build process\n *\n * ```ts\n * // Example usage of the plugin in a Vite configuration\n * export default defineConfig({\n * plugins: [ intLayerMiddlewarePlugin() ],\n * });\n * ```\n */\nexport const intLayerMiddlewarePlugin = (_pluginOptions = {}): Plugin => ({\n name: 'vite-intlayer-middleware-plugin',\n\n configureServer: (server) => {\n // server.middlewares is a Connect instance; you can add middleware here\n server.middlewares.use((req, res, next) => {\n // Skip if request looks like a static asset or internal Vite request\n if (\n req.url?.startsWith('/node_modules') ||\n req.url?.startsWith('/@') ||\n req.url?.split('?')[0].match(/\\.[a-z]+$/i) // checks if URL has a file extension\n ) {\n return next();\n }\n\n const originalUrl = req.url ?? '/';\n\n const cookies = parseCookies(req.headers.cookie ?? '');\n const cookieLocale = cookies[cookieName];\n\n const headers = req.headers;\n const headerLocale = headers[headerName];\n\n const pathParts = originalUrl.split('?')[0].split('/').filter(Boolean);\n\n const firstPart = pathParts[0] as unknown as Locales;\n\n const pathLocale =\n pathParts[0] && supportedLocales.includes(firstPart)\n ? pathParts[0]\n : undefined;\n\n if (!pathLocale) {\n let locale;\n\n // Try to get the locale from the request cookies\n if (\n !locale &&\n cookieLocale &&\n supportedLocales.includes(cookieLocale as Locales)\n ) {\n locale = cookieLocale as Locales;\n }\n\n // Try to get the locale from the request headers\n if (\n !locale &&\n headerLocale &&\n supportedLocales.includes(headerLocale as Locales)\n ) {\n locale = headerLocale as Locales;\n }\n\n // Get the locale from the negotiator\n if (!locale) {\n const detectedLocale = localeDetector(\n headers as Record<string, string>,\n supportedLocales,\n defaultLocale\n );\n locale = detectedLocale;\n }\n\n // Instead of redirecting, try rewriting internally:\n req.url = formatUrlWithLocale(originalUrl, locale);\n\n if (req.url === originalUrl) {\n return next();\n }\n\n res.writeHead(301, { Location: req.url });\n return res.end();\n }\n\n if (\n pathLocale.toString() === defaultLocale.toString() &&\n !prefixDefault\n ) {\n req.url = getPathWithoutLocale(originalUrl, supportedLocales);\n\n res.writeHead(301, { Location: req.url });\n return res.end();\n }\n\n return next();\n });\n },\n});\n\n// Simple cookie parser:\nconst parseCookies = (cookieHeader: string) =>\n cookieHeader.split(';').reduce(\n (acc, cookie) => {\n const [key, val] = cookie.trim().split('=');\n acc[key as keyof typeof acc] = val;\n return acc;\n },\n {} as Record<string, string>\n );\n\nconst formatUrlWithLocale = (url: string, locale: Locales) => {\n if (locale.toString() === defaultLocale.toString()) {\n if (prefixDefault) {\n return `/${locale}${url}`;\n }\n\n return url;\n }\n\n return `/${locale}${url}`;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0C;AAC1C,kBAGO;AAIP,MAAM,qBAAiB,gCAAiB;AACxC,MAAM,EAAE,sBAAsB,WAAW,IAAI;AAE7C,MAAM,EAAE,SAAS,kBAAkB,cAAc,IAAI;AACrD,MAAM,EAAE,YAAY,YAAY,cAAc,IAAI;AAY3C,MAAM,2BAA2B,CAAC,iBAAiB,CAAC,OAAe;AAAA,EACxE,MAAM;AAAA,EAEN,iBAAiB,CAAC,WAAW;AAE3B,WAAO,YAAY,IAAI,CAAC,KAAK,KAAK,SAAS;AAEzC,UACE,IAAI,KAAK,WAAW,eAAe,KACnC,IAAI,KAAK,WAAW,IAAI,KACxB,IAAI,KAAK,MAAM,GAAG,EAAE,CAAC,EAAE,MAAM,YAAY,GACzC;AACA,eAAO,KAAK;AAAA,MACd;AAEA,YAAM,cAAc,IAAI,OAAO;AAE/B,YAAM,UAAU,aAAa,IAAI,QAAQ,UAAU,EAAE;AACrD,YAAM,eAAe,QAAQ,UAAU;AAEvC,YAAM,UAAU,IAAI;AACpB,YAAM,eAAe,QAAQ,UAAU;AAEvC,YAAM,YAAY,YAAY,MAAM,GAAG,EAAE,CAAC,EAAE,MAAM,GAAG,EAAE,OAAO,OAAO;AAErE,YAAM,YAAY,UAAU,CAAC;AAE7B,YAAM,aACJ,UAAU,CAAC,KAAK,iBAAiB,SAAS,SAAS,IAC/C,UAAU,CAAC,IACX;AAEN,UAAI,CAAC,YAAY;AACf,YAAI;AAGJ,YACE,CAAC,UACD,gBACA,iBAAiB,SAAS,YAAuB,GACjD;AACA,mBAAS;AAAA,QACX;AAGA,YACE,CAAC,UACD,gBACA,iBAAiB,SAAS,YAAuB,GACjD;AACA,mBAAS;AAAA,QACX;AAGA,YAAI,CAAC,QAAQ;AACX,gBAAM,qBAAiB;AAAA,YACrB;AAAA,YACA;AAAA,YACA;AAAA,UACF;AACA,mBAAS;AAAA,QACX;AAGA,YAAI,MAAM,oBAAoB,aAAa,MAAM;AAEjD,YAAI,IAAI,QAAQ,aAAa;AAC3B,iBAAO,KAAK;AAAA,QACd;AAEA,YAAI,UAAU,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC;AACxC,eAAO,IAAI,IAAI;AAAA,MACjB;AAEA,UACE,WAAW,SAAS,MAAM,cAAc,SAAS,KACjD,CAAC,eACD;AACA,YAAI,UAAM,kCAAqB,aAAa,gBAAgB;AAE5D,YAAI,UAAU,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC;AACxC,eAAO,IAAI,IAAI;AAAA,MACjB;AAEA,aAAO,KAAK;AAAA,IACd,CAAC;AAAA,EACH;AACF;AAGA,MAAM,eAAe,CAAC,iBACpB,aAAa,MAAM,GAAG,EAAE;AAAA,EACtB,CAAC,KAAK,WAAW;AACf,UAAM,CAAC,KAAK,GAAG,IAAI,OAAO,KAAK,EAAE,MAAM,GAAG;AAC1C,QAAI,GAAuB,IAAI;AAC/B,WAAO;AAAA,EACT;AAAA,EACA,CAAC;AACH;AAEF,MAAM,sBAAsB,CAAC,KAAa,WAAoB;AAC5D,MAAI,OAAO,SAAS,MAAM,cAAc,SAAS,GAAG;AAClD,QAAI,eAAe;AACjB,aAAO,IAAI,MAAM,GAAG,GAAG;AAAA,IACzB;AAEA,WAAO;AAAA,EACT;AAEA,SAAO,IAAI,MAAM,GAAG,GAAG;AACzB;","names":[]}
|
|
@@ -38,7 +38,7 @@ var import_config = require("@intlayer/config");
|
|
|
38
38
|
var import_vite = require("vite");
|
|
39
39
|
const intLayerPlugin = (_pluginOptions = {}) => ({
|
|
40
40
|
name: "vite-intlayer-plugin",
|
|
41
|
-
config(config, { mode }) {
|
|
41
|
+
config: (config, { mode }) => {
|
|
42
42
|
const intlayerConfig = (0, import_config.getConfiguration)();
|
|
43
43
|
const { mainDir, baseDir, watch: isWatchMode } = intlayerConfig.content;
|
|
44
44
|
const env = (0, import_config.formatEnvVariable)("vite");
|
|
@@ -75,10 +75,10 @@ const intLayerPlugin = (_pluginOptions = {}) => ({
|
|
|
75
75
|
};
|
|
76
76
|
return config;
|
|
77
77
|
},
|
|
78
|
-
buildStart() {
|
|
78
|
+
buildStart: () => {
|
|
79
79
|
(0, import_chokidar.watch)();
|
|
80
80
|
},
|
|
81
|
-
configureServer() {
|
|
81
|
+
configureServer: () => {
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/vite/intlayerPlugin.ts"],"sourcesContent":["import { join, relative, resolve } from 'path';\nimport process from 'process';\nimport { watch } from '@intlayer/chokidar';\nimport { getConfiguration, formatEnvVariable } from '@intlayer/config';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport {
|
|
1
|
+
{"version":3,"sources":["../../../src/vite/intlayerPlugin.ts"],"sourcesContent":["import { join, relative, resolve } from 'path';\nimport process from 'process';\nimport { watch } from '@intlayer/chokidar';\nimport { getConfiguration, formatEnvVariable } from '@intlayer/config';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport { loadEnv, type Plugin } from 'vite';\n\n// Plugin options type definition\ntype PluginOptions = {\n // Custom options for your plugin, if any\n};\n\n/**\n *\n * A Vite plugin that integrates IntLayer configuration into the build process\n *\n * ```ts\n * // Example usage of the plugin in a Vite configuration\n * export default defineConfig({\n * plugins: [ intLayerPlugin() ],\n * });\n * ```\n * */\nexport const intLayerPlugin = (_pluginOptions: PluginOptions = {}): Plugin => ({\n name: 'vite-intlayer-plugin',\n\n config: (config, { mode }) => {\n const intlayerConfig = getConfiguration();\n const { mainDir, baseDir, watch: isWatchMode } = intlayerConfig.content;\n\n // Set all configuration values as environment variables\n const env = formatEnvVariable('vite');\n\n process.env = {\n ...process.env,\n ...loadEnv(mode, process.cwd()),\n ...env,\n };\n\n const dictionariesPath = join(mainDir, 'dictionaries.mjs');\n const relativeDictionariesPath = relative(baseDir, dictionariesPath);\n\n // Update Vite's resolve alias\n config.resolve = {\n ...config.resolve,\n alias: {\n ...config.resolve?.alias,\n '@intlayer/dictionaries-entry': resolve(relativeDictionariesPath),\n },\n };\n\n if (isWatchMode) {\n // Ajout de l'option optimizeDeps.exclude\n config.optimizeDeps = {\n ...config.optimizeDeps,\n exclude: [\n ...(config.optimizeDeps?.exclude || []),\n '@intlayer/dictionaries-entry',\n ],\n };\n }\n\n const externals: string[] = (config.build?.rollupOptions?.external ??\n []) as string[];\n\n config.build = {\n ...config.build,\n rollupOptions: {\n ...config.build?.rollupOptions,\n external: [...externals, 'module'],\n },\n };\n\n return config;\n },\n\n buildStart: () => {\n // Code to run when Vite build starts\n watch();\n },\n configureServer: () => {\n // Custom server configuration, if needed\n },\n});\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwC;AACxC,qBAAoB;AACpB,sBAAsB;AACtB,oBAAoD;AAEpD,kBAAqC;AAkB9B,MAAM,iBAAiB,CAAC,iBAAgC,CAAC,OAAe;AAAA,EAC7E,MAAM;AAAA,EAEN,QAAQ,CAAC,QAAQ,EAAE,KAAK,MAAM;AAC5B,UAAM,qBAAiB,gCAAiB;AACxC,UAAM,EAAE,SAAS,SAAS,OAAO,YAAY,IAAI,eAAe;AAGhE,UAAM,UAAM,iCAAkB,MAAM;AAEpC,mBAAAA,QAAQ,MAAM;AAAA,MACZ,GAAG,eAAAA,QAAQ;AAAA,MACX,OAAG,qBAAQ,MAAM,eAAAA,QAAQ,IAAI,CAAC;AAAA,MAC9B,GAAG;AAAA,IACL;AAEA,UAAM,uBAAmB,kBAAK,SAAS,kBAAkB;AACzD,UAAM,+BAA2B,sBAAS,SAAS,gBAAgB;AAGnE,WAAO,UAAU;AAAA,MACf,GAAG,OAAO;AAAA,MACV,OAAO;AAAA,QACL,GAAG,OAAO,SAAS;AAAA,QACnB,oCAAgC,qBAAQ,wBAAwB;AAAA,MAClE;AAAA,IACF;AAEA,QAAI,aAAa;AAEf,aAAO,eAAe;AAAA,QACpB,GAAG,OAAO;AAAA,QACV,SAAS;AAAA,UACP,GAAI,OAAO,cAAc,WAAW,CAAC;AAAA,UACrC;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,YAAuB,OAAO,OAAO,eAAe,YACxD,CAAC;AAEH,WAAO,QAAQ;AAAA,MACb,GAAG,OAAO;AAAA,MACV,eAAe;AAAA,QACb,GAAG,OAAO,OAAO;AAAA,QACjB,UAAU,CAAC,GAAG,WAAW,QAAQ;AAAA,MACnC;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,YAAY,MAAM;AAEhB,+BAAM;AAAA,EACR;AAAA,EACA,iBAAiB,MAAM;AAAA,EAEvB;AACF;","names":["process"]}
|
|
@@ -47,12 +47,7 @@ const intLayerMiddlewarePlugin = (_pluginOptions = {}) => ({
|
|
|
47
47
|
return res.end();
|
|
48
48
|
}
|
|
49
49
|
if (pathLocale.toString() === defaultLocale.toString() && !prefixDefault) {
|
|
50
|
-
req.url = getPathWithoutLocale(
|
|
51
|
-
originalUrl,
|
|
52
|
-
prefixDefault,
|
|
53
|
-
pathLocale,
|
|
54
|
-
defaultLocale
|
|
55
|
-
);
|
|
50
|
+
req.url = getPathWithoutLocale(originalUrl, supportedLocales);
|
|
56
51
|
res.writeHead(301, { Location: req.url });
|
|
57
52
|
return res.end();
|
|
58
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/vite/intlayerMiddlewarePlugin.ts"],"sourcesContent":["import { getConfiguration, Locales } from '@intlayer/config';\nimport {\n getPathWithoutLocale,\n localeDetector as localeDetector,\n} from '@intlayer/core';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport { type Plugin } from 'vite';\n\nconst intlayerConfig = getConfiguration();\nconst { internationalization, middleware } = intlayerConfig;\n\nconst { locales: supportedLocales, defaultLocale } = internationalization;\nconst { cookieName, headerName, prefixDefault } = middleware;\n\n/**\n * A Vite plugin that integrates IntLayer middleware into the build process\n *\n * ```ts\n * // Example usage of the plugin in a Vite configuration\n * export default defineConfig({\n * plugins: [ intLayerMiddlewarePlugin() ],\n * });\n * ```\n */\nexport const intLayerMiddlewarePlugin = (_pluginOptions = {}): Plugin => ({\n name: 'vite-intlayer-middleware-plugin',\n\n configureServer: (server) => {\n // server.middlewares is a Connect instance; you can add middleware here\n server.middlewares.use((req, res, next) => {\n // Skip if request looks like a static asset or internal Vite request\n if (\n req.url?.startsWith('/node_modules') ||\n req.url?.startsWith('/@') ||\n req.url?.split('?')[0].match(/\\.[a-z]+$/i) // checks if URL has a file extension\n ) {\n return next();\n }\n\n const originalUrl = req.url ?? '/';\n\n const cookies = parseCookies(req.headers.cookie ?? '');\n const cookieLocale = cookies[cookieName];\n\n const headers = req.headers;\n const headerLocale = headers[headerName];\n\n const pathParts = originalUrl.split('?')[0].split('/').filter(Boolean);\n\n const firstPart = pathParts[0] as unknown as Locales;\n\n const pathLocale =\n pathParts[0] && supportedLocales.includes(firstPart)\n ? pathParts[0]\n : undefined;\n\n if (!pathLocale) {\n let locale;\n\n // Try to get the locale from the request cookies\n if (\n !locale &&\n cookieLocale &&\n supportedLocales.includes(cookieLocale as Locales)\n ) {\n locale = cookieLocale as Locales;\n }\n\n // Try to get the locale from the request headers\n if (\n !locale &&\n headerLocale &&\n supportedLocales.includes(headerLocale as Locales)\n ) {\n locale = headerLocale as Locales;\n }\n\n // Get the locale from the negotiator\n if (!locale) {\n const detectedLocale = localeDetector(\n headers as Record<string, string>,\n supportedLocales,\n defaultLocale\n );\n locale = detectedLocale;\n }\n\n // Instead of redirecting, try rewriting internally:\n req.url = formatUrlWithLocale(originalUrl, locale);\n\n if (req.url === originalUrl) {\n return next();\n }\n\n res.writeHead(301, { Location: req.url });\n return res.end();\n }\n\n if (\n pathLocale.toString() === defaultLocale.toString() &&\n !prefixDefault\n ) {\n req.url = getPathWithoutLocale(
|
|
1
|
+
{"version":3,"sources":["../../../src/vite/intlayerMiddlewarePlugin.ts"],"sourcesContent":["import { getConfiguration, Locales } from '@intlayer/config';\nimport {\n getPathWithoutLocale,\n localeDetector as localeDetector,\n} from '@intlayer/core';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport { type Plugin } from 'vite';\n\nconst intlayerConfig = getConfiguration();\nconst { internationalization, middleware } = intlayerConfig;\n\nconst { locales: supportedLocales, defaultLocale } = internationalization;\nconst { cookieName, headerName, prefixDefault } = middleware;\n\n/**\n * A Vite plugin that integrates IntLayer middleware into the build process\n *\n * ```ts\n * // Example usage of the plugin in a Vite configuration\n * export default defineConfig({\n * plugins: [ intLayerMiddlewarePlugin() ],\n * });\n * ```\n */\nexport const intLayerMiddlewarePlugin = (_pluginOptions = {}): Plugin => ({\n name: 'vite-intlayer-middleware-plugin',\n\n configureServer: (server) => {\n // server.middlewares is a Connect instance; you can add middleware here\n server.middlewares.use((req, res, next) => {\n // Skip if request looks like a static asset or internal Vite request\n if (\n req.url?.startsWith('/node_modules') ||\n req.url?.startsWith('/@') ||\n req.url?.split('?')[0].match(/\\.[a-z]+$/i) // checks if URL has a file extension\n ) {\n return next();\n }\n\n const originalUrl = req.url ?? '/';\n\n const cookies = parseCookies(req.headers.cookie ?? '');\n const cookieLocale = cookies[cookieName];\n\n const headers = req.headers;\n const headerLocale = headers[headerName];\n\n const pathParts = originalUrl.split('?')[0].split('/').filter(Boolean);\n\n const firstPart = pathParts[0] as unknown as Locales;\n\n const pathLocale =\n pathParts[0] && supportedLocales.includes(firstPart)\n ? pathParts[0]\n : undefined;\n\n if (!pathLocale) {\n let locale;\n\n // Try to get the locale from the request cookies\n if (\n !locale &&\n cookieLocale &&\n supportedLocales.includes(cookieLocale as Locales)\n ) {\n locale = cookieLocale as Locales;\n }\n\n // Try to get the locale from the request headers\n if (\n !locale &&\n headerLocale &&\n supportedLocales.includes(headerLocale as Locales)\n ) {\n locale = headerLocale as Locales;\n }\n\n // Get the locale from the negotiator\n if (!locale) {\n const detectedLocale = localeDetector(\n headers as Record<string, string>,\n supportedLocales,\n defaultLocale\n );\n locale = detectedLocale;\n }\n\n // Instead of redirecting, try rewriting internally:\n req.url = formatUrlWithLocale(originalUrl, locale);\n\n if (req.url === originalUrl) {\n return next();\n }\n\n res.writeHead(301, { Location: req.url });\n return res.end();\n }\n\n if (\n pathLocale.toString() === defaultLocale.toString() &&\n !prefixDefault\n ) {\n req.url = getPathWithoutLocale(originalUrl, supportedLocales);\n\n res.writeHead(301, { Location: req.url });\n return res.end();\n }\n\n return next();\n });\n },\n});\n\n// Simple cookie parser:\nconst parseCookies = (cookieHeader: string) =>\n cookieHeader.split(';').reduce(\n (acc, cookie) => {\n const [key, val] = cookie.trim().split('=');\n acc[key as keyof typeof acc] = val;\n return acc;\n },\n {} as Record<string, string>\n );\n\nconst formatUrlWithLocale = (url: string, locale: Locales) => {\n if (locale.toString() === defaultLocale.toString()) {\n if (prefixDefault) {\n return `/${locale}${url}`;\n }\n\n return url;\n }\n\n return `/${locale}${url}`;\n};\n"],"mappings":";AAAA,SAAS,wBAAiC;AAC1C;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAIP,MAAM,iBAAiB,iBAAiB;AACxC,MAAM,EAAE,sBAAsB,WAAW,IAAI;AAE7C,MAAM,EAAE,SAAS,kBAAkB,cAAc,IAAI;AACrD,MAAM,EAAE,YAAY,YAAY,cAAc,IAAI;AAY3C,MAAM,2BAA2B,CAAC,iBAAiB,CAAC,OAAe;AAAA,EACxE,MAAM;AAAA,EAEN,iBAAiB,CAAC,WAAW;AAE3B,WAAO,YAAY,IAAI,CAAC,KAAK,KAAK,SAAS;AAEzC,UACE,IAAI,KAAK,WAAW,eAAe,KACnC,IAAI,KAAK,WAAW,IAAI,KACxB,IAAI,KAAK,MAAM,GAAG,EAAE,CAAC,EAAE,MAAM,YAAY,GACzC;AACA,eAAO,KAAK;AAAA,MACd;AAEA,YAAM,cAAc,IAAI,OAAO;AAE/B,YAAM,UAAU,aAAa,IAAI,QAAQ,UAAU,EAAE;AACrD,YAAM,eAAe,QAAQ,UAAU;AAEvC,YAAM,UAAU,IAAI;AACpB,YAAM,eAAe,QAAQ,UAAU;AAEvC,YAAM,YAAY,YAAY,MAAM,GAAG,EAAE,CAAC,EAAE,MAAM,GAAG,EAAE,OAAO,OAAO;AAErE,YAAM,YAAY,UAAU,CAAC;AAE7B,YAAM,aACJ,UAAU,CAAC,KAAK,iBAAiB,SAAS,SAAS,IAC/C,UAAU,CAAC,IACX;AAEN,UAAI,CAAC,YAAY;AACf,YAAI;AAGJ,YACE,CAAC,UACD,gBACA,iBAAiB,SAAS,YAAuB,GACjD;AACA,mBAAS;AAAA,QACX;AAGA,YACE,CAAC,UACD,gBACA,iBAAiB,SAAS,YAAuB,GACjD;AACA,mBAAS;AAAA,QACX;AAGA,YAAI,CAAC,QAAQ;AACX,gBAAM,iBAAiB;AAAA,YACrB;AAAA,YACA;AAAA,YACA;AAAA,UACF;AACA,mBAAS;AAAA,QACX;AAGA,YAAI,MAAM,oBAAoB,aAAa,MAAM;AAEjD,YAAI,IAAI,QAAQ,aAAa;AAC3B,iBAAO,KAAK;AAAA,QACd;AAEA,YAAI,UAAU,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC;AACxC,eAAO,IAAI,IAAI;AAAA,MACjB;AAEA,UACE,WAAW,SAAS,MAAM,cAAc,SAAS,KACjD,CAAC,eACD;AACA,YAAI,MAAM,qBAAqB,aAAa,gBAAgB;AAE5D,YAAI,UAAU,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC;AACxC,eAAO,IAAI,IAAI;AAAA,MACjB;AAEA,aAAO,KAAK;AAAA,IACd,CAAC;AAAA,EACH;AACF;AAGA,MAAM,eAAe,CAAC,iBACpB,aAAa,MAAM,GAAG,EAAE;AAAA,EACtB,CAAC,KAAK,WAAW;AACf,UAAM,CAAC,KAAK,GAAG,IAAI,OAAO,KAAK,EAAE,MAAM,GAAG;AAC1C,QAAI,GAAuB,IAAI;AAC/B,WAAO;AAAA,EACT;AAAA,EACA,CAAC;AACH;AAEF,MAAM,sBAAsB,CAAC,KAAa,WAAoB;AAC5D,MAAI,OAAO,SAAS,MAAM,cAAc,SAAS,GAAG;AAClD,QAAI,eAAe;AACjB,aAAO,IAAI,MAAM,GAAG,GAAG;AAAA,IACzB;AAEA,WAAO;AAAA,EACT;AAEA,SAAO,IAAI,MAAM,GAAG,GAAG;AACzB;","names":[]}
|
|
@@ -6,7 +6,7 @@ import { getConfiguration, formatEnvVariable } from "@intlayer/config";
|
|
|
6
6
|
import { loadEnv } from "vite";
|
|
7
7
|
const intLayerPlugin = (_pluginOptions = {}) => ({
|
|
8
8
|
name: "vite-intlayer-plugin",
|
|
9
|
-
config(config, { mode }) {
|
|
9
|
+
config: (config, { mode }) => {
|
|
10
10
|
const intlayerConfig = getConfiguration();
|
|
11
11
|
const { mainDir, baseDir, watch: isWatchMode } = intlayerConfig.content;
|
|
12
12
|
const env = formatEnvVariable("vite");
|
|
@@ -43,10 +43,10 @@ const intLayerPlugin = (_pluginOptions = {}) => ({
|
|
|
43
43
|
};
|
|
44
44
|
return config;
|
|
45
45
|
},
|
|
46
|
-
buildStart() {
|
|
46
|
+
buildStart: () => {
|
|
47
47
|
watch();
|
|
48
48
|
},
|
|
49
|
-
configureServer() {
|
|
49
|
+
configureServer: () => {
|
|
50
50
|
}
|
|
51
51
|
});
|
|
52
52
|
export {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/vite/intlayerPlugin.ts"],"sourcesContent":["import { join, relative, resolve } from 'path';\nimport process from 'process';\nimport { watch } from '@intlayer/chokidar';\nimport { getConfiguration, formatEnvVariable } from '@intlayer/config';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport {
|
|
1
|
+
{"version":3,"sources":["../../../src/vite/intlayerPlugin.ts"],"sourcesContent":["import { join, relative, resolve } from 'path';\nimport process from 'process';\nimport { watch } from '@intlayer/chokidar';\nimport { getConfiguration, formatEnvVariable } from '@intlayer/config';\n// @ts-ignore - Fix error Module '\"vite\"' has no exported member\nimport { loadEnv, type Plugin } from 'vite';\n\n// Plugin options type definition\ntype PluginOptions = {\n // Custom options for your plugin, if any\n};\n\n/**\n *\n * A Vite plugin that integrates IntLayer configuration into the build process\n *\n * ```ts\n * // Example usage of the plugin in a Vite configuration\n * export default defineConfig({\n * plugins: [ intLayerPlugin() ],\n * });\n * ```\n * */\nexport const intLayerPlugin = (_pluginOptions: PluginOptions = {}): Plugin => ({\n name: 'vite-intlayer-plugin',\n\n config: (config, { mode }) => {\n const intlayerConfig = getConfiguration();\n const { mainDir, baseDir, watch: isWatchMode } = intlayerConfig.content;\n\n // Set all configuration values as environment variables\n const env = formatEnvVariable('vite');\n\n process.env = {\n ...process.env,\n ...loadEnv(mode, process.cwd()),\n ...env,\n };\n\n const dictionariesPath = join(mainDir, 'dictionaries.mjs');\n const relativeDictionariesPath = relative(baseDir, dictionariesPath);\n\n // Update Vite's resolve alias\n config.resolve = {\n ...config.resolve,\n alias: {\n ...config.resolve?.alias,\n '@intlayer/dictionaries-entry': resolve(relativeDictionariesPath),\n },\n };\n\n if (isWatchMode) {\n // Ajout de l'option optimizeDeps.exclude\n config.optimizeDeps = {\n ...config.optimizeDeps,\n exclude: [\n ...(config.optimizeDeps?.exclude || []),\n '@intlayer/dictionaries-entry',\n ],\n };\n }\n\n const externals: string[] = (config.build?.rollupOptions?.external ??\n []) as string[];\n\n config.build = {\n ...config.build,\n rollupOptions: {\n ...config.build?.rollupOptions,\n external: [...externals, 'module'],\n },\n };\n\n return config;\n },\n\n buildStart: () => {\n // Code to run when Vite build starts\n watch();\n },\n configureServer: () => {\n // Custom server configuration, if needed\n },\n});\n"],"mappings":";AAAA,SAAS,MAAM,UAAU,eAAe;AACxC,OAAO,aAAa;AACpB,SAAS,aAAa;AACtB,SAAS,kBAAkB,yBAAyB;AAEpD,SAAS,eAA4B;AAkB9B,MAAM,iBAAiB,CAAC,iBAAgC,CAAC,OAAe;AAAA,EAC7E,MAAM;AAAA,EAEN,QAAQ,CAAC,QAAQ,EAAE,KAAK,MAAM;AAC5B,UAAM,iBAAiB,iBAAiB;AACxC,UAAM,EAAE,SAAS,SAAS,OAAO,YAAY,IAAI,eAAe;AAGhE,UAAM,MAAM,kBAAkB,MAAM;AAEpC,YAAQ,MAAM;AAAA,MACZ,GAAG,QAAQ;AAAA,MACX,GAAG,QAAQ,MAAM,QAAQ,IAAI,CAAC;AAAA,MAC9B,GAAG;AAAA,IACL;AAEA,UAAM,mBAAmB,KAAK,SAAS,kBAAkB;AACzD,UAAM,2BAA2B,SAAS,SAAS,gBAAgB;AAGnE,WAAO,UAAU;AAAA,MACf,GAAG,OAAO;AAAA,MACV,OAAO;AAAA,QACL,GAAG,OAAO,SAAS;AAAA,QACnB,gCAAgC,QAAQ,wBAAwB;AAAA,MAClE;AAAA,IACF;AAEA,QAAI,aAAa;AAEf,aAAO,eAAe;AAAA,QACpB,GAAG,OAAO;AAAA,QACV,SAAS;AAAA,UACP,GAAI,OAAO,cAAc,WAAW,CAAC;AAAA,UACrC;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,YAAuB,OAAO,OAAO,eAAe,YACxD,CAAC;AAEH,WAAO,QAAQ;AAAA,MACb,GAAG,OAAO;AAAA,MACV,eAAe;AAAA,QACb,GAAG,OAAO,OAAO;AAAA,QACjB,UAAU,CAAC,GAAG,WAAW,QAAQ;AAAA,MACnC;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,YAAY,MAAM;AAEhB,UAAM;AAAA,EACR;AAAA,EACA,iBAAiB,MAAM;AAAA,EAEvB;AACF;","names":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intlayerMiddlewarePlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/intlayerMiddlewarePlugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAQnC;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,2BAA0B,
|
|
1
|
+
{"version":3,"file":"intlayerMiddlewarePlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/intlayerMiddlewarePlugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAQnC;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,2BAA0B,MAuF7D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intlayerPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/intlayerPlugin.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"intlayerPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/intlayerPlugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAG5C,KAAK,aAAa,GAAG,EAEpB,CAAC;AAEF;;;;;;;;;;MAUM;AACN,eAAO,MAAM,cAAc,oBAAoB,aAAa,KAAQ,MA4DlE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-intlayer",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Internationalization layer for React applications. Declare your multilingual contant in the same lever than your component. Powered by TypeScript, declaration files.",
|
|
6
6
|
"keywords": [
|
|
@@ -91,11 +91,11 @@
|
|
|
91
91
|
"react-cookie": "^7.2.2",
|
|
92
92
|
"vite": "^6.0.3",
|
|
93
93
|
"webpack": "^5.96.1",
|
|
94
|
-
"@intlayer/
|
|
95
|
-
"@intlayer/core": "^3.5.
|
|
96
|
-
"@intlayer/
|
|
97
|
-
"@intlayer/
|
|
98
|
-
"@intlayer/
|
|
94
|
+
"@intlayer/config": "^3.5.2",
|
|
95
|
+
"@intlayer/core": "^3.5.2",
|
|
96
|
+
"@intlayer/webpack": "^3.5.2",
|
|
97
|
+
"@intlayer/dictionaries-entry": "^3.5.2",
|
|
98
|
+
"@intlayer/chokidar": "^3.5.2"
|
|
99
99
|
},
|
|
100
100
|
"devDependencies": {
|
|
101
101
|
"@craco/types": "^7.1.0",
|
|
@@ -114,20 +114,20 @@
|
|
|
114
114
|
"tsup": "^8.3.5",
|
|
115
115
|
"typescript": "^5.7.2",
|
|
116
116
|
"@utils/eslint-config": "^1.0.4",
|
|
117
|
-
"@utils/ts-config-types": "^1.0.4",
|
|
118
117
|
"@utils/ts-config": "^1.0.4",
|
|
118
|
+
"@utils/ts-config-types": "^1.0.4",
|
|
119
119
|
"@utils/tsup-config": "^1.0.4"
|
|
120
120
|
},
|
|
121
121
|
"peerDependencies": {
|
|
122
122
|
"react": ">=16.0.0 <19.0.0",
|
|
123
123
|
"react-dom": ">=16.0.0 <19.0.0",
|
|
124
124
|
"vite": ">=4.0.0",
|
|
125
|
-
"@intlayer/chokidar": "^3.5.
|
|
126
|
-
"@intlayer/
|
|
127
|
-
"@intlayer/
|
|
128
|
-
"@intlayer/
|
|
129
|
-
"intlayer": "^3.5.
|
|
130
|
-
"
|
|
125
|
+
"@intlayer/chokidar": "^3.5.2",
|
|
126
|
+
"@intlayer/config": "^3.5.2",
|
|
127
|
+
"@intlayer/core": "^3.5.2",
|
|
128
|
+
"@intlayer/dictionaries-entry": "^3.5.2",
|
|
129
|
+
"@intlayer/webpack": "^3.5.2",
|
|
130
|
+
"intlayer": "^3.5.2"
|
|
131
131
|
},
|
|
132
132
|
"engines": {
|
|
133
133
|
"node": ">=14.18"
|