@pracht/vite-plugin 0.4.2 → 0.4.4

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as scanPagesDirectory, n as generatePagesManifestSource, o as createRouteLoaderHints } from "./pages-router-DxofUxnH.mjs";
+import { i as scanPagesDirectory, n as generatePagesManifestSource, o as createRouteLoaderHints } from "./pages-router-BN3V7ii7.mjs";
 import { preactSsrPrecompile } from "@pracht/preact-ssr-precompile";
 import preact from "@preact/preset-vite";
 import { dirname, resolve } from "node:path";
@@ -946,7 +946,7 @@ function isServerModule(id) {
 function createDefaultNodeAdapter() {
 	return {
 		id: "node",
-		serverImports: "import { resolveApp, resolveApiRoutes } from \"@pracht/core\";",
+		serverImports: "import { resolveApp, resolveApiRoutes } from \"@pracht/core/server\";",
 		createServerEntryModule() {
 			return createNodeServerEntryModule();
 		}
@@ -990,7 +990,7 @@ function createPrachtClientModuleSource(options = {}, buildOptions = {}) {
 	const shellGlob = isPagesMode ? `${resolved.pagesDir}/**/_app.{ts,tsx,js,jsx}` : `${resolved.shellsDir}/**/*.{ts,tsx,js,jsx,md,mdx}`;
 	const shellTsrxGlob = isPagesMode ? `${resolved.pagesDir}/**/_app.tsrx` : `${resolved.shellsDir}/**/*.tsrx`;
 	return [
-		"import { resolveApp, initClientRouter, readHydrationState } from \"@pracht/core\";",
+		"import { resolveApp, initClientRouter, readHydrationState } from \"@pracht/core/client\";",
 		appImport,
 		"",
 		`const routeLoaderHints = ${JSON.stringify(routeLoaderHints)};`,
@@ -1061,7 +1061,7 @@ function createPrachtServerModuleSource(options = {}, buildOptions = {}) {
 	};
 	const adapter = resolved.adapter;
 	const source = [
-		adapter?.serverImports ? adapter.serverImports + "\nimport { prerenderApp } from \"@pracht/core\";" : "import { resolveApp, resolveApiRoutes, prerenderApp } from \"@pracht/core\";",
+		adapter?.serverImports ? adapter.serverImports + "\nimport { prerenderApp } from \"@pracht/core/server\";" : "import { resolveApp, resolveApiRoutes, prerenderApp } from \"@pracht/core/server\";",
 		isPagesMode ? generatePagesAppInlineSource(resolved, buildOptions.root) : `import { app } from ${JSON.stringify(resolved.appFile)};`,
 		"",
 		`const routeLoaderHints = ${JSON.stringify(routeLoaderHints)};`,
@@ -1173,7 +1173,7 @@ function createDevSSRMiddleware(server, options = {}) {
 		const url = req.url ?? "/";
 		const requestUrl = new URL(url, "http://localhost");
 		try {
-			const [framework, serverMod] = await Promise.all([server.ssrLoadModule("@pracht/core"), server.ssrLoadModule(PRACHT_SERVER_MODULE_ID)]);
+			const [framework, serverMod] = await Promise.all([server.ssrLoadModule("@pracht/core/server"), server.ssrLoadModule(PRACHT_SERVER_MODULE_ID)]);
 			if (shouldBypassDevSSR(requestUrl, req, {
 				app: serverMod.resolvedApp,
 				apiRoutes: serverMod.apiRoutes,
@@ -1390,7 +1390,7 @@ function pracht(options = {}) {
 		transform(code, id) {
 			const appFileAbs = resolveConfigPath(root, resolved.appFile);
 			if (toPosixPath(id.split("?")[0]) !== appFileAbs) return null;
-			const transformed = code.replace(/\(\)\s*=>\s*import\(\s*(['"])([^'"]+)\1\s*\)/g, "$1$2$1");
+			const transformed = rewriteManifestCoreImports(code.replace(/\(\)\s*=>\s*import\(\s*(['"])([^'"]+)\1\s*\)/g, "$1$2$1"));
 			if (transformed === code) return null;
 			return {
 				code: transformed,
@@ -1468,6 +1468,19 @@ function pracht(options = {}) {
 	plugins.push(optimizeDepsEntriesPlugin);
 	return plugins;
 }
+const MANIFEST_CORE_IMPORTS = new Set([
+	"defineApp",
+	"group",
+	"route",
+	"timeRevalidate"
+]);
+function rewriteManifestCoreImports(code) {
+	return code.replace(/import\s+(type\s+)?\{([^}]+)\}\s+from\s+(['"])@pracht\/core\3/g, (match, typeKeyword, specifiers, quote) => {
+		const valueImports = specifiers.split(",").map((specifier) => specifier.trim()).filter(Boolean).filter((specifier) => !specifier.startsWith("type ")).map((specifier) => specifier.split(/\s+as\s+/)[0]?.trim()).filter(Boolean);
+		if (!typeKeyword && valueImports.some((specifier) => !MANIFEST_CORE_IMPORTS.has(specifier))) return match;
+		return `import ${typeKeyword ?? ""}{${specifiers}} from ${quote}@pracht/core/manifest${quote}`;
+	});
+}
 function withPrachtOptimizeDepsEntries(config, prachtEntries) {
 	const environments = Object.fromEntries(Object.entries(config.environments ?? {}).map(([name, environment]) => [name, { optimizeDeps: { entries: mergeOptimizeDepsEntries(environment.optimizeDeps?.entries, prachtEntries) } }]));
 	return {

package/dist/{pages-router-DxofUxnH.mjs → pages-router-BN3V7ii7.mjs}

@@ -168,7 +168,7 @@ function generatePagesManifestSource(pages, options) {
 	const prefix = options.pagesDirPrefix;
 	const useImport = options.useImportSyntax ?? false;
 	const appFile = scanAllFiles(pagesDir).find((f) => basename(f, extname(f)) === "_app" && SHELL_EXTENSIONS.has(extname(f)));
-	const lines = ["import { defineApp, group, route } from \"@pracht/core\";", ""];
+	const lines = ["import { defineApp, group, route } from \"@pracht/core/manifest\";", ""];
 	const routeEntries = [];
 	for (const page of pages) {
 		const render = page.renderMode ?? defaultRender;

package/dist/pages-router.mjs

@@ -1,2 +1,2 @@
-import { a as sortRoutes, i as scanPagesDirectory, n as generatePagesManifestSource, r as generateRoutesFile, t as filePathToRoutePath } from "./pages-router-DxofUxnH.mjs";
+import { a as sortRoutes, i as scanPagesDirectory, n as generatePagesManifestSource, r as generateRoutesFile, t as filePathToRoutePath } from "./pages-router-BN3V7ii7.mjs";
 export { filePathToRoutePath, generatePagesManifestSource, generateRoutesFile, scanPagesDirectory, sortRoutes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pracht/vite-plugin",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Vite plugin for Pracht apps with virtual modules, dev SSR, prerendering, route inspection, and multi-adapter builds.",
   "keywords": [
     "pracht",
@@ -44,8 +44,8 @@
   "dependencies": {
     "@preact/preset-vite": "^2.10.5",
     "@prefresh/vite": "^2.0.0",
-    "@pracht/adapter-node": "0.2.2",
-    "@pracht/core": "0.7.0",
+    "@pracht/adapter-node": "0.2.4",
+    "@pracht/core": "0.8.1",
     "@pracht/preact-ssr-precompile": "0.1.1"
   },
   "peerDependencies": {