@gxp-dev/tools 2.0.39 → 2.0.41

package/package.json

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

package/runtime/fallback-layouts/AdditionalStyling.css

@@ -0,0 +1 @@
+/* GxP Fallback: No project-level AdditionalStyling.css found */

package/runtime/fallback-layouts/PrivateLayout.vue

@@ -0,0 +1,14 @@
+<template>
+	<slot />
+</template>
+
+<script setup>
+defineOptions({ inheritAttrs: false });
+defineProps({
+	usrLang: { type: String, default: "" },
+	portalSettings: { type: Object, default: () => ({}) },
+	portalLanguage: { type: Object, default: () => ({}) },
+	portalNavigation: { type: Array, default: () => [] },
+	portalAssets: { type: Object, default: () => ({}) },
+});
+</script>

package/runtime/fallback-layouts/PublicLayout.vue

@@ -0,0 +1,14 @@
+<template>
+	<slot />
+</template>
+
+<script setup>
+defineOptions({ inheritAttrs: false });
+defineProps({
+	usrLang: { type: String, default: "" },
+	portalSettings: { type: Object, default: () => ({}) },
+	portalLanguage: { type: Object, default: () => ({}) },
+	portalNavigation: { type: Array, default: () => [] },
+	portalAssets: { type: Object, default: () => ({}) },
+});
+</script>

package/runtime/fallback-layouts/SystemLayout.vue

@@ -0,0 +1,14 @@
+<template>
+	<slot />
+</template>
+
+<script setup>
+defineOptions({ inheritAttrs: false });
+defineProps({
+	usrLang: { type: String, default: "" },
+	portalSettings: { type: Object, default: () => ({}) },
+	portalLanguage: { type: Object, default: () => ({}) },
+	portalNavigation: { type: Array, default: () => [] },
+	portalAssets: { type: Object, default: () => ({}) },
+});
+</script>

package/runtime/vite.config.js

@@ -205,55 +205,17 @@ export default defineConfig(({ mode }) => {
 		},
 	};
 
-	// Fallback plugin for missing @layouts files
-	// When a project doesn't have theme-layouts/, serve minimal fallbacks
-	// so PortalContainer.vue imports don't break
-	const layoutsDir = path.resolve(process.cwd(), "theme-layouts");
-	const layoutFallbackPlugin = {
-		name: "gxp-layout-fallback",
-		resolveId(source) {
-			// Only handle @layouts/ imports
-			if (!source.startsWith("@layouts/")) return null;
-
-			const fileName = source.replace("@layouts/", "");
-			const localFile = path.resolve(layoutsDir, fileName);
-
-			// If the file exists locally, let Vite resolve it normally
-			if (fs.existsSync(localFile)) return null;
-
-			// Return a virtual module ID for the missing file
-			return `\0gxp-layout-fallback:${fileName}`;
-		},
-		load(id) {
-			if (!id.startsWith("\0gxp-layout-fallback:")) return null;
-
-			const fileName = id.replace("\0gxp-layout-fallback:", "");
-			console.log(`⚡ [GxP] Serving fallback for missing layout: ${fileName}`);
-
-			// CSS files get empty content
-			if (fileName.endsWith(".css")) {
-				return "/* GxP fallback: no local AdditionalStyling.css */";
-			}
-
-			// Vue layout components get a passthrough slot wrapper
-			if (fileName.endsWith(".vue")) {
-				return `
-<template><slot /></template>
-<script setup>
-defineOptions({ inheritAttrs: false });
-defineProps({
-	usrLang: { type: String, default: "" },
-	portalSettings: { type: Object, default: () => ({}) },
-	portalLanguage: { type: Object, default: () => ({}) },
-	portalNavigation: { type: Array, default: () => ([]) },
-	portalAssets: { type: Object, default: () => ({}) },
-});
-</script>`;
-			}
-
-			return "";
-		},
-	};
+	// Resolve @layouts: use project's theme-layouts/ if it exists,
+	// otherwise fall back to toolkit's runtime/fallback-layouts/
+	const projectLayoutsDir = path.resolve(process.cwd(), "theme-layouts");
+	const fallbackLayoutsDir = path.resolve(runtimeDir, "fallback-layouts");
+	const layoutsDir = fs.existsSync(projectLayoutsDir) ? projectLayoutsDir : fallbackLayoutsDir;
+
+	if (layoutsDir === fallbackLayoutsDir) {
+		console.log("📐 Layouts: using toolkit fallbacks (no theme-layouts/ directory)");
+	} else {
+		console.log("📐 Layouts: using project theme-layouts/");
+	}
 
 	// Determine if HTTPS is enabled
 	const useHttps = getHttpsConfig(env) !== false;
@@ -287,8 +249,6 @@ defineProps({
 		},
 		plugins: [
 			runtimeFilesPlugin,
-			// Layout fallback must run before vue() to resolve missing @layouts/ imports
-			layoutFallbackPlugin,
 			// Source tracker must run BEFORE vue() to transform templates before compilation
 			gxpSourceTrackerPlugin(),
 			vue(),
@@ -434,7 +394,7 @@ defineProps({
 				// Client project's source directory
 				"@": path.resolve(process.cwd(), "src"),
 				// Theme layouts in client project
-				"@layouts": path.resolve(process.cwd(), "theme-layouts"),
+				"@layouts": layoutsDir,
 				// GxP Toolkit runtime (PortalContainer, etc.) - from node_modules
 				"@gx-runtime": runtimeDir,
 				// Ensure single Vue and Pinia instances

package/template/vite.config.js

@@ -146,41 +146,17 @@ export default defineConfig(({ mode }) => {
 	// Find the toolkit path for runtime imports
 	const toolkitPath = findToolkitPath();
 
-	// Fallback plugin for missing @layouts files
-	const layoutsDir = path.resolve(process.cwd(), "theme-layouts");
-	const layoutFallbackPlugin = {
-		name: "gxp-layout-fallback",
-		resolveId(source) {
-			if (!source.startsWith("@layouts/")) return null;
-			const fileName = source.replace("@layouts/", "");
-			const localFile = path.resolve(layoutsDir, fileName);
-			if (fs.existsSync(localFile)) return null;
-			return `\0gxp-layout-fallback:${fileName}`;
-		},
-		load(id) {
-			if (!id.startsWith("\0gxp-layout-fallback:")) return null;
-			const fileName = id.replace("\0gxp-layout-fallback:", "");
-			console.log(`⚡ [GxP] Serving fallback for missing layout: ${fileName}`);
-			if (fileName.endsWith(".css")) {
-				return "/* GxP fallback: no local AdditionalStyling.css */";
-			}
-			if (fileName.endsWith(".vue")) {
-				return `
-<template><slot /></template>
-<script setup>
-defineOptions({ inheritAttrs: false });
-defineProps({
-	usrLang: { type: String, default: "" },
-	portalSettings: { type: Object, default: () => ({}) },
-	portalLanguage: { type: Object, default: () => ({}) },
-	portalNavigation: { type: Array, default: () => ([]) },
-	portalAssets: { type: Object, default: () => ({}) },
-});
-</script>`;
-			}
-			return "";
-		},
-	};
+	// Resolve @layouts: use project's theme-layouts/ if it exists,
+	// otherwise fall back to toolkit's runtime/fallback-layouts/
+	const projectLayoutsDir = path.resolve(process.cwd(), "theme-layouts");
+	const fallbackLayoutsDir = path.resolve(toolkitPath, "runtime", "fallback-layouts");
+	const layoutsDir = fs.existsSync(projectLayoutsDir) ? projectLayoutsDir : fallbackLayoutsDir;
+
+	if (layoutsDir === fallbackLayoutsDir) {
+		console.log("📐 Layouts: using toolkit fallbacks (no theme-layouts/ directory)");
+	} else {
+		console.log("📐 Layouts: using project theme-layouts/");
+	}
 
 	// Determine if HTTPS is enabled
 	const useHttps = getHttpsConfig(env) !== false;
@@ -211,8 +187,6 @@ defineProps({
 			),
 		},
 		plugins: [
-			// Layout fallback must run before vue() to resolve missing @layouts/ imports
-			layoutFallbackPlugin,
 			// Source tracker must come before vue() to transform templates before compilation
 			...(gxpSourceTrackerPlugin ? [gxpSourceTrackerPlugin()] : []),
 			vue(),
@@ -349,7 +323,7 @@ defineProps({
 				// Client project's source directory
 				"@": path.resolve(process.cwd(), "src"),
 				// Theme layouts in client project
-				"@layouts": path.resolve(process.cwd(), "theme-layouts"),
+				"@layouts": layoutsDir,
 				// GxP Toolkit runtime (PortalContainer, etc.) - from node_modules
 				"@gx-runtime": path.resolve(toolkitPath, "runtime"),
 				// Ensure single Vue and Pinia instances