next-translate-plugin 2.5.0-canary.2 → 2.5.0

package/lib/cjs/loader.js

@@ -19,10 +19,10 @@ function loader(rawCode) {
         var isClientComponent = !isNextInternal &&
             utils_1.clientLine.some(function (line) { return codeWithoutComments_1.startsWith(line); });
         var shouldUseTemplateAppDir = isClientComponent ||
-            normalizedResourcePath.includes(appFolder.replace(/\\/g, '/'));
+            (0, utils_1.isInsideAppDir)(normalizedResourcePath, appFolder, pagesFolder);
         var pagesPath = (shouldUseTemplateAppDir ? appFolder : pagesFolder);
-        if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
-            !hasAppJs) {
+        if (!hasAppJs &&
+            normalizedResourcePath.includes('node_modules/next/dist/pages/_app')) {
             return (0, utils_1.getDefaultAppJs)(existLocalesFolder);
         }
         if (normalizedResourcePath.includes('node_modules/'))

package/lib/cjs/utils.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.existLocalesFolderWithNamespaces = exports.existPages = exports.calculatePageDir = exports.removeCommentsFromCode = exports.interceptExport = exports.isNotExportModifier = exports.hasHOC = exports.isPageToIgnore = exports.hasStaticName = exports.getStaticName = exports.hasExportName = exports.getDefaultExport = exports.getNamedExport = exports.resolveIdentifier = exports.resolveParenthesis = exports.getImportedNames = exports.getSymbol = exports.parseCode = exports.parseFile = exports.getFilePkg = exports.getTsCompilerOptions = exports.addLoadLocalesFrom = exports.getDefaultAppJs = exports.defaultLoader = exports.clientLine = exports.INTERNAL_CONFIG_KEY = void 0;
+exports.isInsideAppDir = exports.existLocalesFolderWithNamespaces = exports.existPages = exports.calculatePageDir = exports.removeCommentsFromCode = exports.interceptExport = exports.isNotExportModifier = exports.hasHOC = exports.isPageToIgnore = exports.hasStaticName = exports.getStaticName = exports.hasExportName = exports.getDefaultExport = exports.getNamedExport = exports.resolveIdentifier = exports.resolveParenthesis = exports.getImportedNames = exports.getSymbol = exports.parseCode = exports.parseFile = exports.getFilePkg = exports.getTsCompilerOptions = exports.addLoadLocalesFrom = exports.getDefaultAppJs = exports.defaultLoader = exports.clientLine = exports.INTERNAL_CONFIG_KEY = void 0;
 var typescript_1 = __importDefault(require("typescript"));
 var path_1 = __importDefault(require("path"));
 var fs_1 = __importDefault(require("fs"));
@@ -402,3 +402,13 @@ function existLocalesFolderWithNamespaces(dir) {
     return existNamespaceFile;
 }
 exports.existLocalesFolderWithNamespaces = existLocalesFolderWithNamespaces;
+function isInsideAppDir(path, appFolder, pagesFolder) {
+    var appIndex = path.indexOf(appFolder);
+    var pagesIndex = path.indexOf(pagesFolder);
+    if (appIndex === -1)
+        return false;
+    if (appIndex > -1 && pagesIndex === -1)
+        return true;
+    return appIndex < pagesIndex;
+}
+exports.isInsideAppDir = isInsideAppDir;

package/lib/esm/loader.js

@@ -2,7 +2,7 @@ import path from 'path';
 import templateWithHoc from './templateWithHoc';
 import templateWithLoader from './templateWithLoader';
 import templateAppDir from './templateAppDir';
-import { parseFile, getDefaultAppJs, getDefaultExport, hasExportName, hasStaticName, isPageToIgnore, hasHOC, removeCommentsFromCode, clientLine, } from './utils';
+import { parseFile, getDefaultAppJs, getDefaultExport, hasExportName, hasStaticName, isPageToIgnore, hasHOC, removeCommentsFromCode, clientLine, isInsideAppDir, } from './utils';
 export default function loader(rawCode) {
     var _a = this.getOptions(), basePath = _a.basePath, pagesFolder = _a.pagesFolder, appFolder = _a.appFolder, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate, existLocalesFolder = _a.existLocalesFolder;
     try {
@@ -14,10 +14,10 @@ export default function loader(rawCode) {
         var isClientComponent = !isNextInternal &&
             clientLine.some(function (line) { return codeWithoutComments_1.startsWith(line); });
         var shouldUseTemplateAppDir = isClientComponent ||
-            normalizedResourcePath.includes(appFolder.replace(/\\/g, '/'));
+            isInsideAppDir(normalizedResourcePath, appFolder, pagesFolder);
         var pagesPath = (shouldUseTemplateAppDir ? appFolder : pagesFolder);
-        if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
-            !hasAppJs) {
+        if (!hasAppJs &&
+            normalizedResourcePath.includes('node_modules/next/dist/pages/_app')) {
             return getDefaultAppJs(existLocalesFolder);
         }
         if (normalizedResourcePath.includes('node_modules/'))

package/lib/esm/utils.js

@@ -373,3 +373,12 @@ export function existLocalesFolderWithNamespaces(dir) {
     });
     return existNamespaceFile;
 }
+export function isInsideAppDir(path, appFolder, pagesFolder) {
+    var appIndex = path.indexOf(appFolder);
+    var pagesIndex = path.indexOf(pagesFolder);
+    if (appIndex === -1)
+        return false;
+    if (appIndex > -1 && pagesIndex === -1)
+        return true;
+    return appIndex < pagesIndex;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate-plugin",
-  "version": "2.5.0-canary.2",
+  "version": "2.5.0",
   "description": "Tiny and powerful i18n plugin to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [

package/utils.d.ts

@@ -26,3 +26,4 @@ export declare function removeCommentsFromCode(code: string): string;
 export declare function calculatePageDir(name: 'pages' | 'app', pagesInDir: string | undefined, dir: string): string;
 export declare function existPages(dir: string, pages: string | undefined): boolean | "" | undefined;
 export declare function existLocalesFolderWithNamespaces(dir: string): boolean;
+export declare function isInsideAppDir(path: string, appFolder: string, pagesFolder: string): boolean;