rari 0.2.21 → 0.2.22

package/dist/index.js

@@ -1,5 +1,5 @@
 import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, RouterProvider, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BXoadxa8.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-D-ZsD18Z.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-BK7rNurU.js";
 import "./server-build-BM8_GFF5.js";
 
 export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, defineRariOptions, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/dist/{server-D-ZsD18Z.js → server-BK7rNurU.js}

@@ -5108,7 +5108,7 @@ var require_chokidar = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/ch
 
 //#endregion
 //#region src/router/file-routes.ts
-var import_chokidar$1 = /* @__PURE__ */ __toESM(require_chokidar());
+var import_chokidar$1 = /* @__PURE__ */ __toESM(require_chokidar(), 1);
 var FileRouteGenerator = class {
 	pagesDir;
 	extensions;
@@ -5417,7 +5417,7 @@ function convertFilePatternToRoutePattern(pattern) {
 
 //#endregion
 //#region src/router/vite-plugin.ts
-var import_chokidar = /* @__PURE__ */ __toESM(require_chokidar());
+var import_chokidar = /* @__PURE__ */ __toESM(require_chokidar(), 1);
 const DEFAULT_OPTIONS = {
 	pagesDir: "src/pages",
 	extensions: [
@@ -5636,11 +5636,16 @@ function scanForClientComponents(srcDir) {
 	return clientComponents;
 }
 function extractCacheConfigFromContent(content) {
-	const ast = acorn.parse(content, {
-		ecmaVersion: 2022,
-		sourceType: "module",
-		allowImportExportEverywhere: true
-	});
+	let ast;
+	try {
+		ast = acorn.parse(content, {
+			ecmaVersion: 2022,
+			sourceType: "module",
+			allowImportExportEverywhere: true
+		});
+	} catch {
+		return void 0;
+	}
 	for (const node of ast.body) if (node.type === "ExportNamedDeclaration" && node.declaration && node.declaration.type === "VariableDeclaration") {
 		for (const declarator of node.declaration.declarations) if (declarator.id && declarator.id.name === "cacheConfig" && declarator.init && declarator.init.type === "ObjectExpression") {
 			const config = {};

package/dist/server.js

@@ -1,5 +1,5 @@
 import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, RouterProvider, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BXoadxa8.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-D-ZsD18Z.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, defineRariOptions, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-BK7rNurU.js";
 import "./server-build-BM8_GFF5.js";
 
 export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, defineRariOptions, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",

package/src/vite/index.ts

@@ -52,12 +52,20 @@ function scanForClientComponents(srcDir: string): Set<string> {
   return clientComponents
 }
 
-function extractCacheConfigFromContent(content: string): PageCacheConfig | undefined {
-  const ast = acorn.parse(content, {
-    ecmaVersion: 2022,
-    sourceType: 'module',
-    allowImportExportEverywhere: true,
-  }) as any
+function extractCacheConfigFromContent(
+  content: string,
+): PageCacheConfig | undefined {
+  let ast: any
+  try {
+    ast = acorn.parse(content, {
+      ecmaVersion: 2022,
+      sourceType: 'module',
+      allowImportExportEverywhere: true,
+    }) as any
+  }
+  catch {
+    return undefined
+  }
 
   for (const node of ast.body) {
     if (
@@ -81,9 +89,11 @@ function extractCacheConfigFromContent(content: string): PageCacheConfig | undef
               && prop.value
               && prop.value.type === 'Literal'
             ) {
-              const keyName = prop.key.type === 'Literal' ? prop.key.value : prop.key.name
+              const keyName
+                = prop.key.type === 'Literal' ? prop.key.value : prop.key.name
               if (keyName === 'cache-control' || keyName === 'vary') {
-                config[keyName as keyof PageCacheConfig] = prop.value.value as string
+                config[keyName as keyof PageCacheConfig] = prop.value
+                  .value as string
               }
             }
           }
@@ -2489,9 +2499,16 @@ ${registrations.join('\n')}
         const url = req.url || ''
         const pathname = url.split('?')[0]
 
-        if (pathname && !pathname.includes('.') && !pathname.startsWith('/api') && !pathname.startsWith('/rsc')) {
+        if (
+          pathname
+          && !pathname.includes('.')
+          && !pathname.startsWith('/api')
+          && !pathname.startsWith('/rsc')
+        ) {
           if (options.caching?.routes) {
-            for (const [pattern, cacheControl] of Object.entries(options.caching.routes)) {
+            for (const [pattern, cacheControl] of Object.entries(
+              options.caching.routes,
+            )) {
               if (matchesPattern(pattern, pathname)) {
                 res.setHeader('cache-control', cacheControl)
                 break
@@ -2500,7 +2517,11 @@ ${registrations.join('\n')}
           }
 
           const pagePath = pathname === '/' ? '/index' : pathname
-          const pageFilePath = path.join(process.cwd(), 'src/pages', `${pagePath.slice(1) || 'index'}.tsx`)
+          const pageFilePath = path.join(
+            process.cwd(),
+            'src/pages',
+            `${pagePath.slice(1) || 'index'}.tsx`,
+          )
 
           if (fs.existsSync(pageFilePath)) {
             const pageContent = fs.readFileSync(pageFilePath, 'utf-8')
@@ -2521,8 +2542,15 @@ ${registrations.join('\n')}
     },
     writeBundle() {
       if (options.caching) {
-        const cacheConfigPath = path.join(process.cwd(), 'dist', 'cache-config.json')
-        fs.writeFileSync(cacheConfigPath, JSON.stringify(options.caching, null, 2))
+        const cacheConfigPath = path.join(
+          process.cwd(),
+          'dist',
+          'cache-config.json',
+        )
+        fs.writeFileSync(
+          cacheConfigPath,
+          JSON.stringify(options.caching, null, 2),
+        )
       }
     },
   }