lingo.dev 0.79.3 → 0.79.5

package/build/cli.mjs

@@ -1815,10 +1815,8 @@ function createXcodeXcstringsLoader(defaultLocale) {
 }
 
 // src/cli/loaders/prettier.ts
-import fs9 from "fs";
 import path11 from "path";
 import prettier from "prettier";
-import { execSync } from "child_process";
 function createPrettierLoader(options) {
   return createLoader({
     async pull(locale, data) {
@@ -1847,8 +1845,9 @@ function createPrettierLoader(options) {
       } catch (error) {
         if (error instanceof Error && error.message.startsWith("Cannot find package")) {
           console.log();
-          console.log("Prettier is missing some dependecies - installing all project dependencies");
-          installDependencies();
+          console.log("\u26A0\uFE0F  Prettier plugins are not installed. Formatting without plugins.");
+          console.log("\u26A0\uFE0F  To use prettier plugins install project dependencies before running Lingo.dev.");
+          config.plugins = [];
           await prettier.clearConfigCache();
           const result = await prettier.format(data, config);
           return result;
@@ -1867,27 +1866,6 @@ async function loadPrettierConfig(filePath) {
     return {};
   }
 }
-async function installDependencies() {
-  const packageManager = await getPackageManager();
-  console.log(`Installing dependencies using ${packageManager}`);
-  execSync(`${packageManager} install --frozen-lockfile`, { stdio: "inherit" });
-  console.log(`Dependencies installed`);
-}
-async function getPackageManager() {
-  const yarnLockfile = path11.resolve(process.cwd(), "yarn.lock");
-  if (fs9.existsSync(yarnLockfile)) {
-    return "yarn";
-  }
-  const pnpmLockfile = path11.resolve(process.cwd(), "pnpm-lock.yaml");
-  if (fs9.existsSync(pnpmLockfile)) {
-    return "pnpm";
-  }
-  const bunLockfile = path11.resolve(process.cwd(), "bun.lock");
-  if (fs9.existsSync(bunLockfile)) {
-    return "bun";
-  }
-  return "npm";
-}
 
 // src/cli/loaders/unlocalizable.ts
 import _10 from "lodash";
@@ -2102,7 +2080,7 @@ function createSrtLoader() {
 }
 
 // src/cli/loaders/dato/index.ts
-import fs10 from "fs";
+import fs9 from "fs";
 import JSON5 from "json5";
 
 // src/cli/loaders/dato/_base.ts
@@ -2701,12 +2679,12 @@ function _isVideo(rawDatoValue) {
 // src/cli/loaders/dato/index.ts
 function createDatoLoader(configFilePath) {
   try {
-    const configContent = fs10.readFileSync(configFilePath, "utf-8");
+    const configContent = fs9.readFileSync(configFilePath, "utf-8");
     const datoConfig = datoConfigSchema.parse(JSON5.parse(configContent));
     return composeLoaders(
       createDatoApiLoader(
         datoConfig,
-        (updatedConfig) => fs10.writeFileSync(configFilePath, JSON5.stringify(updatedConfig, null, 2))
+        (updatedConfig) => fs9.writeFileSync(configFilePath, JSON5.stringify(updatedConfig, null, 2))
       ),
       createDatoFilterLoader(),
       createDatoExtractLoader()
@@ -3015,12 +2993,13 @@ function createInjectLocaleLoader(injectLocaleKeys) {
       if (!injectLocaleKeys) {
         return data;
       }
+      const mergedData = _18.merge({}, originalInput, data);
       injectLocaleKeys.forEach((key) => {
-        if (_18.get(originalInput, key) === originalLocale) {
-          _18.set(data, key, locale);
+        if (_18.get(mergedData, key) === originalLocale) {
+          _18.set(mergedData, key, locale);
         }
       });
-      return data;
+      return mergedData;
     }
   });
 }
@@ -3200,7 +3179,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options) {
 }
 
 // src/cli/utils/lockfile.ts
-import fs11 from "fs";
+import fs10 from "fs";
 import path12 from "path";
 import Z3 from "zod";
 import YAML3 from "yaml";
@@ -3210,7 +3189,7 @@ function createLockfileHelper() {
   return {
     isLockfileExists: () => {
       const lockfilePath = _getLockfilePath();
-      return fs11.existsSync(lockfilePath);
+      return fs10.existsSync(lockfilePath);
     },
     registerSourceData: (pathPattern, sourceData) => {
       const lockfile = _loadLockfile();
@@ -3237,17 +3216,17 @@ function createLockfileHelper() {
   };
   function _loadLockfile() {
     const lockfilePath = _getLockfilePath();
-    if (!fs11.existsSync(lockfilePath)) {
+    if (!fs10.existsSync(lockfilePath)) {
       return LockfileSchema.parse({});
     }
-    const content = fs11.readFileSync(lockfilePath, "utf-8");
+    const content = fs10.readFileSync(lockfilePath, "utf-8");
     const result = LockfileSchema.parse(YAML3.parse(content));
     return result;
   }
   function _saveLockfile(lockfile) {
     const lockfilePath = _getLockfilePath();
     const content = YAML3.stringify(lockfile);
-    fs11.writeFileSync(lockfilePath, content);
+    fs10.writeFileSync(lockfilePath, content);
   }
   function _getLockfilePath() {
     return path12.join(process.cwd(), "i18n.lock");
@@ -3276,7 +3255,7 @@ import externalEditor from "external-editor";
 
 // src/cli/utils/cache.ts
 import path13 from "path";
-import fs12 from "fs";
+import fs11 from "fs";
 var cacheChunk = (targetLocale, sourceChunk, processedChunk) => {
   const rows = Object.entries(sourceChunk).map(([key, source]) => ({
     targetLocale,
@@ -3306,23 +3285,23 @@ function getNormalizedCache() {
 function deleteCache() {
   const cacheFilePath = _getCacheFilePath();
   try {
-    fs12.unlinkSync(cacheFilePath);
+    fs11.unlinkSync(cacheFilePath);
   } catch (e) {
   }
 }
 function _loadCache() {
   const cacheFilePath = _getCacheFilePath();
-  if (!fs12.existsSync(cacheFilePath)) {
+  if (!fs11.existsSync(cacheFilePath)) {
     return [];
   }
-  const content = fs12.readFileSync(cacheFilePath, "utf-8");
+  const content = fs11.readFileSync(cacheFilePath, "utf-8");
   const result = _parseJSONLines(content);
   return result;
 }
 function _appendToCache(rows) {
   const cacheFilePath = _getCacheFilePath();
   const lines = _buildJSONLines(rows);
-  fs12.appendFileSync(cacheFilePath, lines);
+  fs11.appendFileSync(cacheFilePath, lines);
 }
 function _getCacheFilePath() {
   return path13.join(process.cwd(), "i18n.cache");
@@ -4032,10 +4011,10 @@ import { Command as Command10 } from "interactive-commander";
 import createOra from "ora";
 
 // ../../action/src/flows/pull-request.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync2 } from "child_process";
 
 // ../../action/src/flows/in-branch.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 import path14 from "path";
 
 // ../../action/src/flows/_base.ts
@@ -4063,21 +4042,21 @@ var InBranchFlow = class extends IntegrationFlow {
     this.ora.start("Running Lingo.dev");
     await this.runLingoDotDev();
     this.ora.succeed("Done running Lingo.dev");
-    execSync2(`rm -f i18n.cache`, { stdio: "inherit" });
+    execSync(`rm -f i18n.cache`, { stdio: "inherit" });
     this.ora.start("Checking for changes");
     const hasChanges = this.checkCommitableChanges();
     this.ora.succeed(hasChanges ? "Changes detected" : "No changes detected");
     if (hasChanges) {
       this.ora.start("Committing changes");
-      execSync2(`git add .`, { stdio: "inherit" });
-      execSync2(`git status --porcelain`, { stdio: "inherit" });
-      execSync2(`git commit -m "${this.platformKit.config.commitMessage}"`, {
+      execSync(`git add .`, { stdio: "inherit" });
+      execSync(`git status --porcelain`, { stdio: "inherit" });
+      execSync(`git commit -m "${this.platformKit.config.commitMessage}"`, {
         stdio: "inherit"
       });
       this.ora.succeed("Changes committed");
       this.ora.start("Pushing changes to remote");
       const currentBranch = this.i18nBranchName ?? this.platformKit.platformConfig.baseBranchName;
-      execSync2(`git push origin ${currentBranch} ${forcePush ? "--force" : ""}`, {
+      execSync(`git push origin ${currentBranch} ${forcePush ? "--force" : ""}`, {
         stdio: "inherit"
       });
       this.ora.succeed("Changes pushed to remote");
@@ -4085,28 +4064,28 @@ var InBranchFlow = class extends IntegrationFlow {
     return hasChanges;
   }
   checkCommitableChanges() {
-    return execSync2('git status --porcelain || echo "has_changes"', {
+    return execSync('git status --porcelain || echo "has_changes"', {
       encoding: "utf8"
     }).length > 0;
   }
   async runLingoDotDev() {
-    execSync2(`npx lingo.dev@latest i18n --api-key ${this.platformKit.config.replexicaApiKey}`, { stdio: "inherit" });
+    execSync(`npx lingo.dev@latest i18n --api-key ${this.platformKit.config.replexicaApiKey}`, { stdio: "inherit" });
   }
   configureGit() {
     const { processOwnCommits } = this.platformKit.config;
     const { baseBranchName } = this.platformKit.platformConfig;
     this.ora.info(`Current working directory:`);
-    execSync2(`pwd`, { stdio: "inherit" });
-    execSync2(`ls -la`, { stdio: "inherit" });
-    execSync2(`git config --global safe.directory ${process.cwd()}`);
-    execSync2(`git config user.name "${gitConfig.userName}"`);
-    execSync2(`git config user.email "${gitConfig.userEmail}"`);
+    execSync(`pwd`, { stdio: "inherit" });
+    execSync(`ls -la`, { stdio: "inherit" });
+    execSync(`git config --global safe.directory ${process.cwd()}`);
+    execSync(`git config user.name "${gitConfig.userName}"`);
+    execSync(`git config user.email "${gitConfig.userEmail}"`);
     this.platformKit?.gitConfig();
-    execSync2(`git fetch origin ${baseBranchName}`, { stdio: "inherit" });
-    execSync2(`git checkout ${baseBranchName} --`, { stdio: "inherit" });
+    execSync(`git fetch origin ${baseBranchName}`, { stdio: "inherit" });
+    execSync(`git checkout ${baseBranchName} --`, { stdio: "inherit" });
     if (!processOwnCommits) {
       const currentAuthor = `${gitConfig.userName} <${gitConfig.userEmail}>`;
-      const authorOfLastCommit = execSync2(`git log -1 --pretty=format:'%an <%ae>'`).toString();
+      const authorOfLastCommit = execSync(`git log -1 --pretty=format:'%an <%ae>'`).toString();
       if (authorOfLastCommit === currentAuthor) {
         this.ora.warn(
           `The last commit was already made by ${currentAuthor}, so this run will be skipped, as running again would have no effect. See docs: https://docs.lingo.dev/ci-action/overview`
@@ -4190,15 +4169,15 @@ var PullRequestFlow = class extends InBranchFlow {
     return prNumber;
   }
   checkoutI18nBranch(i18nBranchName) {
-    execSync3(`git fetch origin ${i18nBranchName}`, { stdio: "inherit" });
-    execSync3(`git checkout -b ${i18nBranchName}`, {
+    execSync2(`git fetch origin ${i18nBranchName}`, { stdio: "inherit" });
+    execSync2(`git checkout -b ${i18nBranchName}`, {
       stdio: "inherit"
     });
   }
   createI18nBranch(i18nBranchName) {
     try {
-      execSync3(`git fetch origin ${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
-      execSync3(`git checkout -b ${i18nBranchName} origin/${this.platformKit.platformConfig.baseBranchName}`, {
+      execSync2(`git fetch origin ${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
+      execSync2(`git checkout -b ${i18nBranchName} origin/${this.platformKit.platformConfig.baseBranchName}`, {
         stdio: "inherit"
       });
     } catch (error) {
@@ -4218,31 +4197,31 @@ var PullRequestFlow = class extends InBranchFlow {
       throw new Error("i18nBranchName is not set");
     }
     this.ora.start(`Fetching latest changes from ${this.platformKit.platformConfig.baseBranchName}`);
-    execSync3(`git fetch origin ${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
+    execSync2(`git fetch origin ${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
     this.ora.succeed(`Fetched latest changes from ${this.platformKit.platformConfig.baseBranchName}`);
     try {
       this.ora.start("Attempting to rebase branch");
-      execSync3(`git rebase origin/${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
+      execSync2(`git rebase origin/${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
       this.ora.succeed("Successfully rebased branch");
     } catch (error) {
       this.ora.warn("Rebase failed, falling back to alternative sync method");
       this.ora.start("Aborting failed rebase");
-      execSync3("git rebase --abort", { stdio: "inherit" });
+      execSync2("git rebase --abort", { stdio: "inherit" });
       this.ora.succeed("Aborted failed rebase");
       this.ora.start(`Resetting to ${this.platformKit.platformConfig.baseBranchName}`);
-      execSync3(`git reset --hard origin/${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
+      execSync2(`git reset --hard origin/${this.platformKit.platformConfig.baseBranchName}`, { stdio: "inherit" });
       this.ora.succeed(`Reset to ${this.platformKit.platformConfig.baseBranchName}`);
       this.ora.start("Restoring target files");
       const targetFiles = ["i18n.lock"];
-      const targetFileNames = execSync3(
+      const targetFileNames = execSync2(
         `npx lingo.dev@latest show files --target ${this.platformKit.platformConfig.baseBranchName}`,
         { encoding: "utf8" }
       ).split("\n").filter(Boolean);
       targetFiles.push(...targetFileNames);
-      execSync3(`git fetch origin ${this.i18nBranchName}`, { stdio: "inherit" });
+      execSync2(`git fetch origin ${this.i18nBranchName}`, { stdio: "inherit" });
       for (const file of targetFiles) {
         try {
-          execSync3(`git checkout FETCH_HEAD -- ${file}`, { stdio: "inherit" });
+          execSync2(`git checkout FETCH_HEAD -- ${file}`, { stdio: "inherit" });
         } catch (error2) {
           this.ora.warn(`Skipping non-existent file: ${file}`);
           continue;
@@ -4253,8 +4232,8 @@ var PullRequestFlow = class extends InBranchFlow {
     this.ora.start("Checking for changes to commit");
     const hasChanges = this.checkCommitableChanges();
     if (hasChanges) {
-      execSync3("git add .", { stdio: "inherit" });
-      execSync3(`git commit -m "chore: sync with ${this.platformKit.platformConfig.baseBranchName}"`, {
+      execSync2("git add .", { stdio: "inherit" });
+      execSync2(`git commit -m "chore: sync with ${this.platformKit.platformConfig.baseBranchName}"`, {
         stdio: "inherit"
       });
       this.ora.succeed("Committed additional changes");
@@ -4283,7 +4262,7 @@ Hey team,
 };
 
 // ../../action/src/platforms/bitbucket.ts
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 import bbLib from "bitbucket";
 import Z8 from "zod";
 
@@ -4375,10 +4354,10 @@ var BitbucketPlatformKit = class extends PlatformKit {
     });
   }
   async gitConfig() {
-    execSync4("git config --unset http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy", {
+    execSync3("git config --unset http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy", {
       stdio: "inherit"
     });
-    execSync4("git config http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy http://host.docker.internal:29418/", {
+    execSync3("git config http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy http://host.docker.internal:29418/", {
       stdio: "inherit"
     });
   }
@@ -4405,7 +4384,7 @@ var BitbucketPlatformKit = class extends PlatformKit {
 // ../../action/src/platforms/github.ts
 import { Octokit } from "octokit";
 import Z9 from "zod";
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 var GitHubPlatformKit = class extends PlatformKit {
   _octokit;
   get octokit() {
@@ -4462,7 +4441,7 @@ var GitHubPlatformKit = class extends PlatformKit {
     if (ghToken && processOwnCommits) {
       console.log("Using provided GH_TOKEN. This will trigger your CI/CD pipeline to run again.");
       const url = `https://${ghToken}@github.com/${repositoryOwner}/${repositoryName}.git`;
-      execSync5(`git remote set-url origin ${url}`, {
+      execSync4(`git remote set-url origin ${url}`, {
         stdio: "inherit"
       });
     }
@@ -4492,7 +4471,7 @@ var GitHubPlatformKit = class extends PlatformKit {
 // ../../action/src/platforms/gitlab.ts
 import { Gitlab } from "@gitbeaker/rest";
 import Z10 from "zod";
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 var gl = new Gitlab({ token: "" });
 var GitlabPlatformKit = class extends PlatformKit {
   _gitlab;
@@ -4568,7 +4547,7 @@ var GitlabPlatformKit = class extends PlatformKit {
   }
   gitConfig() {
     const url = `https://oauth2:${this.platformConfig.glToken}@gitlab.com/${this.platformConfig.repositoryOwner}/${this.platformConfig.repositoryName}.git`;
-    execSync6(`git remote set-url origin ${url}`, {
+    execSync5(`git remote set-url origin ${url}`, {
       stdio: "inherit"
     });
   }
@@ -4641,7 +4620,7 @@ var ci_default = new Command10().command("ci").description("Run Lingo.dev CI/CD
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.79.3",
+  version: "0.79.5",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {