@vnejs/build 0.0.36 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/build",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "Build tools for @vnejs",
   "main": "src/index.js",
   "bin": {
@@ -16,12 +16,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@bem-react/classname": "1.5.12",
-    "@vitejs/plugin-react": "^5.1.2",
+    "@vitejs/plugin-react": "~6.0.2",
     "commander": "13.1.0",
-    "lodash.merge": "4.6.2",
-    "react": "~19.2.7",
-    "react-dom": "~19.2.7",
-    "vite": "^7.0.4"
+    "vite": "~8.0.16"
   }
 }

package/src/client/index.js

@@ -15,7 +15,12 @@ module.exports = (rootDir) => async (options) => {
       process.on("SIGTERM", closeWatcher);
     }
   } catch (error) {
-    console.error(error);
+    if (error.errors) {
+      error.errors.forEach((buildError) => console.error(buildError));
+    } else {
+      console.error(error);
+    }
+
     process.exit(1);
   }
 };

package/src/client/utils.js

@@ -72,15 +72,13 @@ const getGameModScripts = (rootPath) => {
     .map((modDir) => path.join(gamePath, modDir, "scripts", "index.js"));
 };
 
-const resolvePackageDir = (name, rootPath) => path.dirname(require.resolve(`${name}/package.json`, { paths: [rootPath] }));
-
 const importStatementPattern = /^[ \t]*import\s[\s\S]*?;[ \t]*(?:\n|$)/gm;
 
 const toImportStatements = (targets) => targets.map((target) => `import ${JSON.stringify(target)};`);
 
-// Порядок side-effect импортов важен: vendors → uis → bundle → entry/index.js → game/*/scripts → тело модуля.
-const orderEntryImports = (code, { vendorImports = [], leadingImports = [], trailingImports = [] } = {}) => {
-  const leading = toImportStatements([...vendorImports, ...leadingImports]);
+// Порядок side-effect импортов важен: uis → bundle → entry/index.js → game/*/scripts → тело модуля.
+const orderEntryImports = (code, { leadingImports = [], trailingImports = [] } = {}) => {
+  const leading = toImportStatements(leadingImports);
   const trailing = toImportStatements(trailingImports);
   const matches = [...code.matchAll(importStatementPattern)];
 
@@ -106,15 +104,11 @@ const cleanClientOutput = (distPath, isClientOutput) => {
   });
 };
 
-const vendorImports = ["react", "react-dom", "@bem-react/classname"];
-
 module.exports = {
   entryDir,
-  vendorImports,
   getVnejsScopedPackageNames,
   getGameModIndexJsonFiles,
   getGameModScripts,
-  resolvePackageDir,
   orderEntryImports,
   cleanClientOutput,
 };

package/src/client/vite.config.js

@@ -4,21 +4,18 @@ const react = require("@vitejs/plugin-react").default;
 
 const {
   entryDir,
-  vendorImports,
   getVnejsScopedPackageNames,
   getGameModIndexJsonFiles,
   getGameModScripts,
-  resolvePackageDir,
   orderEntryImports,
   cleanClientOutput,
 } = require("./utils");
 
-const buildChunkPattern = /^(index|vendors|uis|bundle|web)\.[a-zA-Z0-9_-]+\.js$/;
+const buildChunkPattern = /^(index|uis|bundle|web)\.[a-zA-Z0-9_-]+\.js$/;
+const legacyChunkPattern = /^vendors\.[a-zA-Z0-9_.-]+$/;
 
-const isClientOutput = (asset) => asset === "index.html" || buildChunkPattern.test(asset) || asset.startsWith("assets/");
-
-const isVendorModule = (id) =>
-  /[/\\](react|react-dom)([/\\]|$)/.test(id) || id.includes("@bem-react/classname");
+const isClientOutput = (asset) =>
+  asset === "index.html" || buildChunkPattern.test(asset) || legacyChunkPattern.test(asset) || asset.startsWith("assets/");
 
 const isBundleModule = (id) => /(@vnejs[/\\]bundles\.|[/\\]bundles[/\\])/.test(id);
 
@@ -44,7 +41,6 @@ module.exports = (rootPath, options = {}) => {
 
   const buildOrderedEntry = (code) =>
     orderEntryImports(code, {
-      vendorImports,
       leadingImports: [...uisPackages, ...bundlePackages],
       trailingImports: getGameModScripts(rootPath),
     });
@@ -60,10 +56,6 @@ module.exports = (rootPath, options = {}) => {
       "process.env.NODE_ENV": JSON.stringify(isDev ? "development" : "production"),
     },
     resolve: {
-      alias: {
-        react: resolvePackageDir("react", rootPath),
-        "react-dom": resolvePackageDir("react-dom", rootPath),
-      },
       extensions: [".js", ".jsx", ".ts", ".tsx", ".css"],
     },
     plugins: [
@@ -106,7 +98,7 @@ module.exports = (rootPath, options = {}) => {
       minify: !isDev,
       watch: options.watch ? {} : null,
       assetsInlineLimit: (filePath) => (/\.(jpe?g|png|gif|svg)$/i.test(filePath) ? Number.POSITIVE_INFINITY : 4096),
-      rollupOptions: {
+      rolldownOptions: {
         input: htmlFile,
         output: {
           entryFileNames: "[name].[hash].js",
@@ -118,10 +110,11 @@ module.exports = (rootPath, options = {}) => {
 
             return "assets/[name].[hash][extname]";
           },
-          manualChunks(id) {
-            if (isBundleModule(id)) return "bundle";
-            if (isUisModule(id)) return "uis";
-            if (isVendorModule(id)) return "vendors";
+          codeSplitting: {
+            groups: [
+              { name: "uis", test: isUisModule, priority: 20 },
+              { name: "bundle", test: isBundleModule, priority: 10 },
+            ],
           },
         },
       },

package/src/data/index.js

@@ -1,8 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const merge = require("lodash.merge");
-
-const { runBuildData, buildModsJson } = require("./utils");
+const { runBuildData, buildModsJson, mergePlainObjects } = require("./utils");
 
 const buildDataFunc = (gameDir, distDir) => {
   let result = {};
@@ -10,7 +8,7 @@ const buildDataFunc = (gameDir, distDir) => {
   fs.readdirSync(gameDir).forEach((modDir) => {
     const newData = runBuildData({ modDir: path.join(gameDir, modDir) });
 
-    result = merge(result, newData);
+    result = mergePlainObjects(result, newData);
 
     newData.data.media && fs.writeFileSync(path.join(distDir, `media.${modDir}.json`), JSON.stringify(newData.data.media));
   });

package/src/data/utils.js

@@ -163,6 +163,30 @@ const readModIndexJson = (modPath) => {
   }
 };
 
+const mergePlainObjects = (target, source) => {
+  const result = { ...target };
+
+  for (const [key, value] of Object.entries(source)) {
+    const current = result[key];
+
+    if (
+      value !== null &&
+      typeof value === "object" &&
+      !Array.isArray(value) &&
+      current !== null &&
+      typeof current === "object" &&
+      !Array.isArray(current)
+    ) {
+      result[key] = mergePlainObjects(current, value);
+      continue;
+    }
+
+    result[key] = value;
+  }
+
+  return result;
+};
+
 const buildModsJson = (gameDir) =>
   fs.readdirSync(gameDir).reduce((mods, modDir) => {
     const modPath = path.join(gameDir, modDir);
@@ -178,4 +202,4 @@ const buildModsJson = (gameDir) =>
     return mods;
   }, {});
 
-module.exports = { runBuildData, buildModsJson };
+module.exports = { runBuildData, buildModsJson, mergePlainObjects };