next-translate-plugin 2.0.0 → 2.0.2

package/lib/cjs/index.js

@@ -48,9 +48,9 @@ var possiblePageDirs = __spreadArray([
 function nextTranslate(nextConfig) {
     if (nextConfig === void 0) { nextConfig = {}; }
     var basePath = pkgDir();
-    var translationDir = path_1.default.resolve(path_1.default.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
+    var dir = path_1.default.resolve(path_1.default.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
     var nextConfigI18n = nextConfig.i18n || {};
-    var _a = require(path_1.default.join(translationDir, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, restI18n = __rest(_a, ["locales", "defaultLocale", "domains", "localeDetection", "loader", "pagesInDir"]);
+    var _a = require(path_1.default.join(dir, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, restI18n = __rest(_a, ["locales", "defaultLocale", "domains", "localeDetection", "loader", "pagesInDir"]);
     var nextConfigWithI18n = __assign(__assign({}, nextConfig), { i18n: {
             locales: locales,
             defaultLocale: defaultLocale,
@@ -62,20 +62,20 @@ function nextTranslate(nextConfig) {
     if (!pagesInDir) {
         for (var _i = 0, possiblePageDirs_1 = possiblePageDirs; _i < possiblePageDirs_1.length; _i++) {
             var possiblePageDir = possiblePageDirs_1[_i];
-            if (fs_1.default.existsSync(path_1.default.join(basePath, possiblePageDir))) {
+            if (fs_1.default.existsSync(path_1.default.join(dir, possiblePageDir))) {
                 pagesInDir = possiblePageDir;
                 isAppDirNext13 = appDirNext13.includes(possiblePageDir);
                 break;
             }
         }
     }
-    if (!pagesInDir || !fs_1.default.existsSync(path_1.default.join(basePath, pagesInDir))) {
+    if (!pagesInDir || !fs_1.default.existsSync(path_1.default.join(dir, pagesInDir))) {
         return nextConfigWithI18n;
     }
-    var pagesPath = path_1.default.join(basePath, pagesInDir);
+    var pagesPath = path_1.default.join(dir, pagesInDir);
     var app = fs_1.default.readdirSync(pagesPath).find(function (page) { return page.startsWith('_app.'); });
     if (app) {
-        var appPkg = (0, utils_1.parseFile)(basePath, path_1.default.join(pagesPath, app));
+        var appPkg = (0, utils_1.parseFile)(dir, path_1.default.join(pagesPath, app));
         var defaultExport = (0, utils_1.getDefaultExport)(appPkg);
         if (defaultExport) {
             var isGetInitialProps = (0, utils_1.hasStaticName)(appPkg, defaultExport, 'getInitialProps');
@@ -92,7 +92,7 @@ function nextTranslate(nextConfig) {
                 config.module = {};
             if (!config.module.rules)
                 config.module.rules = [];
-            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path_1.default.resolve(translationDir) });
+            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path_1.default.resolve(dir) });
             if (!loader)
                 return config;
             config.module.rules.push({

package/lib/cjs/templateAppDir.js

@@ -6,7 +6,8 @@ var defaultDynamicExport = "export const dynamic = 'force-dynamic';";
 function templateAppDir(pagePkg, _a) {
     var _b = _a === void 0 ? {} : _a, _c = _b.hasLoadLocaleFrom, hasLoadLocaleFrom = _c === void 0 ? false : _c, _d = _b.pageNoExt, pageNoExt = _d === void 0 ? '/' : _d, _e = _b.normalizedResourcePath, normalizedResourcePath = _e === void 0 ? '' : _e, _f = _b.normalizedPagesPath, normalizedPagesPath = _f === void 0 ? '' : _f;
     var code = pagePkg.getCode();
-    var isClientCode = clientLine.some(function (line) { return code.startsWith(line); });
+    var codeWithoutComments = (0, utils_1.removeCommentsFromCode)(code).trim();
+    var isClientCode = clientLine.some(function (line) { return codeWithoutComments.startsWith(line); });
     var isPage = pageNoExt.endsWith('/page') && normalizedResourcePath.startsWith(normalizedPagesPath);
     if (!isPage && !isClientCode)
         return code;

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.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.overwriteLoadLocales = exports.getDefaultAppJs = exports.defaultLoader = void 0;
+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.overwriteLoadLocales = exports.getDefaultAppJs = exports.defaultLoader = void 0;
 var typescript_1 = __importDefault(require("typescript"));
 var specFileOrFolderRgx = /(__mocks__|__tests__)|(\.(spec|test)\.(tsx|ts|js|jsx)$)/;
 exports.defaultLoader = '(l, n) => import(`@next-translate-root/locales/${l}/${n}`).then(m => m.default)';
@@ -350,3 +350,7 @@ function interceptExport(filePkg, exportName, defaultLocalName) {
     return finalLocalName;
 }
 exports.interceptExport = interceptExport;
+function removeCommentsFromCode(code) {
+    return code.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '');
+}
+exports.removeCommentsFromCode = removeCommentsFromCode;

package/lib/esm/index.js

@@ -43,9 +43,9 @@ var possiblePageDirs = __spreadArray([
 function nextTranslate(nextConfig) {
     if (nextConfig === void 0) { nextConfig = {}; }
     var basePath = pkgDir();
-    var translationDir = path.resolve(path.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
+    var dir = path.resolve(path.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
     var nextConfigI18n = nextConfig.i18n || {};
-    var _a = require(path.join(translationDir, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, restI18n = __rest(_a, ["locales", "defaultLocale", "domains", "localeDetection", "loader", "pagesInDir"]);
+    var _a = require(path.join(dir, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, restI18n = __rest(_a, ["locales", "defaultLocale", "domains", "localeDetection", "loader", "pagesInDir"]);
     var nextConfigWithI18n = __assign(__assign({}, nextConfig), { i18n: {
             locales: locales,
             defaultLocale: defaultLocale,
@@ -57,20 +57,20 @@ function nextTranslate(nextConfig) {
     if (!pagesInDir) {
         for (var _i = 0, possiblePageDirs_1 = possiblePageDirs; _i < possiblePageDirs_1.length; _i++) {
             var possiblePageDir = possiblePageDirs_1[_i];
-            if (fs.existsSync(path.join(basePath, possiblePageDir))) {
+            if (fs.existsSync(path.join(dir, possiblePageDir))) {
                 pagesInDir = possiblePageDir;
                 isAppDirNext13 = appDirNext13.includes(possiblePageDir);
                 break;
             }
         }
     }
-    if (!pagesInDir || !fs.existsSync(path.join(basePath, pagesInDir))) {
+    if (!pagesInDir || !fs.existsSync(path.join(dir, pagesInDir))) {
         return nextConfigWithI18n;
     }
-    var pagesPath = path.join(basePath, pagesInDir);
+    var pagesPath = path.join(dir, pagesInDir);
     var app = fs.readdirSync(pagesPath).find(function (page) { return page.startsWith('_app.'); });
     if (app) {
-        var appPkg = parseFile(basePath, path.join(pagesPath, app));
+        var appPkg = parseFile(dir, path.join(pagesPath, app));
         var defaultExport = getDefaultExport(appPkg);
         if (defaultExport) {
             var isGetInitialProps = hasStaticName(appPkg, defaultExport, 'getInitialProps');
@@ -87,7 +87,7 @@ function nextTranslate(nextConfig) {
                 config.module = {};
             if (!config.module.rules)
                 config.module.rules = [];
-            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path.resolve(translationDir) });
+            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path.resolve(dir) });
             if (!loader)
                 return config;
             config.module.rules.push({

package/lib/esm/templateAppDir.js

@@ -1,10 +1,11 @@
-import { interceptExport, overwriteLoadLocales, getNamedExport } from "./utils";
+import { interceptExport, overwriteLoadLocales, getNamedExport, removeCommentsFromCode } from "./utils";
 var clientLine = ['"use client"', "'use client'"];
 var defaultDynamicExport = "export const dynamic = 'force-dynamic';";
 export default function templateAppDir(pagePkg, _a) {
     var _b = _a === void 0 ? {} : _a, _c = _b.hasLoadLocaleFrom, hasLoadLocaleFrom = _c === void 0 ? false : _c, _d = _b.pageNoExt, pageNoExt = _d === void 0 ? '/' : _d, _e = _b.normalizedResourcePath, normalizedResourcePath = _e === void 0 ? '' : _e, _f = _b.normalizedPagesPath, normalizedPagesPath = _f === void 0 ? '' : _f;
     var code = pagePkg.getCode();
-    var isClientCode = clientLine.some(function (line) { return code.startsWith(line); });
+    var codeWithoutComments = removeCommentsFromCode(code).trim();
+    var isClientCode = clientLine.some(function (line) { return codeWithoutComments.startsWith(line); });
     var isPage = pageNoExt.endsWith('/page') && normalizedResourcePath.startsWith(normalizedPagesPath);
     if (!isPage && !isClientCode)
         return code;

package/lib/esm/utils.js

@@ -325,3 +325,6 @@ export function interceptExport(filePkg, exportName, defaultLocalName) {
     }
     return finalLocalName;
 }
+export function removeCommentsFromCode(code) {
+    return code.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate-plugin",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Tiny and powerful i18n plugin to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [
@@ -35,7 +35,8 @@
     "loader*",
     "template*",
     "types*",
-    "utils*"
+    "utils*",
+    "postinstall-message.js"
   ],
   "scripts": {
     "build": "yarn clean && cross-env NODE_ENV=production && yarn tsc",
@@ -48,7 +49,8 @@
     "test": "cross-env NODE_ENV=test jest --env=jsdom",
     "test:coverage": "cross-env NODE_ENV=test jest --env=jsdom --coverage",
     "test:watch": "cross-env NODE_ENV=test jest --env=jsdom --watch",
-    "tsc": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node build-packages.js"
+    "tsc": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node build-packages.js",
+    "postinstall": "node ./postinstall-message.js"
   },
   "dependencies": {
     "typescript": "4.5.2"

package/postinstall-message.js

@@ -0,0 +1,18 @@
+console.log('\x1b[31m%s\x1b[0m', `----------------------------------\n`);
+
+console.log('\x1b[36m%s\x1b[0m', `Hi there!\n`);
+
+console.log('\x1b[36m%s\x1b[0m', `Thank you for using Next-translate and Next-translate-plugin. I'm happy to see that it's been helpful to so many people 🧡\n`);
+
+console.log('\x1b[36m%s\x1b[0m', `As much as I enjoy maintaining and developing new features for the library, it unfortunately doesn't pay the bills. If you believe in the project and would like to support its continued growth, please consider making a donation. Any amount, no matter how small, will be greatly appreciated and will help me to continue dedicating my time to this project.\n`);
+
+console.log('\x1b[36m%s\x1b[0m', `Also, I would be incredibly grateful if you could help me spread the word about the library and encourage any large companies you know to consider supporting the project.\n`);
+
+console.log('\x1b[36m%s\x1b[0m', `Thank you from the bottom of my heart 😊🤗\n`);
+
+console.log('\x1b[31m%s\x1b[0m', `Become a sponsor: https://github.com/sponsors/aralroca\n`);
+
+console.log('\x1b[31m%s\x1b[0m', `----------------------------------\n`);
+
+
+

package/templateAppDir/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "templateappdir",
+  "private": true,
+  "main": "../lib/cjs/templateAppDir.js",
+  "module": "../lib/esm/templateAppDir.js",
+  "types": "../templateAppDir.d.ts"
+}

package/utils.d.ts

@@ -20,3 +20,4 @@ export declare function isPageToIgnore(pageFilePath: string): boolean;
 export declare function hasHOC(filePkg: ParsedFilePkg): boolean;
 export declare function isNotExportModifier(modifier: ts.Modifier): boolean;
 export declare function interceptExport(filePkg: ParsedFilePkg, exportName: string, defaultLocalName: string): string;
+export declare function removeCommentsFromCode(code: string): string;