@sigil-dev/grimoire 0.8.6 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,229 +11,209 @@ import { generateTypes } from "../typegen";
11
11
  import type { BuildResult, GrimoireConfig, GrimoirePlugin } from "../types";
12
12
  import { runHook } from "./plugins";
13
13
 
14
+ function makeAliases(config: GrimoireConfig): Record<string, string> {
15
+ return {
16
+ ...Object.fromEntries(
17
+ Object.entries(config.alias ?? {}).map(([k, v]) => [k, join(cwd(), v)]),
18
+ ),
19
+ "$env/static/public": join(import.meta.dir, "../env/public.ts"),
20
+ "$env/static/private": join(import.meta.dir, "../env/private.ts"),
21
+ "$env/dynamic/public": join(import.meta.dir, "../env/dynamic-public.ts"),
22
+ "$env/dynamic/private": join(import.meta.dir, "../env/dynamic-private.ts"),
23
+ };
24
+ }
25
+
26
+ const makeRoutesPlugin = (manifestPath: string) => ({
27
+ name: "grimoire-routes",
28
+ setup(build: any) {
29
+ build.onResolve({ filter: /^#grimoire-routes$/ }, () => ({
30
+ path: manifestPath,
31
+ }));
32
+ },
33
+ });
34
+
14
35
  export async function rebuildForChange(
15
- changedFilePath: string,
16
- config: GrimoireConfig,
17
- plugins: GrimoirePlugin[] = [],
36
+ changedFilePath: string,
37
+ config: GrimoireConfig,
38
+ plugins: GrimoirePlugin[] = [],
18
39
  ): Promise<{ result: BuildResult }> {
19
- const { routes = "src/routes" } = config;
20
- const routesDir = isAbsolute(routes) ? routes : join(process.cwd(), routes);
21
-
22
- // only retransform the changed file, not all routes
23
- const tree = await scanRoutes(routesDir, process.cwd());
24
- const changedRoute = [
25
- ...tree.routes.filter((r) => r.type === "page" || r.type === "simple"),
26
- ...tree.layouts.filter((r) => r.type === "layout"),
27
- ].find((r) => normalizePath(r.filePath) === normalizePath(changedFilePath));
28
-
29
- const compiledDir = join(process.cwd(), ".grimoire/compiled");
30
-
31
- if (changedRoute) {
32
- // retransform only the changed file
33
- await Promise.all([
34
- transformRoutes([changedRoute], compiledDir, "hydrate", plugins),
35
- transformRoutes([changedRoute], compiledDir, "dom", plugins),
36
- ]);
37
- // update manifests with full route list but new compiled paths
38
- // (other routes already have compiled files from initial build)
39
- const allClientRoutes = [
40
- ...tree.routes.filter((r) => r.type === "page" || r.type === "simple"),
41
- ...tree.layouts.filter((r) => r.type === "layout"),
42
- ];
43
- // rebuild full manifests - cheap
44
- const hydrateManifest = join(process.cwd(), ".grimoire/_routes.hydrate.js");
45
- const domManifest = join(process.cwd(), ".grimoire/_routes.dom.js");
46
- const [allHFiles, allDFiles] = await Promise.all([
47
- transformRoutes(allClientRoutes, compiledDir, "hydrate", plugins),
48
- transformRoutes(allClientRoutes, compiledDir, "dom", plugins),
49
- ]);
50
- await Promise.all([
51
- Bun.write(hydrateManifest, generateManifest(allClientRoutes, allHFiles)),
52
- Bun.write(domManifest, generateManifest(allClientRoutes, allDFiles)),
53
- ]);
54
- }
55
-
56
- // still need Bun.build — this is the slow part, Step 3 kills it
57
- const publicDir = join(process.cwd(), "public/__grimoire__");
58
- const hydrateManifest = join(process.cwd(), ".grimoire/_routes.hydrate.js");
59
- const domManifest = join(process.cwd(), ".grimoire/_routes.dom.js");
60
- const resolvedAlias: Record<string, string> = {
61
- ...Object.fromEntries(
62
- Object.entries(config.alias ?? {}).map(([k, v]) => [k, join(cwd(), v)]),
63
- ),
64
- "$env/static/public": join(import.meta.dir, "../env/public.ts"),
65
- "$env/static/private": join(import.meta.dir, "../env/private.ts"),
66
- };
67
-
68
- const makeRoutesPlugin = (manifestPath: string) => ({
69
- name: "grimoire-routes",
70
- setup(build: any) {
71
- build.onResolve({ filter: /^#grimoire-routes$/ }, () => ({
72
- path: manifestPath,
73
- }));
74
- },
75
- });
76
-
77
- const [hydrateResult, domResult] = await Promise.all([
78
- Bun.build({
79
- entrypoints: [join(import.meta.dir, "../rendering/hydrate.ts")],
80
- outdir: publicDir,
81
- plugins: [sigil({ mode: "hydrate" }), makeRoutesPlugin(hydrateManifest)],
82
- // @ts-expect-error
83
- alias: resolvedAlias,
84
- }),
85
- Bun.build({
86
- entrypoints: [join(import.meta.dir, "../client/index.ts")],
87
- outdir: publicDir,
88
- plugins: [sigil({ mode: "dom" }), makeRoutesPlugin(domManifest)],
89
- // @ts-expect-error
90
- alias: resolvedAlias,
91
- }),
92
- ]);
93
-
94
- return {
95
- result: {
96
- success: hydrateResult.success && domResult.success,
97
- outputs: [...hydrateResult.outputs, ...domResult.outputs].map(
98
- (o) => o.path,
99
- ),
100
- errors: [...hydrateResult.logs, ...domResult.logs].map(String),
101
- },
102
- };
40
+ const { routes = "src/routes" } = config;
41
+ const isDev = config.dev ?? false;
42
+ const routesDir = isAbsolute(routes) ? routes : join(process.cwd(), routes);
43
+
44
+ const tree = await scanRoutes(routesDir, process.cwd());
45
+ const changedRoute = [
46
+ ...tree.routes.filter((r) => r.type === "page" || r.type === "simple"),
47
+ ...tree.layouts.filter((r) => r.type === "layout"),
48
+ ].find((r) => normalizePath(r.filePath) === normalizePath(changedFilePath));
49
+
50
+ const compiledDir = join(process.cwd(), ".grimoire/compiled");
51
+
52
+ if (changedRoute) {
53
+ await Promise.all([
54
+ transformRoutes([changedRoute], compiledDir, "hydrate", plugins),
55
+ transformRoutes([changedRoute], compiledDir, "dom", plugins),
56
+ ]);
57
+ const allClientRoutes = [
58
+ ...tree.routes.filter((r) => r.type === "page" || r.type === "simple"),
59
+ ...tree.layouts.filter((r) => r.type === "layout"),
60
+ ];
61
+ const hydrateManifest = join(process.cwd(), ".grimoire/_routes.hydrate.js");
62
+ const domManifest = join(process.cwd(), ".grimoire/_routes.dom.js");
63
+ const [allHFiles, allDFiles] = await Promise.all([
64
+ transformRoutes(allClientRoutes, compiledDir, "hydrate", plugins),
65
+ transformRoutes(allClientRoutes, compiledDir, "dom", plugins),
66
+ ]);
67
+ await Promise.all([
68
+ Bun.write(hydrateManifest, generateManifest(allClientRoutes, allHFiles)),
69
+ Bun.write(domManifest, generateManifest(allClientRoutes, allDFiles)),
70
+ ]);
71
+ }
72
+
73
+ const publicDir = join(process.cwd(), "public/__grimoire__");
74
+ const hydrateManifest = join(process.cwd(), ".grimoire/_routes.hydrate.js");
75
+ const domManifest = join(process.cwd(), ".grimoire/_routes.dom.js");
76
+ const resolvedAlias = makeAliases(config);
77
+
78
+ const [hydrateResult, domResult] = await Promise.all([
79
+ Bun.build({
80
+ entrypoints: [join(import.meta.dir, "../rendering/hydrate.ts")],
81
+ outdir: publicDir,
82
+ plugins: [sigil({ mode: "hydrate", dev: isDev }), makeRoutesPlugin(hydrateManifest)],
83
+ // @ts-expect-error
84
+ alias: resolvedAlias,
85
+ }),
86
+ Bun.build({
87
+ entrypoints: [join(import.meta.dir, "../client/index.ts")],
88
+ outdir: publicDir,
89
+ plugins: [sigil({ mode: "dom", dev: isDev }), makeRoutesPlugin(domManifest)],
90
+ // @ts-expect-error
91
+ alias: resolvedAlias,
92
+ }),
93
+ ]);
94
+
95
+ return {
96
+ result: {
97
+ success: hydrateResult.success && domResult.success,
98
+ outputs: [...hydrateResult.outputs, ...domResult.outputs].map((o) => o.path),
99
+ errors: [...hydrateResult.logs, ...domResult.logs].map(String),
100
+ },
101
+ };
103
102
  }
104
103
 
105
104
  export async function buildProject(
106
- config: GrimoireConfig,
107
- plugins: GrimoirePlugin[] = [],
105
+ config: GrimoireConfig,
106
+ plugins: GrimoirePlugin[] = [],
108
107
  ): Promise<{ result: BuildResult; tree: RouteTree }> {
109
- await runHook(plugins, "onBuildStart");
110
-
111
- const { routes = "src/routes" } = config;
112
-
113
- const routesDir = isAbsolute(routes)
114
- ? routes.replace(/\0/g, "")
115
- : join(process.cwd(), routes).replace(/\0/g, "");
116
- const tree = await scanRoutes(routesDir, process.cwd());
117
-
118
- const outDir = join(process.cwd(), ".grimoire");
119
- await mkdir(outDir, { recursive: true });
120
-
121
- await generateTypes(tree, {
122
- projectRoot: process.cwd(),
123
- routesDir,
124
- outDir: join(outDir, "types"),
125
- });
126
-
127
- // Generate $env type declarations from .env
128
- const { generateEnvTypes } = await import("../env/typegen");
129
- const envTypeDir = join(outDir, "types");
130
- await mkdir(envTypeDir, { recursive: true });
131
- await generateEnvTypes(process.cwd(), envTypeDir);
132
-
133
- const compiledDir = join(outDir, "compiled");
134
- await mkdir(compiledDir, { recursive: true });
135
-
136
- const clientRoutes = [
137
- ...tree.routes.filter((r) => r.type === "page" || r.type === "simple"),
138
- ...tree.layouts.filter((r) => r.type === "layout"),
139
- ];
140
-
141
- const [hydrateFiles, domFiles] = await Promise.all([
142
- transformRoutes(clientRoutes, compiledDir, "hydrate", plugins),
143
- transformRoutes(clientRoutes, compiledDir, "dom", plugins),
144
- ]);
145
-
146
- const hydrateManifest = join(process.cwd(), ".grimoire/_routes.hydrate.js");
147
- const domManifest = join(process.cwd(), ".grimoire/_routes.dom.js");
148
- await Promise.all([
149
- Bun.write(hydrateManifest, generateManifest(clientRoutes, hydrateFiles)),
150
- Bun.write(domManifest, generateManifest(clientRoutes, domFiles)),
151
- ]);
152
-
153
- const makeRoutesPlugin = (manifestPath: string) => ({
154
- name: "grimoire-routes",
155
- setup(build: any) {
156
- build.onResolve({ filter: /^#grimoire-routes$/ }, () => ({
157
- path: manifestPath,
158
- }));
159
- },
160
- });
161
-
162
- const resolvedAlias: Record<string, string> = {
163
- ...Object.fromEntries(
164
- Object.entries(config.alias ?? {}).map(([k, v]) => [k, join(cwd(), v)]),
165
- ),
166
- "$env/static/public": join(import.meta.dir, "../env/public.ts"),
167
- "$env/static/private": join(import.meta.dir, "../env/private.ts"),
168
- };
169
-
170
- const bundleStrategy = config.bundleStrategy ?? "split";
171
- const publicDir = join(process.cwd(), "public/__grimoire__");
172
-
173
- if (bundleStrategy === "single") {
174
- // Single bundle: combine hydrate + dom in one output
175
- const singleResult = await Bun.build({
176
- entrypoints: [
177
- join(import.meta.dir, "../rendering/hydrate.ts"),
178
- join(import.meta.dir, "../client/index.ts"),
179
- ],
180
- outdir: publicDir,
181
- plugins: [
182
- sigil({ mode: "hydrate" }),
183
- sigil({ mode: "dom" }),
184
- makeRoutesPlugin(hydrateManifest),
185
- makeRoutesPlugin(domManifest),
186
- ],
187
- // @ts-expect-error alias is a valid Bun.build option not yet in types
188
- alias: resolvedAlias,
189
- });
190
-
191
- if (!singleResult.success) {
192
- for (const log of singleResult.logs) console.error(log);
193
- }
194
-
195
- const result: BuildResult = {
196
- success: singleResult.success,
197
- outputs: singleResult.outputs.map((o) => o.path),
198
- errors: singleResult.logs.map(String),
199
- };
200
-
201
- await runHook(plugins, "onBuildEnd", result);
202
- return { result, tree };
203
- }
204
-
205
- const [hydrateResult, domResult] = await Promise.all([
206
- Bun.build({
207
- entrypoints: [join(import.meta.dir, "../rendering/hydrate.ts")],
208
- outdir: publicDir,
209
- plugins: [sigil({ mode: "hydrate" }), makeRoutesPlugin(hydrateManifest)],
210
- // @ts-expect-error alias is a valid Bun.build option not yet in types
211
- alias: resolvedAlias,
212
- }),
213
- Bun.build({
214
- entrypoints: [join(import.meta.dir, "../client/index.ts")],
215
- outdir: publicDir,
216
- plugins: [sigil({ mode: "dom" }), makeRoutesPlugin(domManifest)],
217
- // @ts-expect-error alias is a valid Bun.build option not yet in types
218
- alias: resolvedAlias,
219
- }),
220
- ]);
221
-
222
- if (!hydrateResult.success) {
223
- for (const log of hydrateResult.logs) console.error(log);
224
- }
225
- if (!domResult.success) {
226
- for (const log of domResult.logs) console.error(log);
227
- }
228
-
229
- const result: BuildResult = {
230
- success: hydrateResult.success && domResult.success,
231
- outputs: [...hydrateResult.outputs, ...domResult.outputs].map(
232
- (o) => o.path,
233
- ),
234
- errors: [...hydrateResult.logs, ...domResult.logs].map(String),
235
- };
236
-
237
- await runHook(plugins, "onBuildEnd", result);
238
- return { result, tree };
108
+ await runHook(plugins, "onBuildStart");
109
+
110
+ const { routes = "src/routes" } = config;
111
+ const isDev = config.dev ?? false;
112
+
113
+ const routesDir = isAbsolute(routes)
114
+ ? routes.replace(/\0/g, "")
115
+ : join(process.cwd(), routes).replace(/\0/g, "");
116
+ const tree = await scanRoutes(routesDir, process.cwd());
117
+
118
+ const outDir = join(process.cwd(), ".grimoire");
119
+ await mkdir(outDir, { recursive: true });
120
+
121
+ await generateTypes(tree, {
122
+ projectRoot: process.cwd(),
123
+ routesDir,
124
+ outDir: join(outDir, "types"),
125
+ });
126
+
127
+ const { generateEnvTypes } = await import("../env/typegen");
128
+ const envTypeDir = join(outDir, "types");
129
+ await mkdir(envTypeDir, { recursive: true });
130
+ await generateEnvTypes(process.cwd(), envTypeDir);
131
+
132
+ const compiledDir = join(outDir, "compiled");
133
+ await mkdir(compiledDir, { recursive: true });
134
+
135
+ const clientRoutes = [
136
+ ...tree.routes.filter((r) => r.type === "page" || r.type === "simple"),
137
+ ...tree.layouts.filter((r) => r.type === "layout"),
138
+ ];
139
+
140
+ const [hydrateFiles, domFiles] = await Promise.all([
141
+ transformRoutes(clientRoutes, compiledDir, "hydrate", plugins),
142
+ transformRoutes(clientRoutes, compiledDir, "dom", plugins),
143
+ ]);
144
+
145
+ const hydrateManifest = join(process.cwd(), ".grimoire/_routes.hydrate.js");
146
+ const domManifest = join(process.cwd(), ".grimoire/_routes.dom.js");
147
+ await Promise.all([
148
+ Bun.write(hydrateManifest, generateManifest(clientRoutes, hydrateFiles)),
149
+ Bun.write(domManifest, generateManifest(clientRoutes, domFiles)),
150
+ ]);
151
+
152
+ const resolvedAlias = makeAliases(config);
153
+ const bundleStrategy = config.bundleStrategy ?? "split";
154
+ const publicDir = join(process.cwd(), "public/__grimoire__");
155
+
156
+ if (bundleStrategy === "single") {
157
+ const singleResult = await Bun.build({
158
+ entrypoints: [
159
+ join(import.meta.dir, "../rendering/hydrate.ts"),
160
+ join(import.meta.dir, "../client/index.ts"),
161
+ ],
162
+ outdir: publicDir,
163
+ plugins: [
164
+ sigil({ mode: "hydrate", dev: isDev }),
165
+ sigil({ mode: "dom", dev: isDev }),
166
+ makeRoutesPlugin(hydrateManifest),
167
+ makeRoutesPlugin(domManifest),
168
+ ],
169
+ // @ts-expect-error
170
+ alias: resolvedAlias,
171
+ });
172
+
173
+ if (!singleResult.success) {
174
+ for (const log of singleResult.logs) console.error(log);
175
+ }
176
+
177
+ const result: BuildResult = {
178
+ success: singleResult.success,
179
+ outputs: singleResult.outputs.map((o) => o.path),
180
+ errors: singleResult.logs.map(String),
181
+ };
182
+
183
+ await runHook(plugins, "onBuildEnd", result);
184
+ return { result, tree };
185
+ }
186
+
187
+ const [hydrateResult, domResult] = await Promise.all([
188
+ Bun.build({
189
+ entrypoints: [join(import.meta.dir, "../rendering/hydrate.ts")],
190
+ outdir: publicDir,
191
+ plugins: [sigil({ mode: "hydrate", dev: isDev }), makeRoutesPlugin(hydrateManifest)],
192
+ // @ts-expect-error
193
+ alias: resolvedAlias,
194
+ }),
195
+ Bun.build({
196
+ entrypoints: [join(import.meta.dir, "../client/index.ts")],
197
+ outdir: publicDir,
198
+ plugins: [sigil({ mode: "dom", dev: isDev }), makeRoutesPlugin(domManifest)],
199
+ // @ts-expect-error
200
+ alias: resolvedAlias,
201
+ }),
202
+ ]);
203
+
204
+ if (!hydrateResult.success) {
205
+ for (const log of hydrateResult.logs) console.error(log);
206
+ }
207
+ if (!domResult.success) {
208
+ for (const log of domResult.logs) console.error(log);
209
+ }
210
+
211
+ const result: BuildResult = {
212
+ success: hydrateResult.success && domResult.success,
213
+ outputs: [...hydrateResult.outputs, ...domResult.outputs].map((o) => o.path),
214
+ errors: [...hydrateResult.logs, ...domResult.logs].map(String),
215
+ };
216
+
217
+ await runHook(plugins, "onBuildEnd", result);
218
+ return { result, tree };
239
219
  }