@gxp-dev/tools 2.0.89 → 2.0.91

package/bin/lib/cli.js

@@ -51,6 +51,18 @@ const cli = yargs
 		default: false,
 		global: true,
 	})
+	.option("use-global", {
+		describe:
+			"Force-use the global @gxp-dev/tools install (runtime, vite config, templates) and ignore any local node_modules copy",
+		type: "boolean",
+		default: false,
+		global: true,
+	})
+	.middleware((argv) => {
+		if (argv["use-global"]) {
+			process.env.GXDEV_USE_GLOBAL = "true"
+		}
+	})
 	.command(
 		"ui",
 		"Open the interactive Terminal UI without auto-starting anything",

package/bin/lib/commands/dev.js

@@ -229,8 +229,11 @@ function devCommand(argv) {
 	)
 	const installLocation =
 		paths.packageRoot === localToolkitDir ? "local" : "package"
+	const forcedGlobal = process.env.GXDEV_USE_GLOBAL === "true"
 	logger.info(
-		`📦 Using ${installLocation} toolkit install: ${paths.packageRoot}`,
+		`📦 Using ${installLocation} toolkit install: ${paths.packageRoot}${
+			forcedGlobal ? " (forced via --use-global)" : ""
+		}`,
 	)
 
 	// Load .env file if it exists for default values

package/bin/lib/utils/paths.js

@@ -45,9 +45,15 @@ function findProjectRoot() {
 function resolveGxPaths() {
 	const projectRoot = findProjectRoot()
 
-	// Try local installation first
+	// Honor --use-global (propagated by cli.js as GXDEV_USE_GLOBAL=true) to
+	// force the CLI's own install location, even if a local node_modules copy
+	// of @gxp-dev/tools exists. Useful when the local version is stale or
+	// being debugged against the globally installed toolkit.
+	const forceGlobal = process.env.GXDEV_USE_GLOBAL === "true"
+
+	// Try local installation first (unless --use-global)
 	const localNodeModules = path.join(projectRoot, "node_modules", PACKAGE_NAME)
-	if (fs.existsSync(localNodeModules)) {
+	if (!forceGlobal && fs.existsSync(localNodeModules)) {
 		return {
 			gentoPath: path.join(localNodeModules, "bin", getBinaryName()),
 			viteConfigPath: path.join(localNodeModules, "runtime", "vite.config.js"),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@gxp-dev/tools",
-	"version": "2.0.89",
+	"version": "2.0.91",
 	"description": "Dev tools to create platform plugins",
 	"type": "commonjs",
 	"publishConfig": {

package/runtime/vite.config.js

@@ -191,6 +191,30 @@ export default defineConfig(async (ctx) => {
 	// Create plugin to serve runtime files (index.html and main.js) if no local ones exist
 	const runtimeFilesPlugin = {
 		name: "runtime-files",
+		// Resolve the legacy `/@gx-runtime/*` absolute-URL form used by
+		// runtime/index.html (and by any project index.html that hasn't
+		// migrated to the bare `@gx-runtime/...` specifier). Vite's
+		// resolve.alias map only catches bare specifiers, and the
+		// configureServer middleware below only catches HTTP requests —
+		// Vite's internal pre-transform of script-src URLs takes
+		// neither path and ends up logging
+		//   "Pre-transform error: Failed to load url /@gx-runtime/main.js"
+		// every render tick. Returning the real filesystem path here
+		// short-circuits the resolution entirely so pre-transform, the
+		// dep optimizer, and SSR all agree on where the file lives.
+		resolveId(id) {
+			if (typeof id !== "string") return null
+			if (id.startsWith("/@gx-runtime/")) {
+				const relative = id.slice("/@gx-runtime/".length)
+				if (!relative) return null
+				// Strip any query string (e.g. ?t=12345 from HMR) before
+				// resolving against the filesystem.
+				const [bare, query] = relative.split("?")
+				const resolved = path.resolve(runtimeDir, bare)
+				return query ? `${resolved}?${query}` : resolved
+			}
+			return null
+		},
 		configureServer(server) {
 			server.middlewares.use((req, res, next) => {
 				// Serve runtime index.html for root requests and SPA navigation requests