@vixt/react 0.6.3 → 0.6.4

package/dist/client/App.tsx

@@ -0,0 +1,17 @@
+// @ts-nocheck
+import routes from '~react-pages'
+import { BrowserRouter, useRoutes } from 'react-router'
+import appConfig from 'virtual:vixt:app-config'
+import { setupLayouts } from 'virtual:vixt:setup-layouts'
+
+function App() {
+  const routesWithLayouts = setupLayouts(routes)
+  const Routes = () => useRoutes(routesWithLayouts)
+  return (
+    <BrowserRouter basename={appConfig.baseURL}>
+      <Routes />
+    </BrowserRouter>
+  )
+}
+
+export default App

package/dist/client/entry.js

@@ -1,11 +1,11 @@
-import { createElement } from "react";
-import appConfig from "virtual:vixt:app-config";
 import "virtual:vixt:css";
 import "virtual:uno.css";
 import { applyPlugins, createVixtApp } from "@vixt/core/client";
+import { createElement } from "react";
 import { createRoot } from "react-dom/client";
+import appConfig from "virtual:vixt:app-config";
 import plugins from "virtual:vixt:plugins";
-import RootComponent from "virtual:vixt:root-component";
+import RootComponent from "virtual:vixt:root-component.tsx";
 
 //#region src/client/entry.ts
 async function entry() {

package/dist/index.mjs

@@ -16,6 +16,7 @@ import fg from "fast-glob";
 import { pascalCase } from "unplugin-vue-components";
 import extractComments from "extract-comments";
 import { parse } from "yaml";
+import { parseAst } from "vite";
 
 //#region rolldown:runtime
 var __create = Object.create;
@@ -8789,28 +8790,43 @@ var preset_react_default = defineVixtModule({
 
 //#endregion
 //#region src/modules/virtual-root-component.ts
-function resolveRootComponentPath(vixt) {
+function resolveRootComponent(vixt) {
 	for (const layer of vixt._layers) {
 		const layerRootComponentPath = posix.resolve(layer.config.srcDir, "App.tsx");
-		if (import_lib.default.existsSync(layerRootComponentPath)) return layerRootComponentPath;
+		const layerRootComponentCode = import_lib.default.existsSync(layerRootComponentPath) && import_lib.default.readFileSync(layerRootComponentPath, "utf-8") || "";
+		if (!isEmptyCode(layerRootComponentCode)) return {
+			path: layerRootComponentPath,
+			code: layerRootComponentCode
+		};
+	}
+	const defaultRootComponentPath = resolvePathSync("@vixt/react/client/App");
+	return {
+		path: defaultRootComponentPath,
+		code: import_lib.default.readFileSync(defaultRootComponentPath, "utf-8")
+	};
+}
+function isEmptyCode(code) {
+	if (!code) return true;
+	try {
+		return !parseAst(code, { jsx: true }).body.length;
+	} catch {
+		return false;
 	}
-	return resolvePathSync("@vixt/react/client/App");
 }
-const name$1 = "virtual:vixt:root-component";
-const virtualModuleId$1 = name$1;
-const resolvedVirtualModuleId$1 = `\0${virtualModuleId$1}`;
+const name$1 = "virtual:vixt:root-component.tsx";
 var virtual_root_component_default = defineVixtModule({
 	meta: { name: name$1 },
 	setup(_, vixt) {
 		return {
 			name: name$1,
 			resolveId(id) {
-				if (id === virtualModuleId$1) return resolvedVirtualModuleId$1;
+				if (id === name$1) return name$1;
 			},
 			load(id) {
-				if (id === resolvedVirtualModuleId$1) {
-					const rootComponentPath = resolveRootComponentPath(vixt);
-					return import_lib.default.readFileSync(rootComponentPath, "utf-8");
+				if (id === name$1) {
+					const { path: path$13, code } = resolveRootComponent(vixt);
+					this.addWatchFile(path$13);
+					return code;
 				}
 			}
 		};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/react",
   "type": "module",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
@@ -13,6 +13,7 @@
   ],
   "exports": {
     ".": "./dist/index.mjs",
+    "./client/App": "./src/client/App.tsx",
     "./client/*": "./dist/client/*.js",
     "./types": "./dist/types/index.d.ts",
     "./package.json": "./package.json"
@@ -35,6 +36,6 @@
     "vite-plugin-pages": "^0.33.2",
     "vite-plugin-vue-layouts": "^0.11.0",
     "yaml": "^2.8.2",
-    "@vixt/core": "0.6.3"
+    "@vixt/core": "0.6.4"
   }
 }

package/src/client/App.tsx

@@ -0,0 +1,17 @@
+// @ts-nocheck
+import routes from '~react-pages'
+import { BrowserRouter, useRoutes } from 'react-router'
+import appConfig from 'virtual:vixt:app-config'
+import { setupLayouts } from 'virtual:vixt:setup-layouts'
+
+function App() {
+  const routesWithLayouts = setupLayouts(routes)
+  const Routes = () => useRoutes(routesWithLayouts)
+  return (
+    <BrowserRouter basename={appConfig.baseURL}>
+      <Routes />
+    </BrowserRouter>
+  )
+}
+
+export default App

package/src/client/entry.ts

@@ -8,7 +8,7 @@ import appConfig from 'virtual:vixt:app-config'
 // @ts-expect-error virtual file
 import plugins from 'virtual:vixt:plugins'
 // @ts-expect-error virtual file
-import RootComponent from 'virtual:vixt:root-component'
+import RootComponent from 'virtual:vixt:root-component.tsx'
 
 async function entry() {
   const app = createRoot(document.getElementById(appConfig.rootId || 'app')!)

package/src/modules/virtual-root-component.ts

@@ -4,35 +4,55 @@ import { defineVixtModule } from '@vixt/core'
 import fs from 'fs-extra'
 import { resolvePathSync } from 'mlly'
 import path from 'pathe'
+import { parseAst } from 'vite'
 
-function resolveRootComponentPath(vixt: Vixt) {
+function resolveRootComponent(vixt: Vixt) {
   for (const layer of vixt._layers) {
     const layerRootComponentPath = path.resolve(layer.config!.srcDir!, 'App.tsx')
-    if (fs.existsSync(layerRootComponentPath))
-      return layerRootComponentPath
+    const isExists = fs.existsSync(layerRootComponentPath)
+    const layerRootComponentCode = (isExists && fs.readFileSync(layerRootComponentPath, 'utf-8')) || ''
+    if (!isEmptyCode(layerRootComponentCode)) {
+      return {
+        path: layerRootComponentPath,
+        code: layerRootComponentCode,
+      }
+    }
+  }
+
+  const defaultRootComponentPath = resolvePathSync('@vixt/react/client/App')
+  return {
+    path: defaultRootComponentPath,
+    code: fs.readFileSync(defaultRootComponentPath, 'utf-8'),
   }
+}
 
-  return resolvePathSync('@vixt/react/client/App')
+export function isEmptyCode(code?: string) {
+  if (!code)
+    return true
+  try {
+    return !parseAst(code, { jsx: true }).body.length
+  }
+  catch {
+    return false
+  }
 }
 
-const name = 'virtual:vixt:root-component'
-const virtualModuleId = name
-const resolvedVirtualModuleId = `\0${virtualModuleId}`
+const name = 'virtual:vixt:root-component.tsx'
 export default defineVixtModule({
   meta: { name },
   setup(_, vixt) {
     return {
       name,
       resolveId(id) {
-        if (id === virtualModuleId) {
-          return resolvedVirtualModuleId
+        if (id === name) {
+          return name
         }
       },
       load(id) {
-        if (id === resolvedVirtualModuleId) {
-          const rootComponentPath = resolveRootComponentPath(vixt)
-          const rootComponentCode = fs.readFileSync(rootComponentPath, 'utf-8')
-          return rootComponentCode
+        if (id === name) {
+          const { path, code } = resolveRootComponent(vixt)
+          this.addWatchFile(path)
+          return code
         }
       },
     }

package/tsdown.config.ts

@@ -5,11 +5,13 @@ export default defineConfig([
     entry: 'src/index.ts',
     platform: 'node',
     copy: ['src/types'],
+    external: ['vite'],
   },
   {
-    entry: 'src/client/**/*',
+    entry: ['src/client/**/*', '!src/client/App.tsx'],
     platform: 'browser',
     outDir: 'dist/client',
     external: [/virtual:/],
+    copy: ['src/client/App.tsx'],
   },
 ])

package/dist/client/App.d.ts

@@ -1,7 +0,0 @@
-import * as react0 from "react";
-import * as react_router0 from "react-router";
-
-//#region src/client/App.d.ts
-declare function App(): react0.FunctionComponentElement<react_router0.RouterProviderProps>;
-//#endregion
-export { App as default };

package/dist/client/App.js

@@ -1,14 +0,0 @@
-import routes from "~react-pages";
-import { createElement } from "react";
-import { RouterProvider, createBrowserRouter } from "react-router";
-import appConfig from "virtual:vixt:app-config";
-import { setupLayouts } from "virtual:vixt:setup-layouts";
-
-//#region src/client/App.ts
-function App() {
-	return createElement(RouterProvider, { router: createBrowserRouter(setupLayouts(routes), { basename: appConfig.baseURL }) });
-}
-var App_default = App;
-
-//#endregion
-export { App_default as default };

package/src/client/App.ts

@@ -1,15 +0,0 @@
-// @ts-expect-error virtual file
-import routes from '~react-pages'
-import { createElement } from 'react'
-import { createBrowserRouter, RouterProvider } from 'react-router'
-// @ts-expect-error virtual file
-import appConfig from 'virtual:vixt:app-config'
-// @ts-expect-error virtual file
-import { setupLayouts } from 'virtual:vixt:setup-layouts'
-
-function App() {
-  const router = createBrowserRouter(setupLayouts(routes), { basename: appConfig.baseURL })
-  return createElement(RouterProvider, { router })
-}
-
-export default App