Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"format:check": "prettier --check --experimental-cli ."
},
"devDependencies": {
"oxlint": "^1.70.0",
"prettier": "^3.8.4",
"turbo": "^2.9.18"
"oxlint": "^1.71.0",
"prettier": "^3.9.1",
"turbo": "^2.10.0"
},
"packageManager": "pnpm@10.33.0"
}
6 changes: 3 additions & 3 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"dependencies": {
"@funstack/router": "^1.1.1",
"@funstack/static": "workspace:*",
"@shikijs/rehype": "^4.2.0",
"@shikijs/rehype": "^4.3.0",
"@types/node": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
"rehype-slug": "^6.0.0",
"shiki": "^4.2.0"
"shiki": "^4.3.0"
},
"devDependencies": {
"@mdx-js/rollup": "^3.1.1",
Expand All @@ -29,6 +29,6 @@
"rsc-html-stream": "^0.0.7",
"typescript": "catalog:",
"vite": "catalog:",
"wrangler": "^4.103.0"
"wrangler": "^4.105.0"
}
}
3 changes: 1 addition & 2 deletions packages/docs/src/pages/api/EntryDefinition.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ The entries function can return either a synchronous iterable or an async iterab

```typescript
type GetEntriesResult =
| Iterable<EntryDefinition>
| AsyncIterable<EntryDefinition>;
Iterable<EntryDefinition> | AsyncIterable<EntryDefinition>;
```

This allows returning arrays, generators, or async generators:
Expand Down
7 changes: 2 additions & 5 deletions packages/static/design/multiple-entries.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,14 @@ export interface EntryDefinition {
* - A React node (JSX of a server component) for direct rendering.
*/
app:
| React.ReactNode
| MaybePromise<AppModule>
| (() => MaybePromise<AppModule>);
React.ReactNode | MaybePromise<AppModule> | (() => MaybePromise<AppModule>);
}

/**
* Return type of the getEntries function.
*/
type GetEntriesResult =
| Iterable<EntryDefinition>
| AsyncIterable<EntryDefinition>;
Iterable<EntryDefinition> | AsyncIterable<EntryDefinition>;
```

**Design rationale:**
Expand Down
2 changes: 1 addition & 1 deletion packages/static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"license": "MIT",
"devDependencies": {
"@funstack/router": "^1.1.1",
"@playwright/test": "^1.61.0",
"@playwright/test": "^1.61.1",
"@types/node": "catalog:",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
Expand Down
3 changes: 1 addition & 2 deletions packages/static/src/entryDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,4 @@ export interface EntryDefinition {
* Return type of the getEntries function.
*/
export type GetEntriesResult =
| Iterable<EntryDefinition>
| AsyncIterable<EntryDefinition>;
Iterable<EntryDefinition> | AsyncIterable<EntryDefinition>;
3 changes: 1 addition & 2 deletions packages/static/src/plugin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ export default function funstackStatic(
let resolvedBuildEntry: string | undefined;
// Resolved configuration for file-system routing (fsRoutes mode).
let resolvedFsRoutes:
| { root: string; adapter: string; globBase: string }
| undefined;
{ root: string; adapter: string; globBase: string } | undefined;

// Determine which entry mode the user selected.
const isFsRoutes = "fsRoutes" in options && options.fsRoutes !== undefined;
Expand Down
Loading