@bonsae/nrg 0.18.3 → 0.18.5

package/test/client/e2e/index.js

@@ -1998,7 +1998,7 @@ async function build2(clientBuildOptions, buildContext) {
 import { spawn, execSync } from "child_process";
 import getPort from "get-port";
 import detect from "detect-port";
-import { builtinModules as builtinModules2 } from "module";
+import { builtinModules as builtinModules2, createRequire as createRequire3 } from "module";
 import treeKill from "tree-kill";
 import fs10 from "fs";
 import os from "os";
@@ -2132,7 +2132,7 @@ var NodeRedLauncher = class {
     }
     const outDir = path10.resolve(this.outDir).split(path10.sep).join("/");
     const cwd = process.cwd().split(path10.sep).join("/");
-    const userDir = path10.resolve(cwd, ".node-red");
+    const userDir = path10.resolve(cwd, ".node-red").split(path10.sep).join("/");
     const finalRuntimeSettingsFile = compiledRuntimeSettingsFilepath ? `
 const compiledRuntimeSettings = require("${compiledRuntimeSettingsFilepath.split(path10.sep).join("/")}");
 const settings = compiledRuntimeSettings.default || compiledRuntimeSettings;
@@ -2165,7 +2165,33 @@ module.exports = settings;
     this.compiledRuntimeSettingsFilepath = finalRuntimeSettingsFilepath;
     return finalRuntimeSettingsFilepath;
   }
+  resolveFromLocalNodeModules() {
+    try {
+      const require_ = createRequire3(path10.join(process.cwd(), "package.json"));
+      const pkgJsonPath = require_.resolve("node-red/package.json");
+      const pkgDir = path10.dirname(pkgJsonPath);
+      const pkg = JSON.parse(fs10.readFileSync(pkgJsonPath, "utf-8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.["node-red"];
+      if (!bin) return null;
+      const entry = path10.resolve(pkgDir, bin);
+      return fs10.existsSync(entry) ? entry : null;
+    } catch {
+      return null;
+    }
+  }
   resolveNodeRedEntryPoint() {
+    this.logger.info(`Resolving ${this.nodeRedCommand} entry point...`);
+    const hasExplicitVersion = this.options.runtime?.version !== void 0 && this.options.runtime.version !== "latest";
+    if (!hasExplicitVersion) {
+      const localEntry = this.resolveFromLocalNodeModules();
+      if (localEntry) {
+        this.logger.info(`Resolved from local node_modules: ${localEntry}`);
+        return localEntry;
+      }
+    }
+    this.logger.info(
+      hasExplicitVersion ? `Using configured version (${this.options.runtime.version}), downloading via npx...` : `Not found locally, downloading via npx (this may take a while)...`
+    );
     const resolverScript = path10.join(
       os.tmpdir(),
       `nrg-resolve-node-red-${process.pid}.cjs`
@@ -2195,7 +2221,7 @@ for (const d of dirs) {
     try {
       const entryPoint = execSync(
         `npx --yes -p ${this.nodeRedCommand} -c "node ${resolverScript}"`,
-        { encoding: "utf-8", timeout: 12e4 }
+        { encoding: "utf-8", timeout: 3e5 }
       ).trim();
       if (!entryPoint || !fs10.existsSync(entryPoint)) {
         throw new NodeRedStartError(
@@ -2204,6 +2230,7 @@ for (const d of dirs) {
           )
         );
       }
+      this.logger.info(`Resolved via npx: ${entryPoint}`);
       return entryPoint;
     } finally {
       try {

package/vite/index.js

@@ -110,7 +110,7 @@ function mergeOptions(defaults, overrides) {
 import { spawn, execSync } from "child_process";
 import getPort from "get-port";
 import detect from "detect-port";
-import { builtinModules } from "module";
+import { builtinModules, createRequire } from "module";
 import treeKill from "tree-kill";
 import fs2 from "fs";
 import os from "os";
@@ -350,7 +350,7 @@ var NodeRedLauncher = class {
     }
     const outDir = path2.resolve(this.outDir).split(path2.sep).join("/");
     const cwd = process.cwd().split(path2.sep).join("/");
-    const userDir = path2.resolve(cwd, ".node-red");
+    const userDir = path2.resolve(cwd, ".node-red").split(path2.sep).join("/");
     const finalRuntimeSettingsFile = compiledRuntimeSettingsFilepath ? `
 const compiledRuntimeSettings = require("${compiledRuntimeSettingsFilepath.split(path2.sep).join("/")}");
 const settings = compiledRuntimeSettings.default || compiledRuntimeSettings;
@@ -383,7 +383,33 @@ module.exports = settings;
     this.compiledRuntimeSettingsFilepath = finalRuntimeSettingsFilepath;
     return finalRuntimeSettingsFilepath;
   }
+  resolveFromLocalNodeModules() {
+    try {
+      const require_ = createRequire(path2.join(process.cwd(), "package.json"));
+      const pkgJsonPath = require_.resolve("node-red/package.json");
+      const pkgDir = path2.dirname(pkgJsonPath);
+      const pkg = JSON.parse(fs2.readFileSync(pkgJsonPath, "utf-8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.["node-red"];
+      if (!bin) return null;
+      const entry = path2.resolve(pkgDir, bin);
+      return fs2.existsSync(entry) ? entry : null;
+    } catch {
+      return null;
+    }
+  }
   resolveNodeRedEntryPoint() {
+    this.logger.info(`Resolving ${this.nodeRedCommand} entry point...`);
+    const hasExplicitVersion = this.options.runtime?.version !== void 0 && this.options.runtime.version !== "latest";
+    if (!hasExplicitVersion) {
+      const localEntry = this.resolveFromLocalNodeModules();
+      if (localEntry) {
+        this.logger.info(`Resolved from local node_modules: ${localEntry}`);
+        return localEntry;
+      }
+    }
+    this.logger.info(
+      hasExplicitVersion ? `Using configured version (${this.options.runtime.version}), downloading via npx...` : `Not found locally, downloading via npx (this may take a while)...`
+    );
     const resolverScript = path2.join(
       os.tmpdir(),
       `nrg-resolve-node-red-${process.pid}.cjs`
@@ -413,7 +439,7 @@ for (const d of dirs) {
     try {
       const entryPoint = execSync(
         `npx --yes -p ${this.nodeRedCommand} -c "node ${resolverScript}"`,
-        { encoding: "utf-8", timeout: 12e4 }
+        { encoding: "utf-8", timeout: 3e5 }
       ).trim();
       if (!entryPoint || !fs2.existsSync(entryPoint)) {
         throw new NodeRedStartError(
@@ -422,6 +448,7 @@ for (const d of dirs) {
           )
         );
       }
+      this.logger.info(`Resolved via npx: ${entryPoint}`);
       return entryPoint;
     } finally {
       try {
@@ -1311,7 +1338,7 @@ import path11 from "path";
 import fs6 from "fs";
 import path6 from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 
 // src/vite/client/plugins/help-i18n.ts
 var translations = {
@@ -1752,7 +1779,7 @@ function helpGenerator(options) {
           const mod = await import(fileUrl);
           packageFn = mod?.default ?? mod;
         } else if (fs6.existsSync(cjsPath)) {
-          const require2 = createRequire(import.meta.url);
+          const require2 = createRequire2(import.meta.url);
           delete require2.cache[cjsPath];
           const rawMod = require2(cjsPath);
           packageFn = rawMod?.default ?? rawMod;
@@ -2096,7 +2123,7 @@ function minifier() {
 }
 
 // src/vite/client/plugins/node-definitions-inliner.ts
-import { createRequire as createRequire2 } from "module";
+import { createRequire as createRequire3 } from "module";
 import { pathToFileURL as pathToFileURL3 } from "url";
 import path9 from "path";
 import fs9 from "fs";
@@ -2157,7 +2184,7 @@ function nodeDefinitionsInliner(serverOutDir, entryPath, iconsDir, componentsDir
         const mod = await import(fileUrl);
         packageFn = mod?.default ?? mod;
       } else if (fs9.existsSync(cjsEntryPath)) {
-        const require2 = createRequire2(import.meta.url);
+        const require2 = createRequire3(import.meta.url);
         delete require2.cache[cjsEntryPath];
         const rawMod = require2(cjsEntryPath);
         packageFn = rawMod?.default ?? rawMod;