@bonsae/nrg 0.19.0 → 0.19.1

package/README.md

@@ -36,10 +36,10 @@ Installing `node-red` as a dev dependency is recommended for fast, reliable dev
 
 ```typescript
 import { defineConfig } from "vite";
-import { nodeRed } from "@bonsae/nrg/vite";
+import { nrg } from "@bonsae/nrg/vite";
 
 export default defineConfig({
-  plugins: [nodeRed()],
+  plugins: [nrg()],
 });
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonsae/nrg",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "NRG framework — build Node-RED nodes with Vue 3, TypeScript, and JSON Schema",
   "author": "Allan Oricil <allanoricil@duck.com>",
   "license": "MIT",

package/test/client/e2e/index.js

@@ -2191,7 +2191,7 @@ async function compileRuntimeSettingsFile(runtimeSettingsFilepath, port) {
   return compiledRuntimeSettingsFilepath;
 }
 async function generateRuntimeSettings(options) {
-  const { outDir, port, settingsFilepath, httpAdminRoot, logger: logger2 } = options;
+  const { outDir, port, settingsFilepath, logger: logger2 } = options;
   const tempFiles = [];
   const userRuntimeSettingsFilepath = findUserRuntimeSettingsFilepath(
     settingsFilepath,
@@ -2210,17 +2210,13 @@ async function generateRuntimeSettings(options) {
   const userDir = path11.resolve(cwd, ".node-red").split(path11.sep).join("/");
   const userDirLiteral = JSON.stringify(userDir);
   const outDirLiteral = JSON.stringify(normalizedOutDir);
-  const httpAdminRootAssignment = httpAdminRoot ? `settings.httpAdminRoot = ${JSON.stringify(httpAdminRoot)};
-` : "";
-  const httpAdminRootEntry = httpAdminRoot ? `
-  httpAdminRoot: ${JSON.stringify(httpAdminRoot)},` : "";
   const finalRuntimeSettingsFile = compiledRuntimeSettingsFilepath ? `
 const compiledRuntimeSettings = require(${JSON.stringify(
     compiledRuntimeSettingsFilepath.split(path11.sep).join("/")
   )});
 const settings = compiledRuntimeSettings.default || compiledRuntimeSettings;
 settings.uiPort = ${port};
-${httpAdminRootAssignment}if(!settings.userDir){
+if(!settings.userDir){
     settings.userDir = ${userDirLiteral};
 }
 settings.nodesDir = settings.nodesDir || [];
@@ -2242,7 +2238,7 @@ const settings = {
   uiPort: ${port},
   userDir: ${userDirLiteral},
   flowFile: "flows.json",
-  nodesDir: [${outDirLiteral}],${httpAdminRootEntry}
+  nodesDir: [${outDirLiteral}],
   // the welcome tour overlay intercepts pointer events \u2014 fatal for e2e
   editorTheme: { tours: false },
 };
@@ -2396,12 +2392,10 @@ var NodeRedLauncher = class {
   port = null;
   outDir;
   options;
-  _slug;
   logger;
-  constructor(outDir, options, slug = "") {
+  constructor(outDir, options) {
     this.outDir = outDir;
     this.options = options;
-    this._slug = slug;
     this.logger = new Logger({
       name: "vite-plugin-node-red",
       prefix: "node-red"
@@ -2410,12 +2404,6 @@ var NodeRedLauncher = class {
   get preferredPort() {
     return this.options.runtime?.port ?? 1880;
   }
-  get slug() {
-    return this._slug;
-  }
-  get basePath() {
-    return this._slug ? `/${this._slug}/` : "/";
-  }
   get restartDelay() {
     return this.options.restartDelay ?? 1e3;
   }
@@ -2496,7 +2484,6 @@ var NodeRedLauncher = class {
         outDir: this.outDir,
         port: this.port,
         settingsFilepath: this.options.runtime?.settingsFilepath,
-        httpAdminRoot: this._slug ? this.basePath : void 0,
         logger: this.logger
       });
       for (const file of settings.tempFiles) {

package/types/vite.d.ts

@@ -80,15 +80,6 @@ export interface NodeRedLauncherOptions {
 export interface ServerOptions {
 	/** Options for the Node-RED dev server launcher. */
 	nodeRed?: NodeRedLauncherOptions;
-	/**
-	 * URL-safe path slug the dev server mounts the Node-RED editor under, so
-	 * several `nrg dev` instances can be told apart by path (e.g. behind a
-	 * shared reverse proxy) — the editor is served at
-	 * `http://host:port/<slug>/`. Must match `/^[a-z0-9]+(?:-[a-z0-9]+)*$/`;
-	 * an invalid value is rejected rather than rewritten.
-	 * @default the slugified project folder name
-	 */
-	slug?: string;
 }
 /**
  * Options for building the distributable Node-RED package.
@@ -111,7 +102,7 @@ export interface BuildOptions {
  * `build` for the production bundle.
  */
 export interface NrgPluginOptions {
-	/** Dev server options (Node-RED launcher, editor path slug). */
+	/** Dev server options (Node-RED launcher). */
 	server?: ServerOptions;
 	/** Production build options (output dir, server/client bundles, copies). */
 	build?: BuildOptions;
@@ -177,10 +168,6 @@ export interface NodeRedLauncher {
 	cleanup(): void;
 	flushLogs(): void;
 	readonly preferredPort: number;
-	/** URL-safe path slug the editor is mounted under (empty for root). */
-	readonly slug: string;
-	/** Path prefix derived from the slug — `/<slug>/`, or `/` when no slug. */
-	readonly basePath: string;
 	readonly restartDelay: number;
 	readonly pid: number | null;
 }

package/vite/index.js

@@ -52,40 +52,6 @@ var DEFAULT_EXTRA_FILES_COPY_TARGETS = [
 // src/vite/utils.ts
 import fs from "fs";
 import path from "path";
-
-// src/vite/errors.ts
-var PluginError = class extends Error {
-  constructor(message, code, cause) {
-    super(message);
-    this.code = code;
-    this.cause = cause;
-    this.name = "PluginError";
-  }
-};
-var NodeRedStartError = class extends PluginError {
-  constructor(cause) {
-    super("Failed to start Node-RED", "NODE_RED_START_FAILED", cause);
-    this.name = "NodeRedStartError";
-  }
-};
-var BuildError = class extends PluginError {
-  constructor(phase, cause) {
-    super(
-      `Failed to build ${phase}`,
-      `BUILD_${phase.toUpperCase()}_FAILED`,
-      cause
-    );
-    this.name = "BuildError";
-  }
-};
-var ConfigError = class extends PluginError {
-  constructor(message) {
-    super(message, "CONFIG_INVALID");
-    this.name = "ConfigError";
-  }
-};
-
-// src/vite/utils.ts
 function cleanDir(dir) {
   if (fs.existsSync(dir)) {
     fs.rmSync(dir, { recursive: true });
@@ -120,23 +86,6 @@ function getPackageName() {
   }
   return "node-red-nodes";
 }
-var SLUG_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-function slugify(input) {
-  return input.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-}
-function resolveSlug(userSlug) {
-  if (userSlug !== void 0) {
-    const trimmed = userSlug.trim();
-    if (!SLUG_PATTERN.test(trimmed)) {
-      const suggestion = slugify(trimmed);
-      throw new ConfigError(
-        `Invalid dev server slug ${JSON.stringify(userSlug)}. A slug must be URL-safe: lowercase letters, digits and single hyphens (matching ${String(SLUG_PATTERN)}).` + (suggestion ? ` Did you mean ${JSON.stringify(suggestion)}?` : "")
-      );
-    }
-    return trimmed;
-  }
-  return slugify(path.basename(process.cwd())) || "app";
-}
 function mergeOptions(defaults, overrides) {
   if (!overrides) return { ...defaults };
   const result = { ...defaults };
@@ -202,6 +151,32 @@ async function retry(fn, options = {}) {
   throw lastError;
 }
 
+// src/vite/errors.ts
+var PluginError = class extends Error {
+  constructor(message, code, cause) {
+    super(message);
+    this.code = code;
+    this.cause = cause;
+    this.name = "PluginError";
+  }
+};
+var NodeRedStartError = class extends PluginError {
+  constructor(cause) {
+    super("Failed to start Node-RED", "NODE_RED_START_FAILED", cause);
+    this.name = "NodeRedStartError";
+  }
+};
+var BuildError = class extends PluginError {
+  constructor(phase, cause) {
+    super(
+      `Failed to build ${phase}`,
+      `BUILD_${phase.toUpperCase()}_FAILED`,
+      cause
+    );
+    this.name = "BuildError";
+  }
+};
+
 // src/vite/logger.ts
 import * as clackLogger from "@clack/prompts";
 var color = {
@@ -424,7 +399,7 @@ async function compileRuntimeSettingsFile(runtimeSettingsFilepath, port) {
   return compiledRuntimeSettingsFilepath;
 }
 async function generateRuntimeSettings(options) {
-  const { outDir, port, settingsFilepath, httpAdminRoot, logger: logger2 } = options;
+  const { outDir, port, settingsFilepath, logger: logger2 } = options;
   const tempFiles = [];
   const userRuntimeSettingsFilepath = findUserRuntimeSettingsFilepath(
     settingsFilepath,
@@ -443,17 +418,13 @@ async function generateRuntimeSettings(options) {
   const userDir = path3.resolve(cwd, ".node-red").split(path3.sep).join("/");
   const userDirLiteral = JSON.stringify(userDir);
   const outDirLiteral = JSON.stringify(normalizedOutDir);
-  const httpAdminRootAssignment = httpAdminRoot ? `settings.httpAdminRoot = ${JSON.stringify(httpAdminRoot)};
-` : "";
-  const httpAdminRootEntry = httpAdminRoot ? `
-  httpAdminRoot: ${JSON.stringify(httpAdminRoot)},` : "";
   const finalRuntimeSettingsFile = compiledRuntimeSettingsFilepath ? `
 const compiledRuntimeSettings = require(${JSON.stringify(
     compiledRuntimeSettingsFilepath.split(path3.sep).join("/")
   )});
 const settings = compiledRuntimeSettings.default || compiledRuntimeSettings;
 settings.uiPort = ${port};
-${httpAdminRootAssignment}if(!settings.userDir){
+if(!settings.userDir){
     settings.userDir = ${userDirLiteral};
 }
 settings.nodesDir = settings.nodesDir || [];
@@ -475,7 +446,7 @@ const settings = {
   uiPort: ${port},
   userDir: ${userDirLiteral},
   flowFile: "flows.json",
-  nodesDir: [${outDirLiteral}],${httpAdminRootEntry}
+  nodesDir: [${outDirLiteral}],
   // the welcome tour overlay intercepts pointer events \u2014 fatal for e2e
   editorTheme: { tours: false },
 };
@@ -629,12 +600,10 @@ var NodeRedLauncher = class {
   port = null;
   outDir;
   options;
-  _slug;
   logger;
-  constructor(outDir, options, slug = "") {
+  constructor(outDir, options) {
     this.outDir = outDir;
     this.options = options;
-    this._slug = slug;
     this.logger = new Logger({
       name: "vite-plugin-node-red",
       prefix: "node-red"
@@ -643,12 +612,6 @@ var NodeRedLauncher = class {
   get preferredPort() {
     return this.options.runtime?.port ?? 1880;
   }
-  get slug() {
-    return this._slug;
-  }
-  get basePath() {
-    return this._slug ? `/${this._slug}/` : "/";
-  }
   get restartDelay() {
     return this.options.restartDelay ?? 1e3;
   }
@@ -729,7 +692,6 @@ var NodeRedLauncher = class {
         outDir: this.outDir,
         port: this.port,
         settingsFilepath: this.options.runtime?.settingsFilepath,
-        httpAdminRoot: this._slug ? this.basePath : void 0,
         logger: this.logger
       });
       for (const file of settings.tempFiles) {
@@ -2720,8 +2682,6 @@ function serverPlugin(options) {
     extraFilesCopyTargets,
     buildContext
   } = options;
-  const { slug, basePath } = nodeRedLauncher;
-  const proxyKey = slug ? `^/${slug}(?:/|\\?|$)` : "^/.*";
   let nodeRedPort;
   let initialStartDone = false;
   let isStarting = false;
@@ -2761,7 +2721,7 @@ function serverPlugin(options) {
       logger.stopSpinner("Node-RED started");
       const proxyConfig = server.config.server.proxy;
       if (proxyConfig && typeof proxyConfig === "object") {
-        const rule = proxyConfig[proxyKey];
+        const rule = proxyConfig["^/.*"];
         if (rule && typeof rule === "object") {
           rule.target = `http://127.0.0.1:${nodeRedPort}`;
         }
@@ -2786,7 +2746,7 @@ function serverPlugin(options) {
   const printServerUrls = (vitePort, nodeRedPorts) => {
     console.log();
     console.log(
-      `  ${color2.cyan("Vite")}      ${color2.dim("\u279C")}  ${color2.cyan(`http://127.0.0.1:${vitePort}${basePath}`)}`
+      `  ${color2.cyan("Vite")}      ${color2.dim("\u279C")}  ${color2.cyan(`http://127.0.0.1:${vitePort}/`)}`
     );
     if (nodeRedPorts.actual != nodeRedPorts.preferred) {
       console.log(
@@ -2808,7 +2768,7 @@ function serverPlugin(options) {
         server: {
           host: "127.0.0.1",
           proxy: {
-            [proxyKey]: {
+            "^/.*": {
               target: `http://127.0.0.1:${nodeRedLauncher.preferredPort}`,
               changeOrigin: true,
               ws: true,
@@ -2851,17 +2811,6 @@ function serverPlugin(options) {
     },
     async configureServer(viteServer) {
       server = viteServer;
-      if (slug) {
-        server.middlewares.use((req, res, next) => {
-          if (req.url === "/" || req.url === "") {
-            res.statusCode = 302;
-            res.setHeader("Location", basePath);
-            res.end();
-            return;
-          }
-          next();
-        });
-      }
       logger.intro();
       await start2(true);
       initialStartDone = true;
@@ -3004,11 +2953,9 @@ function nrg(options = {}) {
     packageName: getPackageName(),
     isDev: process.env.NODE_ENV === "development"
   };
-  const slug = resolveSlug(server.slug);
   const nodeRedLauncher = new NodeRedLauncher(
     resolvedOutDir,
-    nodeRedLauncherOptions,
-    slug
+    nodeRedLauncherOptions
   );
   return [
     serverPlugin({