@tschk/moonshine-cli 0.4.49 → 0.4.80
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.
- package/package.json +12 -12
- package/src/adopt/gaps.ts +2 -7
- package/src/build.ts +14 -1
- package/src/dev.ts +1 -1
- package/src/new.ts +4 -4
- package/src/preview.ts +12 -4
- package/src/tui.ts +13 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tschk/moonshine-cli",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.80",
|
|
4
4
|
"description": "Bun CLI for moonshine — new, dev, build, preview, inspect, compile",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"type": "module",
|
|
@@ -19,14 +19,14 @@
|
|
|
19
19
|
"crepus"
|
|
20
20
|
],
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@tschk/moonshine-compiler": "^0.4.
|
|
23
|
-
"@tschk/moonshine-deploy-bun": "^0.4.
|
|
24
|
-
"@tschk/moonshine-framework": "^0.4.
|
|
25
|
-
"@tschk/moonshine-next": "^0.4.
|
|
26
|
-
"@tschk/moonshine-react-router": "^0.4.
|
|
27
|
-
"@tschk/moonshine-server": "^0.4.
|
|
28
|
-
"@tschk/moonshine-tanstack": "^0.4.
|
|
29
|
-
"@tschk/moonshine-waku": "^0.4.
|
|
22
|
+
"@tschk/moonshine-compiler": "^0.4.80",
|
|
23
|
+
"@tschk/moonshine-deploy-bun": "^0.4.80",
|
|
24
|
+
"@tschk/moonshine-framework": "^0.4.80",
|
|
25
|
+
"@tschk/moonshine-next": "^0.4.80",
|
|
26
|
+
"@tschk/moonshine-react-router": "^0.4.80",
|
|
27
|
+
"@tschk/moonshine-server": "^0.4.80",
|
|
28
|
+
"@tschk/moonshine-tanstack": "^0.4.80",
|
|
29
|
+
"@tschk/moonshine-waku": "^0.4.80"
|
|
30
30
|
},
|
|
31
31
|
"scripts": {
|
|
32
32
|
"format": "bunx prettier --check .",
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"test": "bun test"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@tschk/moonshine-react": "^0.4.
|
|
39
|
-
"@tschk/crepus-moonshine": "^0.4.
|
|
38
|
+
"@tschk/moonshine-react": "^0.4.80",
|
|
39
|
+
"@tschk/crepus-moonshine": "^0.4.80",
|
|
40
40
|
"@tschk/crepuscularity-wasm": "^0.1.3",
|
|
41
|
-
"@tschk/moonshine-solid": "^0.4.
|
|
41
|
+
"@tschk/moonshine-solid": "^0.4.80"
|
|
42
42
|
},
|
|
43
43
|
"peerDependenciesMeta": {
|
|
44
44
|
"@tschk/moonshine-react": {
|
package/src/adopt/gaps.ts
CHANGED
|
@@ -90,11 +90,11 @@ export async function findManualWork(
|
|
|
90
90
|
)
|
|
91
91
|
) {
|
|
92
92
|
note(
|
|
93
|
-
`${file}: generateMetadata() is not called.
|
|
93
|
+
`${file}: generateMetadata() is not called. Render <title>/<meta>/<link> elements from the page instead; React hoists them into a layout-rendered <head>.`,
|
|
94
94
|
);
|
|
95
95
|
} else if (/export\s+const\s+metadata\b/.test(source)) {
|
|
96
96
|
note(
|
|
97
|
-
`${file}: the metadata export is not read.
|
|
97
|
+
`${file}: the metadata export is not read. Render <title>/<meta>/<link> elements from the page or layout instead; React hoists them into a layout-rendered <head>.`,
|
|
98
98
|
);
|
|
99
99
|
}
|
|
100
100
|
if (/export\s+const\s+revalidate\b/.test(source)) {
|
|
@@ -108,11 +108,6 @@ export async function findManualWork(
|
|
|
108
108
|
`${file}: async server component. Moonshine renders with react-dom/server, which cannot await a component — move the fetch into a loader.`,
|
|
109
109
|
);
|
|
110
110
|
}
|
|
111
|
-
if (stem === "layout" && /<html\b/.test(source)) {
|
|
112
|
-
note(
|
|
113
|
-
`${file}: returns <html>/<body>, but moonshine already emits the document shell. Return a fragment instead.`,
|
|
114
|
-
);
|
|
115
|
-
}
|
|
116
111
|
if (["loading", "template", "not-found", "default"].includes(stem)) {
|
|
117
112
|
note(`${file}: ${stem}.tsx has no moonshine equivalent and is ignored.`);
|
|
118
113
|
}
|
package/src/build.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { mkdir, rename, rm } from "node:fs/promises";
|
|
1
2
|
import { resolve } from "node:path";
|
|
2
3
|
import { buildProject } from "@tschk/moonshine-compiler";
|
|
3
4
|
import type { MoonshineManifest } from "@tschk/moonshine-framework";
|
|
@@ -12,7 +13,8 @@ function defaultRuntime(adapter: AdapterName): string {
|
|
|
12
13
|
case "cloudflare":
|
|
13
14
|
return "cloudflare";
|
|
14
15
|
case "vercel":
|
|
15
|
-
|
|
16
|
+
// The Vercel adapter emits one bundled Node function.
|
|
17
|
+
return "node";
|
|
16
18
|
case "bun":
|
|
17
19
|
default:
|
|
18
20
|
return "bun";
|
|
@@ -22,6 +24,7 @@ function defaultRuntime(adapter: AdapterName): string {
|
|
|
22
24
|
export async function buildCommand(args: string[]): Promise<MoonshineManifest> {
|
|
23
25
|
let projectDir = "";
|
|
24
26
|
let adapter: AdapterName | undefined;
|
|
27
|
+
let production = true;
|
|
25
28
|
for (let i = 0; i < args.length; i++) {
|
|
26
29
|
const arg = args[i]!;
|
|
27
30
|
if (arg === "--adapter") {
|
|
@@ -31,6 +34,8 @@ export async function buildCommand(args: string[]): Promise<MoonshineManifest> {
|
|
|
31
34
|
process.exit(1);
|
|
32
35
|
}
|
|
33
36
|
adapter = next as AdapterName;
|
|
37
|
+
} else if (arg === "--development") {
|
|
38
|
+
production = false;
|
|
34
39
|
} else if (arg.startsWith("-")) {
|
|
35
40
|
console.error(`Unknown flag: ${arg}`);
|
|
36
41
|
process.exit(1);
|
|
@@ -90,6 +95,7 @@ export async function buildCommand(args: string[]): Promise<MoonshineManifest> {
|
|
|
90
95
|
requestContext: config.requestContext,
|
|
91
96
|
dataRequests: config.dataRequests,
|
|
92
97
|
mode: config.mode,
|
|
98
|
+
production,
|
|
93
99
|
programmatic: config.routes,
|
|
94
100
|
...(config.routesDir && {
|
|
95
101
|
routesDir: resolve(resolvedDir, config.routesDir),
|
|
@@ -111,6 +117,13 @@ export async function buildCommand(args: string[]): Promise<MoonshineManifest> {
|
|
|
111
117
|
throw new Error(`Adapter "${adapter}" does not export a build function`);
|
|
112
118
|
}
|
|
113
119
|
await adapterFn.build(manifest, outDir);
|
|
120
|
+
if (adapter === "vercel") {
|
|
121
|
+
// Vercel reads Build Output from `.vercel/output` in the project root.
|
|
122
|
+
const vercelOutput = resolve(resolvedDir, ".vercel/output");
|
|
123
|
+
await rm(vercelOutput, { recursive: true, force: true });
|
|
124
|
+
await mkdir(resolve(resolvedDir, ".vercel"), { recursive: true });
|
|
125
|
+
await rename(resolve(outDir, ".vercel/output"), vercelOutput);
|
|
126
|
+
}
|
|
114
127
|
|
|
115
128
|
console.log(
|
|
116
129
|
`Built ${manifest.routes.length} routes into .moonshine/manifest.json (${adapter})`,
|
package/src/dev.ts
CHANGED
|
@@ -45,7 +45,7 @@ export async function devCommand(args: string[]): Promise<void> {
|
|
|
45
45
|
preview = undefined;
|
|
46
46
|
}
|
|
47
47
|
try {
|
|
48
|
-
await buildCommand([root]);
|
|
48
|
+
await buildCommand([root, "--development"]);
|
|
49
49
|
preview = await startPreview({ projectDir: root, port: 0 });
|
|
50
50
|
console.log(`Dev server on http://localhost:${preview.port}/`);
|
|
51
51
|
} catch (error) {
|
package/src/new.ts
CHANGED
|
@@ -73,14 +73,14 @@ export async function localOverrides(
|
|
|
73
73
|
return overrides;
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
function runtimeForAdapter(adapter: Adapter
|
|
76
|
+
function runtimeForAdapter(adapter: Adapter): string {
|
|
77
77
|
switch (adapter) {
|
|
78
78
|
case "node":
|
|
79
79
|
return "node";
|
|
80
80
|
case "cloudflare":
|
|
81
81
|
return "cloudflare";
|
|
82
82
|
case "vercel":
|
|
83
|
-
return
|
|
83
|
+
return "node";
|
|
84
84
|
case "bun":
|
|
85
85
|
default:
|
|
86
86
|
return "bun";
|
|
@@ -273,7 +273,7 @@ async function writeConfig(
|
|
|
273
273
|
renderer: Renderer | undefined,
|
|
274
274
|
adapter: Adapter,
|
|
275
275
|
): Promise<void> {
|
|
276
|
-
const runtime = runtimeForAdapter(adapter
|
|
276
|
+
const runtime = runtimeForAdapter(adapter);
|
|
277
277
|
const entries: Record<string, unknown> = { runtime, adapter };
|
|
278
278
|
if (renderer) entries.renderer = renderer;
|
|
279
279
|
if (renderer === "native")
|
|
@@ -379,7 +379,7 @@ async function writeReadme(
|
|
|
379
379
|
renderer: Renderer | undefined,
|
|
380
380
|
adapter: Adapter,
|
|
381
381
|
): Promise<void> {
|
|
382
|
-
const runtime = runtimeForAdapter(adapter
|
|
382
|
+
const runtime = runtimeForAdapter(adapter);
|
|
383
383
|
let body = `# ${name}\n\nMoonshine on **${adapter}** (${runtime}).\n\n\`\`\`bash\nbun install\nbun run dev\n\`\`\`\n`;
|
|
384
384
|
if (renderer === "native")
|
|
385
385
|
body +=
|
package/src/preview.ts
CHANGED
|
@@ -114,10 +114,7 @@ export async function startPreview(options: {
|
|
|
114
114
|
}
|
|
115
115
|
const config = await loadConfigMaybe(projectDir);
|
|
116
116
|
const manifest = resolveManifest(projectDir, raw);
|
|
117
|
-
|
|
118
|
-
raw.renderer ?? config.renderer,
|
|
119
|
-
projectDir,
|
|
120
|
-
);
|
|
117
|
+
let renderer: Renderer | undefined;
|
|
121
118
|
const staticDir = resolve(projectDir, ".moonshine", PUBLIC_DIR);
|
|
122
119
|
const serverBundlePath = resolve(
|
|
123
120
|
projectDir,
|
|
@@ -134,9 +131,16 @@ export async function startPreview(options: {
|
|
|
134
131
|
try {
|
|
135
132
|
const bundle = (await import(serverBundlePath)) as {
|
|
136
133
|
modules?: Record<string, RouteModule>;
|
|
134
|
+
renderer?: Renderer;
|
|
137
135
|
requestScope?: typeof requestScope;
|
|
138
136
|
};
|
|
139
137
|
modules = bundle.modules ?? {};
|
|
138
|
+
// React bundles export the renderer bound to their own modules and React.
|
|
139
|
+
if (
|
|
140
|
+
(raw.renderer ?? "react") === "react" &&
|
|
141
|
+
bundle.renderer?.name === "react"
|
|
142
|
+
)
|
|
143
|
+
renderer = bundle.renderer;
|
|
140
144
|
requestScope = bundle.requestScope;
|
|
141
145
|
} catch (error) {
|
|
142
146
|
if (raw.requestContext) throw error;
|
|
@@ -146,6 +150,10 @@ export async function startPreview(options: {
|
|
|
146
150
|
` Server-rendered routes will fail. Run \`moonshine build\` first.`,
|
|
147
151
|
);
|
|
148
152
|
}
|
|
153
|
+
renderer ??= await resolveRenderer(
|
|
154
|
+
raw.renderer ?? config.renderer,
|
|
155
|
+
projectDir,
|
|
156
|
+
);
|
|
149
157
|
if (raw.requestContext && typeof requestScope !== "function")
|
|
150
158
|
throw new Error(
|
|
151
159
|
"Request context runner missing from server bundle; rebuild the project",
|
package/src/tui.ts
CHANGED
|
@@ -40,11 +40,21 @@ export function terminalTui(): Tui {
|
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
/**
|
|
43
|
+
/**
|
|
44
|
+
* Cut `text` to `width` columns, marking the cut so nothing looks complete when it is not.
|
|
45
|
+
* Never cuts inside a surrogate pair: an astral character (2 UTF-16 units, and
|
|
46
|
+
* typically 2 columns) that would straddle the limit is dropped whole, so the
|
|
47
|
+
* result never exceeds `width` and never holds a lone surrogate.
|
|
48
|
+
*/
|
|
44
49
|
export function truncate(text: string, width: number): string {
|
|
45
50
|
if (text.length <= width) return text;
|
|
46
|
-
if (width <= 1) return text
|
|
47
|
-
return `${text
|
|
51
|
+
if (width <= 1) return slicePairSafe(text, Math.max(0, width));
|
|
52
|
+
return `${slicePairSafe(text, width - 1)}…`;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function slicePairSafe(text: string, end: number): string {
|
|
56
|
+
const last = text.charCodeAt(end - 1);
|
|
57
|
+
return text.slice(0, last >= 0xd800 && last <= 0xdbff ? end - 1 : end);
|
|
48
58
|
}
|
|
49
59
|
|
|
50
60
|
/**
|