refactor: Change dir for languages files

aXenDeveloper · aXenDeveloper · commit 28a5efe304c8 · 2025-05-31T20:43:40.000+02:00
diff --git a/apps/web/components.json b/apps/web/components.json
@@ -5,7 +5,7 @@
   "tsx": true,
   "tailwind": {
     "config": "",
-    "css": "src/app/globals.css",
+    "css": "src/app/global.css",
     "baseColor": "neutral",
     "cssVariables": true,
     "prefix": ""
@@ -18,4 +18,4 @@
     "hooks": "@/hooks"
   },
   "iconLibrary": "lucide"
-}
+}
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -8,7 +8,7 @@
     "drizzle-kit": "drizzle-kit",
     "db:push": "drizzle-kit push",
     "db:migrate": "drizzle-kit up && drizzle-kit generate && drizzle-kit migrate",
-    "dev": "vitnode prepare && vitnode init && next dev --turbopack",
+    "dev": "vitnode init && next dev --turbopack",
     "dev:email": "email dev",
     "build": "next build --turbopack",
     "start": "next start",
diff --git a/apps/web/src/app/globals.css b/apps/web/src/app/globals.css
diff --git a/apps/web/src/langs/@vitnode/core/en.json b/apps/web/src/langs/@vitnode/core/en.json
diff --git a/apps/web/src/langs/@vitnode/core/pl.json b/apps/web/src/langs/@vitnode/core/pl.json
diff --git a/packages/create-vitnode-app/package.json b/packages/create-vitnode-app/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "build:scripts": "tsc && node dist/src/prepare/prepare.js",
-    "start": "node dist/src/index.js",
+    "start:scripts": "node dist/src/index.js",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
diff --git a/packages/vitnode/components.json b/packages/vitnode/components.json
@@ -5,7 +5,7 @@
   "tsx": true,
   "tailwind": {
     "config": "",
-    "css": "src/views/globals.css",
+    "css": "src/views/global.css",
     "baseColor": "neutral",
     "cssVariables": true,
     "prefix": ""
diff --git a/packages/vitnode/scripts/prepare-database.ts b/packages/vitnode/scripts/prepare-database.ts
@@ -10,14 +10,13 @@ import { core_languages, core_languages_words } from '@/database/languages.js';
 import { core_moderators_permissions } from '@/database/moderators.js';
 import { core_roles } from '@/database/roles.js';
 
+import { preparePluginsFiles } from './prepare-plugins-files.js';
 import { runInteractiveShellCommand } from './run-interactive-shell-command.js';
 
 dotenv.config({
   path: join(process.cwd(), '..', '..', '.env'),
 });
 
-console.log(join(process.cwd(), '..', '..', '.env'));
-
 const dbClient = drizzle({
   connection:
     process.env.POSTGRES_URL ?? 'postgresql://root:root@localhost:5432/vitnode',
@@ -154,11 +153,13 @@ export const prepareDatabase = async ({
 }: {
   initMessage: string;
 }) => {
-  console.log(`${initMessage} [1/3] Generate migrations...`);
+  console.log(`${initMessage} [1/4] Prepare plugins files...`);
+  await preparePluginsFiles();
+  console.log(`${initMessage} [2/4] Generate migrations...`);
   await generateDatabaseMigrations();
-  console.log(`${initMessage} [2/3] Run migrations...`);
+  console.log(`${initMessage} [3/4] Run migrations...`);
   await runMigrations();
-  console.log(`\n${initMessage} [3/3] Insert initial data...`);
+  console.log(`\n${initMessage} [4/4] Insert initial data...`);
   await initialDataForDatabase();
   console.log(`${initMessage} \x1b[32mDatabase prepared successfully.\x1b[0m`);
   process.exit(0);
diff --git a/packages/vitnode/scripts/prepare-plugins-files.ts b/packages/vitnode/scripts/prepare-plugins-files.ts
@@ -2,15 +2,15 @@
 import { existsSync, readFileSync } from 'fs';
 import { join, relative } from 'path';
 
-import { getConfig } from '../get-config';
+import { getConfig } from './get-config';
 import {
   buildInitialRouteMap,
   copyDirectoryRecursive,
   findRepoRoot,
   type SourceConfig,
-} from '../shared/file-utils';
+} from './shared/file-utils';
 
-export const preparePlugins = async () => {
+export const preparePluginsFiles = async () => {
   const config = await getConfig();
   const plugins: string[] = [
     ...config.plugins.map(plugin => plugin.id),
diff --git a/packages/vitnode/scripts/prepare/prepare-files.ts b/packages/vitnode/scripts/prepare/prepare-files.ts
diff --git a/packages/vitnode/scripts/scripts.ts b/packages/vitnode/scripts/scripts.ts
@@ -3,7 +3,6 @@
 
 import { processPlugin } from './plugin.js';
 import { prepareDatabase } from './prepare-database.js';
-import { prepareFiles } from './prepare/prepare-files.js';
 
 const initMessage = '\x1b[34m[VitNode]\x1b[0m';
 
@@ -21,10 +20,6 @@ switch (command) {
     }
     break;
 
-  case 'prepare':
-    void prepareFiles({ initMessage });
-    break;
-
   default:
     console.log(
       `${initMessage} \x1b[31mCommand not found: "${command ?? ''}"\x1b[0m`,
diff --git a/packages/vitnode/src/components/i18n-provider.tsx b/packages/vitnode/src/components/i18n-provider.tsx
@@ -39,7 +39,7 @@ export async function I18nProvider<
   namespaces: NestedKey | NestedKey[];
 }) {
   const locale = await getLocale();
-  const messagesInit = await getMessages({ locale });
+  const messagesInit: object = await getMessages({ locale });
   const messages = pick(messagesInit, [
     'core.global',
     ...(Array.isArray(namespaces) ? namespaces : [namespaces]),
diff --git a/packages/vitnode/src/vitnode.config.ts b/packages/vitnode/src/vitnode.config.ts
@@ -70,9 +70,28 @@ export const handleRequestConfig = async ({
       ? reqLocale
       : vitNodeConfig.i18n.defaultLocale;
 
+  const pluginsId: string[] = [
+    '@vitnode/core',
+    ...vitNodeConfig.plugins.map(plugin => plugin.id),
+  ];
+
+  // Import and merge messages from all plugins
+  const messagesPromises = pluginsId.map(async pluginId => {
+    try {
+      const messages = await import(`@/langs/${pluginId}/${locale}.json`);
+
+      return messages.default;
+    } catch {
+      return {};
+    }
+  });
+
+  const allMessages = await Promise.all(messagesPromises);
+  const messages = allMessages.reduce((acc, curr) => ({ ...acc, ...curr }), {});
+
   return {
     locale,
-    messages: (await import(`@/plugins/core/langs/${locale}.json`)).default,
+    messages,
     timeZone: vitNodeConfig.i18n.timeZone,
   };
 };
diff --git a/scripts/files/file-copy-manager.ts b/scripts/files/file-copy-manager.ts
@@ -53,7 +53,7 @@ export class FileCopyManager {
       'src/app/[locale]',
       'src/app/favicon.ico',
       'src/app/global-error.tsx',
-      'src/app/globals.css',
+      'src/app/global.css',
       'src/app/layout.tsx',
       'src/app/not-found.tsx',
       'src/app/api',
diff --git a/turbo.json b/turbo.json
@@ -45,8 +45,7 @@
       "dependsOn": ["^lint"]
     },
     "lint:fix": {
-      "dependsOn": ["^lint:fix"],
-      "cache": false
+      "dependsOn": ["^lint:fix"]
     },
     "dev": {
       "cache": false,
