@vnejs/build 0.0.41 → 0.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/build",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "Build tools for @vnejs",
   "main": "src/index.js",
   "bin": {

package/src/client/utils.js

@@ -3,6 +3,22 @@ const path = require("path");
 
 const entryDir = "entry";
 
+const resolveIndexedFile = (dir) => {
+  const candidates = ["index.ts", "index.js"].map((name) => path.join(dir, name));
+
+  return candidates.find((file) => fs.existsSync(file));
+};
+
+const resolveEntryFile = (entryRoot) => {
+  const entryFile = resolveIndexedFile(entryRoot);
+
+  if (!entryFile) {
+    throw new Error(`entry file not found: expected ${["index.ts", "index.js"].map((name) => path.join(entryRoot, name)).join(" or ")}`);
+  }
+
+  return entryFile;
+};
+
 const getVnejsScopedPackageNames = (rootPath, scopePrefix) => {
   let dir = rootPath;
 
@@ -63,20 +79,22 @@ const getGameModScripts = (rootPath) => {
 
   return fs
     .readdirSync(gamePath)
-    .filter((modDir) => fs.existsSync(path.join(gamePath, modDir, "scripts", "index.js")))
-    .sort((modA, modB) => {
+    .map((modDir) => resolveIndexedFile(path.join(gamePath, modDir, "scripts")))
+    .filter(Boolean)
+    .sort((modScriptA, modScriptB) => {
+      const modA = path.basename(path.dirname(path.dirname(modScriptA)));
+      const modB = path.basename(path.dirname(path.dirname(modScriptB)));
       const orderDiff = getModOrder(modB, gamePath) - getModOrder(modA, gamePath);
 
       return orderDiff !== 0 ? orderDiff : modA.localeCompare(modB);
-    })
-    .map((modDir) => path.join(gamePath, modDir, "scripts", "index.js"));
+    });
 };
 
 const importStatementPattern = /^[ \t]*import\s[\s\S]*?;[ \t]*(?:\n|$)/gm;
 
 const toImportStatements = (targets) => targets.map((target) => `import ${JSON.stringify(target)};`);
 
-// Порядок side-effect импортов важен: uis → bundle → entry/index.js → game/*/scripts → тело модуля.
+// Порядок side-effect импортов важен: uis → bundle → entry/index.(ts|js) → game/*/scripts/index.(ts|js) → тело модуля.
 const orderEntryImports = (code, { leadingImports = [], trailingImports = [] } = {}) => {
   const leading = toImportStatements(leadingImports);
   const trailing = toImportStatements(trailingImports);
@@ -106,6 +124,7 @@ const cleanClientOutput = (distPath, isClientOutput) => {
 
 module.exports = {
   entryDir,
+  resolveEntryFile,
   getVnejsScopedPackageNames,
   getGameModIndexJsonFiles,
   getGameModScripts,

package/src/client/vite.config.js

@@ -4,6 +4,7 @@ const react = require("@vitejs/plugin-react").default;
 
 const {
   entryDir,
+  resolveEntryFile,
   getVnejsScopedPackageNames,
   getGameModIndexJsonFiles,
   getGameModScripts,
@@ -29,13 +30,10 @@ module.exports = (rootPath, options = {}) => {
   const isDev = mode === "development";
   const entryRoot = path.join(rootPath, entryDir);
   const distPath = path.join(rootPath, "dist");
-  const entryFile = path.join(entryRoot, "index.js");
+  const entryFile = resolveEntryFile(entryRoot);
+  const entryScript = `./${path.basename(entryFile)}`;
   const htmlFile = path.join(entryRoot, "index.html");
 
-  if (!fs.existsSync(entryFile)) {
-    throw new Error(`entry file not found: ${entryFile}`);
-  }
-
   if (!fs.existsSync(htmlFile)) {
     throw new Error(`html template not found: ${htmlFile}`);
   }
@@ -77,9 +75,9 @@ module.exports = (rootPath, options = {}) => {
         transformIndexHtml: {
           order: "pre",
           handler(html) {
-            if (html.includes("./index.js")) return html;
+            if (html.includes(entryScript)) return html;
 
-            return html.replace("</body>", '    <script type="module" src="./index.js"></script>\n  </body>');
+            return html.replace("</body>", `    <script type="module" src="${entryScript}"></script>\n  </body>`);
           },
         },
       },