@byline/cli 3.21.0 → 4.0.0
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/README.md +29 -3
- package/dist/cli.js +5 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +1 -0
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/init.d.ts +3 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +10 -14
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/setup-checks.d.ts +9 -0
- package/dist/commands/setup-checks.d.ts.map +1 -1
- package/dist/commands/setup-checks.js +43 -18
- package/dist/commands/setup-checks.js.map +1 -1
- package/dist/commands/setup.js +1 -1
- package/dist/commands/setup.js.map +1 -1
- package/dist/context.d.ts +2 -0
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +6 -0
- package/dist/context.js.map +1 -1
- package/dist/lib/dependency-version.d.ts +12 -0
- package/dist/lib/dependency-version.d.ts.map +1 -0
- package/dist/lib/dependency-version.js +101 -0
- package/dist/lib/dependency-version.js.map +1 -0
- package/dist/lib/planned-writes.d.ts +8 -0
- package/dist/lib/planned-writes.d.ts.map +1 -0
- package/dist/lib/planned-writes.js +177 -0
- package/dist/lib/planned-writes.js.map +1 -0
- package/dist/lib/planned-writes.test.d.ts +2 -0
- package/dist/lib/planned-writes.test.d.ts.map +1 -0
- package/dist/lib/planned-writes.test.js +113 -0
- package/dist/lib/planned-writes.test.js.map +1 -0
- package/dist/lib/release-policy.d.ts +12 -0
- package/dist/lib/release-policy.d.ts.map +1 -0
- package/dist/lib/release-policy.js +20 -0
- package/dist/lib/release-policy.js.map +1 -0
- package/dist/lib/release-policy.test.d.ts +2 -0
- package/dist/lib/release-policy.test.d.ts.map +1 -0
- package/dist/lib/release-policy.test.js +36 -0
- package/dist/lib/release-policy.test.js.map +1 -0
- package/dist/lib/route-config.d.ts +40 -0
- package/dist/lib/route-config.d.ts.map +1 -0
- package/dist/lib/route-config.js +322 -0
- package/dist/lib/route-config.js.map +1 -0
- package/dist/lib/static-config.d.ts +20 -0
- package/dist/lib/static-config.d.ts.map +1 -0
- package/dist/lib/static-config.js +444 -0
- package/dist/lib/static-config.js.map +1 -0
- package/dist/lib/static-config.test.d.ts +2 -0
- package/dist/lib/static-config.test.d.ts.map +1 -0
- package/dist/lib/static-config.test.js +105 -0
- package/dist/lib/static-config.test.js.map +1 -0
- package/dist/lib/template-hook-boundary.test.node.d.ts +2 -0
- package/dist/lib/template-hook-boundary.test.node.d.ts.map +1 -0
- package/dist/lib/template-hook-boundary.test.node.js +30 -0
- package/dist/lib/template-hook-boundary.test.node.js.map +1 -0
- package/dist/lib/template-path.d.ts +5 -0
- package/dist/lib/template-path.d.ts.map +1 -0
- package/dist/lib/template-path.js +9 -0
- package/dist/lib/template-path.js.map +1 -0
- package/dist/lib/workspace-root.d.ts +28 -0
- package/dist/lib/workspace-root.d.ts.map +1 -0
- package/dist/lib/workspace-root.js +205 -0
- package/dist/lib/workspace-root.js.map +1 -0
- package/dist/manifest/deps.d.ts +1 -1
- package/dist/manifest/deps.d.ts.map +1 -1
- package/dist/manifest/deps.js +18 -8
- package/dist/manifest/deps.js.map +1 -1
- package/dist/phases/deps.d.ts +14 -1
- package/dist/phases/deps.d.ts.map +1 -1
- package/dist/phases/deps.js +312 -137
- package/dist/phases/deps.js.map +1 -1
- package/dist/phases/deps.test.d.ts +2 -0
- package/dist/phases/deps.test.d.ts.map +1 -0
- package/dist/phases/deps.test.js +343 -0
- package/dist/phases/deps.test.js.map +1 -0
- package/dist/phases/preflight.d.ts.map +1 -1
- package/dist/phases/preflight.js +59 -11
- package/dist/phases/preflight.js.map +1 -1
- package/dist/phases/prompts.d.ts +2 -0
- package/dist/phases/prompts.d.ts.map +1 -1
- package/dist/phases/prompts.js +51 -2
- package/dist/phases/prompts.js.map +1 -1
- package/dist/phases/routes-ui.test.d.ts +2 -0
- package/dist/phases/routes-ui.test.d.ts.map +1 -0
- package/dist/phases/routes-ui.test.js +766 -0
- package/dist/phases/routes-ui.test.js.map +1 -0
- package/dist/phases/routes.d.ts +4 -1
- package/dist/phases/routes.d.ts.map +1 -1
- package/dist/phases/routes.js +610 -122
- package/dist/phases/routes.js.map +1 -1
- package/dist/phases/scaffold-smoke.test.d.ts +2 -0
- package/dist/phases/scaffold-smoke.test.d.ts.map +1 -0
- package/dist/phases/scaffold-smoke.test.js +168 -0
- package/dist/phases/scaffold-smoke.test.js.map +1 -0
- package/dist/phases/scaffold.d.ts +3 -2
- package/dist/phases/scaffold.d.ts.map +1 -1
- package/dist/phases/scaffold.js +268 -91
- package/dist/phases/scaffold.js.map +1 -1
- package/dist/phases/scaffold.test.js +171 -22
- package/dist/phases/scaffold.test.js.map +1 -1
- package/dist/phases/ui.d.ts +4 -1
- package/dist/phases/ui.d.ts.map +1 -1
- package/dist/phases/ui.js +51 -59
- package/dist/phases/ui.js.map +1 -1
- package/dist/phases/wire/index.d.ts.map +1 -1
- package/dist/phases/wire/index.js +10 -6
- package/dist/phases/wire/index.js.map +1 -1
- package/dist/phases/wire/shared.d.ts +4 -1
- package/dist/phases/wire/shared.d.ts.map +1 -1
- package/dist/phases/wire/vite-config.d.ts.map +1 -1
- package/dist/phases/wire/vite-config.js +69 -20
- package/dist/phases/wire/vite-config.js.map +1 -1
- package/dist/phases/wire/vite-config.test.d.ts +2 -0
- package/dist/phases/wire/vite-config.test.d.ts.map +1 -0
- package/dist/phases/wire/vite-config.test.js +97 -0
- package/dist/phases/wire/vite-config.test.js.map +1 -0
- package/dist/prompts.d.ts +1 -0
- package/dist/prompts.d.ts.map +1 -1
- package/dist/prompts.js +7 -2
- package/dist/prompts.js.map +1 -1
- package/dist/runner.js +1 -1
- package/dist/runner.js.map +1 -1
- package/dist/templates/byline/clients.server.ts +77 -0
- package/dist/templates/byline/collection-types.contract.ts +25 -0
- package/dist/templates/byline/collections/server-hooks.ts +7 -0
- package/dist/templates/byline/routes.ts +7 -6
- package/dist/templates/byline/server.config.ts +3 -1
- package/dist/templates/byline-examples/admin.config.ts +7 -12
- package/dist/templates/byline-examples/blocks/photo-block.ts +3 -2
- package/dist/templates/byline-examples/clients.server.ts +77 -0
- package/dist/templates/byline-examples/collection-types.contract.ts +25 -0
- package/dist/templates/byline-examples/collections/docs/hooks.ts +23 -13
- package/dist/templates/byline-examples/collections/docs/schema.ts +2 -11
- package/dist/templates/byline-examples/collections/media/components/media-list-view.tsx +11 -6
- package/dist/templates/byline-examples/collections/media/schema.ts +3 -0
- package/dist/templates/byline-examples/collections/news/schema.ts +4 -3
- package/dist/templates/byline-examples/collections/server-hooks.ts +8 -0
- package/dist/templates/byline-examples/fields/ai-text.ts +1 -1
- package/dist/templates/byline-examples/fields/ai-textarea.ts +1 -1
- package/dist/templates/byline-examples/fields/lexical-richtext-ai.tsx +3 -3
- package/dist/templates/byline-examples/routes.ts +7 -6
- package/dist/templates/byline-examples/scripts/backfill-version-locales.ts +1 -1
- package/dist/templates/byline-examples/scripts/import-docs.ts +11 -12
- package/dist/templates/byline-examples/scripts/lib/mdast-to-lexical.test.node.ts +93 -233
- package/dist/templates/byline-examples/scripts/lib/mdast-to-lexical.ts +2 -2
- package/dist/templates/byline-examples/scripts/lib/strip-leading-h1.test.node.ts +0 -4
- package/dist/templates/byline-examples/scripts/re-anchor.ts +3 -3
- package/dist/templates/byline-examples/scripts/regenerate-media.ts +6 -5
- package/dist/templates/byline-examples/server.config.ts +5 -4
- package/dist/templates/host/vite.config.ts +2 -0
- package/dist/templates/routes/_byline/route.lazy.tsx +1 -2
- package/dist/templates/routes/_byline/route.tsx +1 -1
- package/dist/templates/ui-byline/blocks/photo-block/index.tsx +18 -22
- package/dist/templates/ui-byline/components/admonition/index.tsx +11 -8
- package/dist/templates/ui-byline/components/code/code.tsx +6 -4
- package/dist/templates/ui-byline/components/link/lang-link.tsx +4 -8
- package/dist/templates/ui-byline/components/link/link-field.tsx +3 -2
- package/dist/templates/ui-byline/components/link/link-lexical.tsx +9 -8
- package/dist/templates/ui-byline/render-blocks.tsx +38 -34
- package/dist/templates/ui-byline/types/content.ts +25 -0
- package/dist/templates/ui-byline/types/i18n.ts +4 -8
- package/dist/test-helpers.d.ts +5 -0
- package/dist/test-helpers.d.ts.map +1 -0
- package/dist/test-helpers.js +52 -0
- package/dist/test-helpers.js.map +1 -0
- package/dist/types.d.ts +21 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/ui-template-contract.test.d.ts +2 -0
- package/dist/ui-template-contract.test.d.ts.map +1 -0
- package/dist/ui-template-contract.test.js +130 -0
- package/dist/ui-template-contract.test.js.map +1 -0
- package/dist/workspace-root.test.d.ts +2 -0
- package/dist/workspace-root.test.d.ts.map +1 -0
- package/dist/workspace-root.test.js +307 -0
- package/dist/workspace-root.test.js.map +1 -0
- package/package.json +9 -1
- package/dist/templates/byline/client.server.ts +0 -32
- package/dist/templates/byline-examples/client.server.ts +0 -32
|
@@ -0,0 +1,343 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { tmpdir } from 'node:os';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
5
|
+
import { shouldHaltInit } from '../commands/init.js';
|
|
6
|
+
import { findBylineDependencyIssues, findMissingBylineDeps } from '../commands/setup-checks.js';
|
|
7
|
+
import { isDependencyVersionCompatible } from '../lib/dependency-version.js';
|
|
8
|
+
import { BYLINE_RELEASE_POLICY } from '../lib/release-policy.js';
|
|
9
|
+
import { BYLINE_VERSION, DEP_SPECS } from '../manifest/deps.js';
|
|
10
|
+
import { createTestContext, createTestContextAt } from '../test-helpers.js';
|
|
11
|
+
import { depsPhase, validateDependencyPlan, validateDependencyPostconditions } from './deps.js';
|
|
12
|
+
const contexts = [];
|
|
13
|
+
const roots = [];
|
|
14
|
+
const CURRENT_VERSION = BYLINE_VERSION.slice(1);
|
|
15
|
+
const [CURRENT_MAJOR, CURRENT_MINOR, CURRENT_PATCH] = CURRENT_VERSION.split('.').map(Number);
|
|
16
|
+
const NEXT_MAJOR_VERSION = `${CURRENT_MAJOR + 1}.0.0`;
|
|
17
|
+
const SAME_MAJOR_LATER_VERSION = `${CURRENT_MAJOR}.${CURRENT_MINOR}.${CURRENT_PATCH + 1}`;
|
|
18
|
+
const BELOW_FLOOR_VERSION = CURRENT_PATCH > 0
|
|
19
|
+
? `${CURRENT_MAJOR}.${CURRENT_MINOR}.${CURRENT_PATCH - 1}`
|
|
20
|
+
: CURRENT_MINOR > 0
|
|
21
|
+
? `${CURRENT_MAJOR}.${CURRENT_MINOR - 1}.99`
|
|
22
|
+
: `${CURRENT_MAJOR - 1}.99.99`;
|
|
23
|
+
afterEach(() => {
|
|
24
|
+
for (const ctx of contexts.splice(0))
|
|
25
|
+
rmSync(ctx.cwd, { recursive: true, force: true });
|
|
26
|
+
for (const root of roots.splice(0))
|
|
27
|
+
rmSync(root, { recursive: true, force: true });
|
|
28
|
+
});
|
|
29
|
+
describe('Byline dependency compatibility', () => {
|
|
30
|
+
const core = DEP_SPECS.find((spec) => spec.name === '@byline/core');
|
|
31
|
+
if (!core)
|
|
32
|
+
throw new Error('@byline/core dependency spec is missing');
|
|
33
|
+
it('uses the CLI-derived release policy for every Byline dependency', () => {
|
|
34
|
+
expect(BYLINE_VERSION).toBe(BYLINE_RELEASE_POLICY.dependencyRange);
|
|
35
|
+
expect(DEP_SPECS.filter((spec) => spec.group === 'byline').every((spec) => spec.version === BYLINE_RELEASE_POLICY.dependencyRange)).toBe(true);
|
|
36
|
+
});
|
|
37
|
+
it.each([
|
|
38
|
+
[BYLINE_VERSION, true],
|
|
39
|
+
[`~${CURRENT_VERSION}`, true],
|
|
40
|
+
[CURRENT_VERSION, true],
|
|
41
|
+
[SAME_MAJOR_LATER_VERSION, true],
|
|
42
|
+
[`>=${CURRENT_VERSION} <${CURRENT_MAJOR + 1}`, true],
|
|
43
|
+
['workspace:*', false],
|
|
44
|
+
['workspace:^', false],
|
|
45
|
+
['workspace:~', false],
|
|
46
|
+
[`workspace:${BYLINE_VERSION}`, true],
|
|
47
|
+
[`workspace:~${CURRENT_VERSION}`, true],
|
|
48
|
+
[`workspace:${CURRENT_VERSION}`, true],
|
|
49
|
+
[`workspace:^${BELOW_FLOOR_VERSION}`, false],
|
|
50
|
+
[`^${BELOW_FLOOR_VERSION}`, false],
|
|
51
|
+
[`>=${CURRENT_VERSION}`, false],
|
|
52
|
+
[`^${NEXT_MAJOR_VERSION}`, false],
|
|
53
|
+
[`${BYLINE_VERSION} || ^${NEXT_MAJOR_VERSION}`, false],
|
|
54
|
+
[`npm:@byline/core@${BYLINE_VERSION}`, true],
|
|
55
|
+
[`npm:@byline/core@^${NEXT_MAJOR_VERSION}`, false],
|
|
56
|
+
[`npm:@byline/admin@${BYLINE_VERSION}`, false],
|
|
57
|
+
['latest', false],
|
|
58
|
+
])('classifies %s as compatible=%s', (range, compatible) => {
|
|
59
|
+
expect(isDependencyVersionCompatible(core, range)).toBe(compatible);
|
|
60
|
+
});
|
|
61
|
+
it.each([
|
|
62
|
+
'workspace:*',
|
|
63
|
+
'workspace:^',
|
|
64
|
+
'workspace:~',
|
|
65
|
+
])('never replaces the local workspace shorthand %s', async (workspaceRange) => {
|
|
66
|
+
const ctx = createTestContext({ examples: false });
|
|
67
|
+
contexts.push(ctx);
|
|
68
|
+
const dependencies = compatibleDependencies();
|
|
69
|
+
dependencies['@byline/core'] = workspaceRange;
|
|
70
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies }, null, 2)}\n`);
|
|
71
|
+
writeFileSync(ctx.resolve('pnpm-workspace.yaml'), completeWorkspaceYaml());
|
|
72
|
+
const plan = await depsPhase.plan(ctx);
|
|
73
|
+
expect(plan.commands.flatMap((command) => command.args).join(' ')).not.toContain('@byline/core@');
|
|
74
|
+
});
|
|
75
|
+
it('plans upgrades for incompatible declarations and leaves compatible ranges untouched', async () => {
|
|
76
|
+
const ctx = createTestContext({ examples: false });
|
|
77
|
+
contexts.push(ctx);
|
|
78
|
+
const dependencies = compatibleDependencies();
|
|
79
|
+
dependencies['@byline/core'] = `^${BELOW_FLOOR_VERSION}`;
|
|
80
|
+
dependencies['@byline/admin'] = BYLINE_VERSION;
|
|
81
|
+
dependencies['@byline/ai'] = `workspace:${BYLINE_VERSION}`;
|
|
82
|
+
dependencies['@byline/ui'] = `^${NEXT_MAJOR_VERSION}`;
|
|
83
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies }, null, 2)}\n`);
|
|
84
|
+
const plan = await depsPhase.plan(ctx);
|
|
85
|
+
const command = plan.commands.flatMap((item) => item.args).join(' ');
|
|
86
|
+
expect(command).toContain(`@byline/core@${BYLINE_VERSION}`);
|
|
87
|
+
expect(command).not.toContain('@byline/admin@');
|
|
88
|
+
expect(command).not.toContain('@byline/ai@');
|
|
89
|
+
expect(command).toContain(`@byline/ui@${BYLINE_VERSION}`);
|
|
90
|
+
ctx.state.markPhaseComplete('deps');
|
|
91
|
+
expect(await depsPhase.detect(ctx)).toBe('pending');
|
|
92
|
+
expect(findMissingBylineDeps(ctx)?.map((spec) => spec.name)).toContain('@byline/core');
|
|
93
|
+
expect(findMissingBylineDeps(ctx)?.map((spec) => spec.name)).not.toContain('@byline/admin');
|
|
94
|
+
expect(findMissingBylineDeps(ctx)?.map((spec) => spec.name)).not.toContain('@byline/ai');
|
|
95
|
+
expect(findMissingBylineDeps(ctx)?.map((spec) => spec.name)).toContain('@byline/ui');
|
|
96
|
+
});
|
|
97
|
+
it.each([
|
|
98
|
+
[BELOW_FLOOR_VERSION, 'incompatible'],
|
|
99
|
+
[CURRENT_VERSION, 'compatible'],
|
|
100
|
+
[SAME_MAJOR_LATER_VERSION, 'compatible'],
|
|
101
|
+
[NEXT_MAJOR_VERSION, 'incompatible'],
|
|
102
|
+
])('checks bare workspace links against resolved version %s', async (actual, status) => {
|
|
103
|
+
const ctx = linkedWorkspaceContext(actual);
|
|
104
|
+
const dependencies = compatibleDependencies();
|
|
105
|
+
dependencies['@byline/core'] = 'workspace:*';
|
|
106
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies }, null, 2)}\n`);
|
|
107
|
+
const plan = await depsPhase.plan(ctx);
|
|
108
|
+
const coreCommand = plan.commands.flatMap((command) => command.args).join(' ');
|
|
109
|
+
expect(coreCommand).not.toContain('@byline/core@');
|
|
110
|
+
expect(await depsPhase.detect(ctx)).toBe(status === 'compatible' ? 'done' : 'pending');
|
|
111
|
+
expect(findBylineDependencyIssues(ctx)?.find((issue) => issue.spec.name === '@byline/core')
|
|
112
|
+
?.compatibility?.status).toBe(status === 'compatible' ? undefined : status);
|
|
113
|
+
const result = await depsPhase.apply(plan, ctx);
|
|
114
|
+
expect(result.state).toBe(status === 'compatible' ? 'done' : 'blocked');
|
|
115
|
+
expect(shouldHaltInit(result.state)).toBe(status !== 'compatible');
|
|
116
|
+
});
|
|
117
|
+
it('keeps an unresolved bare workspace link manual instead of replacing it', async () => {
|
|
118
|
+
const ctx = linkedWorkspaceContext();
|
|
119
|
+
const dependencies = compatibleDependencies();
|
|
120
|
+
dependencies['@byline/core'] = 'workspace:^';
|
|
121
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies }, null, 2)}\n`);
|
|
122
|
+
const plan = await depsPhase.plan(ctx);
|
|
123
|
+
expect(plan.commands.flatMap((command) => command.args).join(' ')).not.toContain('@byline/core@');
|
|
124
|
+
expect(plan.notes.join('\n')).toContain('could not be resolved locally');
|
|
125
|
+
expect(await depsPhase.detect(ctx)).toBe('pending');
|
|
126
|
+
expect(findBylineDependencyIssues(ctx)?.find((issue) => issue.spec.name === '@byline/core')
|
|
127
|
+
?.compatibility?.status).toBe('unknown');
|
|
128
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
129
|
+
});
|
|
130
|
+
it('uses included workspace metadata over stale node_modules and ignores excluded duplicates', async () => {
|
|
131
|
+
const ctx = linkedWorkspaceContext(BELOW_FLOOR_VERSION);
|
|
132
|
+
const root = ctx.workspaceRoot;
|
|
133
|
+
mkdirSync(join(root, 'packages/excluded-core'), { recursive: true });
|
|
134
|
+
writeFileSync(join(root, 'packages/excluded-core/package.json'), `${JSON.stringify({ name: '@byline/core', version: NEXT_MAJOR_VERSION })}\n`);
|
|
135
|
+
writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n - apps/*\n - packages/*\n - "!packages/excluded-*"\n');
|
|
136
|
+
mkdirSync(ctx.resolve('node_modules/@byline/core'), { recursive: true });
|
|
137
|
+
writeFileSync(ctx.resolve('node_modules/@byline/core/package.json'), `${JSON.stringify({ name: '@byline/core', version: SAME_MAJOR_LATER_VERSION })}\n`);
|
|
138
|
+
const dependencies = compatibleDependencies();
|
|
139
|
+
dependencies['@byline/core'] = 'workspace:*';
|
|
140
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies })}\n`);
|
|
141
|
+
expect(await depsPhase.detect(ctx)).toBe('pending');
|
|
142
|
+
const plan = await depsPhase.plan(ctx);
|
|
143
|
+
expect(plan.notes.join('\n')).toContain(`resolves to unsupported ${BELOW_FLOOR_VERSION}`);
|
|
144
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
145
|
+
});
|
|
146
|
+
it('does not resolve a package that exists only in an excluded workspace', async () => {
|
|
147
|
+
const ctx = linkedWorkspaceContext();
|
|
148
|
+
mkdirSync(join(ctx.workspaceRoot, 'packages/excluded-core'), { recursive: true });
|
|
149
|
+
writeFileSync(join(ctx.workspaceRoot, 'packages/excluded-core/package.json'), `${JSON.stringify({ name: '@byline/core', version: SAME_MAJOR_LATER_VERSION })}\n`);
|
|
150
|
+
writeFileSync(join(ctx.workspaceRoot, 'pnpm-workspace.yaml'), 'packages:\n - apps/*\n - packages/*\n - "!packages/excluded-*"\n');
|
|
151
|
+
const dependencies = compatibleDependencies();
|
|
152
|
+
dependencies['@byline/core'] = 'workspace:*';
|
|
153
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies })}\n`);
|
|
154
|
+
const plan = await depsPhase.plan(ctx);
|
|
155
|
+
expect(plan.notes.join('\n')).toContain('could not be resolved locally');
|
|
156
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
157
|
+
});
|
|
158
|
+
it('treats duplicate included workspace package names as unknown', async () => {
|
|
159
|
+
const ctx = linkedWorkspaceContext(CURRENT_VERSION);
|
|
160
|
+
mkdirSync(join(ctx.workspaceRoot, 'packages/core-copy'), { recursive: true });
|
|
161
|
+
writeFileSync(join(ctx.workspaceRoot, 'packages/core-copy/package.json'), `${JSON.stringify({ name: '@byline/core', version: SAME_MAJOR_LATER_VERSION })}\n`);
|
|
162
|
+
const dependencies = compatibleDependencies();
|
|
163
|
+
dependencies['@byline/core'] = 'workspace:*';
|
|
164
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies })}\n`);
|
|
165
|
+
const plan = await depsPhase.plan(ctx);
|
|
166
|
+
expect(plan.notes.join('\n')).toContain('could not be resolved locally');
|
|
167
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
168
|
+
});
|
|
169
|
+
it('detects and applies settings-only allowBuilds changes from planned writes', async () => {
|
|
170
|
+
const ctx = createTestContext({ examples: false });
|
|
171
|
+
contexts.push(ctx);
|
|
172
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies: compatibleDependencies() }, null, 2)}\n`);
|
|
173
|
+
writeFileSync(ctx.resolve('pnpm-workspace.yaml'), 'packages:\n - .\n');
|
|
174
|
+
expect(await depsPhase.detect(ctx)).toBe('pending');
|
|
175
|
+
const plan = await depsPhase.plan(ctx);
|
|
176
|
+
expect(plan.commands).toEqual([]);
|
|
177
|
+
expect(plan.writes.map((write) => write.path)).toContain(ctx.resolve('pnpm-workspace.yaml'));
|
|
178
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('done');
|
|
179
|
+
expect(readFileSync(ctx.resolve('pnpm-workspace.yaml'), 'utf8')).toContain('allowBuilds:');
|
|
180
|
+
expect(await depsPhase.detect(ctx)).toBe('done');
|
|
181
|
+
});
|
|
182
|
+
it('detects stale package settings and atomically rejects a stale plan', async () => {
|
|
183
|
+
const ctx = createTestContext({ examples: false });
|
|
184
|
+
contexts.push(ctx);
|
|
185
|
+
const packagePath = ctx.resolve('package.json');
|
|
186
|
+
writeFileSync(packagePath, `${JSON.stringify({
|
|
187
|
+
dependencies: compatibleDependencies(),
|
|
188
|
+
pnpm: { onlyBuiltDependencies: ['sharp'] },
|
|
189
|
+
}, null, 2)}\n`);
|
|
190
|
+
writeFileSync(ctx.resolve('pnpm-workspace.yaml'), completeWorkspaceYaml());
|
|
191
|
+
expect(await depsPhase.detect(ctx)).toBe('pending');
|
|
192
|
+
const plan = await depsPhase.plan(ctx);
|
|
193
|
+
expect(plan.writes).toHaveLength(1);
|
|
194
|
+
const changed = `${readFileSync(packagePath, 'utf8').trimEnd()}\n `;
|
|
195
|
+
writeFileSync(packagePath, changed);
|
|
196
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
197
|
+
expect(readFileSync(packagePath, 'utf8')).toBe(changed);
|
|
198
|
+
});
|
|
199
|
+
it.each([
|
|
200
|
+
[
|
|
201
|
+
'workspace link',
|
|
202
|
+
(deps) => {
|
|
203
|
+
deps['@byline/core'] = 'workspace:*';
|
|
204
|
+
},
|
|
205
|
+
],
|
|
206
|
+
[
|
|
207
|
+
'compatible range',
|
|
208
|
+
(deps) => {
|
|
209
|
+
deps['@byline/core'] = BYLINE_VERSION;
|
|
210
|
+
},
|
|
211
|
+
],
|
|
212
|
+
[
|
|
213
|
+
'removed dependency',
|
|
214
|
+
(deps) => {
|
|
215
|
+
delete deps['@byline/core'];
|
|
216
|
+
},
|
|
217
|
+
],
|
|
218
|
+
[
|
|
219
|
+
'added dependency',
|
|
220
|
+
(deps) => {
|
|
221
|
+
deps.classnames = '^2.5.1';
|
|
222
|
+
},
|
|
223
|
+
],
|
|
224
|
+
])('blocks stale install candidates after a %s change', async (_name, mutate) => {
|
|
225
|
+
const ctx = createTestContext({ examples: false });
|
|
226
|
+
contexts.push(ctx);
|
|
227
|
+
ctx.pm = 'npm';
|
|
228
|
+
const dependencies = compatibleDependencies();
|
|
229
|
+
dependencies['@byline/core'] = `^${BELOW_FLOOR_VERSION}`;
|
|
230
|
+
delete dependencies.classnames;
|
|
231
|
+
const packagePath = ctx.resolve('package.json');
|
|
232
|
+
writeFileSync(packagePath, `${JSON.stringify({ dependencies }, null, 2)}\n`);
|
|
233
|
+
const plan = await depsPhase.plan(ctx);
|
|
234
|
+
mutate(dependencies);
|
|
235
|
+
const changed = `${JSON.stringify({ dependencies }, null, 2)}\n`;
|
|
236
|
+
writeFileSync(packagePath, changed);
|
|
237
|
+
expect(validateDependencyPlan(plan, ctx)).toMatchObject({ valid: false });
|
|
238
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
239
|
+
expect(readFileSync(packagePath, 'utf8')).toBe(changed);
|
|
240
|
+
});
|
|
241
|
+
it('blocks package-manager changes before settings writes or install commands', async () => {
|
|
242
|
+
const ctx = createTestContext({ examples: false });
|
|
243
|
+
contexts.push(ctx);
|
|
244
|
+
const dependencies = compatibleDependencies();
|
|
245
|
+
dependencies['@byline/core'] = `^${BELOW_FLOOR_VERSION}`;
|
|
246
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies })}\n`);
|
|
247
|
+
const plan = await depsPhase.plan(ctx);
|
|
248
|
+
expect(plan.writes.some((write) => write.path.endsWith('pnpm-workspace.yaml'))).toBe(true);
|
|
249
|
+
ctx.pm = 'npm';
|
|
250
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
251
|
+
expect(existsSync(ctx.resolve('pnpm-workspace.yaml'))).toBe(false);
|
|
252
|
+
});
|
|
253
|
+
it('blocks workspace-target changes before root settings writes', async () => {
|
|
254
|
+
const root = mkdtempSync(join(tmpdir(), 'byline-stale-target-'));
|
|
255
|
+
roots.push(root);
|
|
256
|
+
const app = join(root, 'apps/webapp');
|
|
257
|
+
mkdirSync(app, { recursive: true });
|
|
258
|
+
writeFileSync(join(root, 'package.json'), '{"private":true,"workspaces":["apps/*"]}\n');
|
|
259
|
+
writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n - apps/*\n');
|
|
260
|
+
const dependencies = compatibleDependencies();
|
|
261
|
+
dependencies['@byline/core'] = `^${BELOW_FLOOR_VERSION}`;
|
|
262
|
+
writeFileSync(join(app, 'package.json'), `${JSON.stringify({ dependencies })}\n`);
|
|
263
|
+
const ctx = createTestContextAt(app, { examples: false });
|
|
264
|
+
contexts.push(ctx);
|
|
265
|
+
ctx.pm = 'pnpm';
|
|
266
|
+
const plan = await depsPhase.plan(ctx);
|
|
267
|
+
const changedWorkspace = 'packages:\n - other/*\n';
|
|
268
|
+
writeFileSync(join(root, 'pnpm-workspace.yaml'), changedWorkspace);
|
|
269
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
|
|
270
|
+
expect(readFileSync(join(root, 'pnpm-workspace.yaml'), 'utf8')).toBe(changedWorkspace);
|
|
271
|
+
expect(existsSync(join(app, 'pnpm-workspace.yaml'))).toBe(false);
|
|
272
|
+
});
|
|
273
|
+
it.each(['false', 'null', '"yes"'])('repairs non-true allowBuilds values (%s)', async (value) => {
|
|
274
|
+
const ctx = createTestContext({ examples: false });
|
|
275
|
+
contexts.push(ctx);
|
|
276
|
+
writeFileSync(ctx.resolve('package.json'), `${JSON.stringify({ dependencies: compatibleDependencies() }, null, 2)}\n`);
|
|
277
|
+
writeFileSync(ctx.resolve('pnpm-workspace.yaml'), [
|
|
278
|
+
'allowBuilds:',
|
|
279
|
+
` "@google/genai": ${value}`,
|
|
280
|
+
' esbuild: true',
|
|
281
|
+
' protobufjs: true',
|
|
282
|
+
' sharp: true',
|
|
283
|
+
'',
|
|
284
|
+
].join('\n'));
|
|
285
|
+
expect(await depsPhase.detect(ctx)).toBe('pending');
|
|
286
|
+
const plan = await depsPhase.plan(ctx);
|
|
287
|
+
expect(plan.writes.find((write) => write.path.endsWith('pnpm-workspace.yaml'))?.contents).toContain('"@google/genai": true');
|
|
288
|
+
expect((await depsPhase.apply(plan, ctx)).state).toBe('done');
|
|
289
|
+
expect(await depsPhase.detect(ctx)).toBe('done');
|
|
290
|
+
});
|
|
291
|
+
it('blocks missing postconditions and manual invalid settings', async () => {
|
|
292
|
+
const missing = createTestContext({ examples: false });
|
|
293
|
+
contexts.push(missing);
|
|
294
|
+
missing.pm = 'npm';
|
|
295
|
+
writeFileSync(missing.resolve('package.json'), '{"dependencies":{}}\n');
|
|
296
|
+
expect(validateDependencyPostconditions(missing)).toMatchObject({ valid: false });
|
|
297
|
+
const incomplete = createTestContext({ examples: false });
|
|
298
|
+
contexts.push(incomplete);
|
|
299
|
+
writeFileSync(incomplete.resolve('package.json'), `${JSON.stringify({ dependencies: compatibleDependencies() })}\n`);
|
|
300
|
+
writeFileSync(incomplete.resolve('pnpm-workspace.yaml'), 'allowBuilds: false\n');
|
|
301
|
+
expect(validateDependencyPostconditions(incomplete)).toEqual({
|
|
302
|
+
valid: false,
|
|
303
|
+
reason: 'required dependency settings remain incomplete',
|
|
304
|
+
});
|
|
305
|
+
const plan = await depsPhase.plan(incomplete);
|
|
306
|
+
expect((await depsPhase.apply(plan, incomplete)).state).toBe('blocked');
|
|
307
|
+
});
|
|
308
|
+
it('includes mdast-util-to-string only for import-docs installs', async () => {
|
|
309
|
+
const without = createTestContext({ importDocs: false });
|
|
310
|
+
contexts.push(without);
|
|
311
|
+
writeFileSync(without.resolve('package.json'), '{"dependencies":{}}\n');
|
|
312
|
+
expect(JSON.stringify(await depsPhase.plan(without))).not.toContain('mdast-util-to-string');
|
|
313
|
+
const withDocs = createTestContext({ importDocs: true });
|
|
314
|
+
contexts.push(withDocs);
|
|
315
|
+
writeFileSync(withDocs.resolve('package.json'), '{"dependencies":{}}\n');
|
|
316
|
+
expect(JSON.stringify(await depsPhase.plan(withDocs))).toContain('mdast-util-to-string');
|
|
317
|
+
});
|
|
318
|
+
});
|
|
319
|
+
function compatibleDependencies() {
|
|
320
|
+
return Object.fromEntries(DEP_SPECS.filter((spec) => !spec.optional).map((spec) => [spec.name, spec.version]));
|
|
321
|
+
}
|
|
322
|
+
function completeWorkspaceYaml() {
|
|
323
|
+
return `allowBuilds:\n${['@google/genai', 'esbuild', 'protobufjs', 'sharp']
|
|
324
|
+
.map((name) => ` ${JSON.stringify(name)}: true`)
|
|
325
|
+
.join('\n')}\n`;
|
|
326
|
+
}
|
|
327
|
+
function linkedWorkspaceContext(version) {
|
|
328
|
+
const root = mkdtempSync(join(tmpdir(), 'byline-linked-workspace-'));
|
|
329
|
+
roots.push(root);
|
|
330
|
+
const app = join(root, 'apps/webapp');
|
|
331
|
+
mkdirSync(app, { recursive: true });
|
|
332
|
+
writeFileSync(join(root, 'package.json'), '{"private":true,"workspaces":["apps/*","packages/*"]}\n');
|
|
333
|
+
writeFileSync(join(root, 'pnpm-workspace.yaml'), `packages:\n - apps/*\n - packages/*\n${completeWorkspaceYaml()}`);
|
|
334
|
+
if (version) {
|
|
335
|
+
mkdirSync(join(root, 'packages/core'), { recursive: true });
|
|
336
|
+
writeFileSync(join(root, 'packages/core/package.json'), `${JSON.stringify({ name: '@byline/core', version })}\n`);
|
|
337
|
+
}
|
|
338
|
+
const ctx = createTestContextAt(app, { examples: false });
|
|
339
|
+
contexts.push(ctx);
|
|
340
|
+
ctx.pm = 'pnpm';
|
|
341
|
+
return ctx;
|
|
342
|
+
}
|
|
343
|
+
//# sourceMappingURL=deps.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deps.test.js","sourceRoot":"","sources":["../../src/phases/deps.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../src/phases/preflight.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../src/phases/preflight.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExD,eAAO,MAAM,cAAc,EAAE,KA2C5B,CAAA;AAoDD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CA2BhE"}
|
package/dist/phases/preflight.js
CHANGED
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { ancestors, resolveWorkspaceOwnership, validateWorkspacePackageManager, workspaceManagerConstraint, } from '../lib/workspace-root.js';
|
|
2
4
|
export const preflightPhase = {
|
|
3
5
|
id: 'preflight',
|
|
4
6
|
title: 'Preflight — environment checks',
|
|
5
7
|
defaultMode: 'auto',
|
|
6
8
|
async detect(ctx) {
|
|
7
|
-
|
|
9
|
+
if (!ctx.state.isComplete('preflight'))
|
|
10
|
+
return 'pending';
|
|
11
|
+
const selected = ctx.cliFlags.pm ?? ctx.state.get().answers.pm;
|
|
12
|
+
const constraint = workspaceManagerConstraint(ctx.cwd);
|
|
13
|
+
const resolved = selected ?? constraint.manager;
|
|
14
|
+
if (!resolved || !validateWorkspacePackageManager(ctx.cwd, resolved).valid)
|
|
15
|
+
return 'pending';
|
|
16
|
+
ctx.pm = resolved;
|
|
17
|
+
return 'done';
|
|
8
18
|
},
|
|
9
19
|
async plan(_ctx) {
|
|
10
20
|
return { writes: [], commands: [], notes: ['check Node version, git repo, package manager'] };
|
|
@@ -25,6 +35,8 @@ export const preflightPhase = {
|
|
|
25
35
|
return { state: 'blocked' };
|
|
26
36
|
}
|
|
27
37
|
const pm = await resolvePackageManager(ctx);
|
|
38
|
+
if (!pm)
|
|
39
|
+
return { state: 'blocked' };
|
|
28
40
|
ctx.pm = pm;
|
|
29
41
|
ctx.state.patchAnswers({ pm });
|
|
30
42
|
ctx.logger.info(`package manager: ${pm}`);
|
|
@@ -33,10 +45,34 @@ export const preflightPhase = {
|
|
|
33
45
|
};
|
|
34
46
|
async function resolvePackageManager(ctx) {
|
|
35
47
|
const fromFlag = ctx.cliFlags.pm;
|
|
48
|
+
const persisted = ctx.state.get().answers.pm;
|
|
49
|
+
const constraint = workspaceManagerConstraint(ctx.cwd);
|
|
50
|
+
if (constraint.ambiguous) {
|
|
51
|
+
ctx.logger.error(`${constraint.reason}; remove conflicting root metadata or lockfiles`);
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
if (constraint.manager) {
|
|
55
|
+
const selected = fromFlag ?? persisted;
|
|
56
|
+
if (selected && selected !== constraint.manager) {
|
|
57
|
+
ctx.logger.error(`owning workspace uses ${constraint.manager}; use --pm ${constraint.manager}`);
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
ctx.logger.info(`using owning workspace package manager: ${constraint.manager}`);
|
|
61
|
+
return constraint.manager;
|
|
62
|
+
}
|
|
36
63
|
if (fromFlag) {
|
|
37
64
|
ctx.logger.info(`using --pm ${fromFlag}`);
|
|
38
65
|
return fromFlag;
|
|
39
66
|
}
|
|
67
|
+
if (persisted) {
|
|
68
|
+
ctx.logger.info(`using previously selected package manager: ${persisted}`);
|
|
69
|
+
return persisted;
|
|
70
|
+
}
|
|
71
|
+
const ownership = resolveWorkspaceOwnership(ctx.cwd);
|
|
72
|
+
if (ownership.kind === 'package-json' && ctx.yes) {
|
|
73
|
+
ctx.logger.error('workspace has no authoritative package manager; pass --pm pnpm, npm, yarn, or bun');
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
40
76
|
const detected = detectPackageManager(ctx.cwd);
|
|
41
77
|
if (ctx.yes)
|
|
42
78
|
return detected;
|
|
@@ -53,16 +89,17 @@ async function resolvePackageManager(ctx) {
|
|
|
53
89
|
});
|
|
54
90
|
}
|
|
55
91
|
export function detectPackageManager(cwd) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
92
|
+
const constraint = workspaceManagerConstraint(cwd);
|
|
93
|
+
if (constraint.ambiguous)
|
|
94
|
+
throw new Error(constraint.reason);
|
|
95
|
+
if (constraint.manager)
|
|
96
|
+
return constraint.manager;
|
|
97
|
+
const ownership = resolveWorkspaceOwnership(cwd);
|
|
98
|
+
const relevantDirectories = ownership.kind === 'standalone'
|
|
99
|
+
? [ownership.root]
|
|
100
|
+
: ancestors(cwd).slice(0, ancestors(cwd).indexOf(ownership.root) + 1);
|
|
101
|
+
for (const directory of relevantDirectories) {
|
|
102
|
+
const pkgPath = join(directory, 'package.json');
|
|
66
103
|
try {
|
|
67
104
|
const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
|
|
68
105
|
if (pkg.packageManager?.startsWith('pnpm'))
|
|
@@ -75,6 +112,17 @@ export function detectPackageManager(cwd) {
|
|
|
75
112
|
return 'npm';
|
|
76
113
|
}
|
|
77
114
|
catch { }
|
|
115
|
+
if (existsSync(join(directory, 'pnpm-workspace.yaml')))
|
|
116
|
+
return 'pnpm';
|
|
117
|
+
if (existsSync(join(directory, 'pnpm-lock.yaml')))
|
|
118
|
+
return 'pnpm';
|
|
119
|
+
if (existsSync(join(directory, 'bun.lockb')) || existsSync(join(directory, 'bun.lock'))) {
|
|
120
|
+
return 'bun';
|
|
121
|
+
}
|
|
122
|
+
if (existsSync(join(directory, 'yarn.lock')))
|
|
123
|
+
return 'yarn';
|
|
124
|
+
if (existsSync(join(directory, 'package-lock.json')))
|
|
125
|
+
return 'npm';
|
|
78
126
|
}
|
|
79
127
|
return 'pnpm';
|
|
80
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/phases/preflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/phases/preflight.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/prompts.d.ts
CHANGED
|
@@ -6,6 +6,8 @@ import type { Phase } from '../types.js';
|
|
|
6
6
|
* user declined.
|
|
7
7
|
*
|
|
8
8
|
* Currently asks:
|
|
9
|
+
* - `adminPath`: the single URL segment used by route files and runtime config
|
|
10
|
+
* - `signInPath`: the URL path used by the public sign-in route
|
|
9
11
|
* - `examples`: include the example collections/blocks/fields overlay
|
|
10
12
|
* - `importDocs`: include the markdown → Byline import example script
|
|
11
13
|
* (`byline/scripts/import-docs.ts` plus `scripts/lib/*`) and its
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/phases/prompts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/phases/prompts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,YAAY,EAAE,KAgG1B,CAAA"}
|
package/dist/phases/prompts.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DEFAULT_SIGN_IN_PATH, validateRoutePaths } from '../lib/route-config.js';
|
|
1
2
|
/**
|
|
2
3
|
* Collects user choices that downstream phases (`deps`, `scaffold`) need
|
|
3
4
|
* to see *before* they plan their work. Runs immediately after preflight
|
|
@@ -5,6 +6,8 @@
|
|
|
5
6
|
* user declined.
|
|
6
7
|
*
|
|
7
8
|
* Currently asks:
|
|
9
|
+
* - `adminPath`: the single URL segment used by route files and runtime config
|
|
10
|
+
* - `signInPath`: the URL path used by the public sign-in route
|
|
8
11
|
* - `examples`: include the example collections/blocks/fields overlay
|
|
9
12
|
* - `importDocs`: include the markdown → Byline import example script
|
|
10
13
|
* (`byline/scripts/import-docs.ts` plus `scripts/lib/*`) and its
|
|
@@ -17,11 +20,24 @@ export const promptsPhase = {
|
|
|
17
20
|
title: 'Prompts — collect example/opt-in choices',
|
|
18
21
|
defaultMode: 'auto',
|
|
19
22
|
async detect(ctx) {
|
|
20
|
-
|
|
23
|
+
const answers = ctx.state.get().answers;
|
|
24
|
+
return ctx.state.isComplete('prompts') &&
|
|
25
|
+
answers.adminPath !== undefined &&
|
|
26
|
+
answers.signInPath !== undefined
|
|
27
|
+
? 'done'
|
|
28
|
+
: 'pending';
|
|
21
29
|
},
|
|
22
30
|
async plan(ctx) {
|
|
23
31
|
const a = ctx.state.get().answers;
|
|
24
32
|
const notes = [];
|
|
33
|
+
if (a.adminPath === undefined)
|
|
34
|
+
notes.push('will ask: admin URL path?');
|
|
35
|
+
else
|
|
36
|
+
notes.push(`admin path: ${a.adminPath} (already answered)`);
|
|
37
|
+
if (a.signInPath === undefined)
|
|
38
|
+
notes.push('will ask: sign-in URL path?');
|
|
39
|
+
else
|
|
40
|
+
notes.push(`sign-in path: ${a.signInPath} (already answered)`);
|
|
25
41
|
if (a.examples === undefined)
|
|
26
42
|
notes.push('will ask: include example collections/blocks/fields?');
|
|
27
43
|
else
|
|
@@ -39,6 +55,39 @@ export const promptsPhase = {
|
|
|
39
55
|
},
|
|
40
56
|
async apply(_plan, ctx) {
|
|
41
57
|
const current = ctx.state.get().answers;
|
|
58
|
+
let adminPath = current.adminPath;
|
|
59
|
+
if (adminPath === undefined) {
|
|
60
|
+
adminPath = await ctx.prompter.text({
|
|
61
|
+
message: 'Where should the admin UI be mounted?',
|
|
62
|
+
defaultValue: '/admin',
|
|
63
|
+
placeholder: '/admin',
|
|
64
|
+
validate: (value) => {
|
|
65
|
+
const result = validateRoutePaths(ctx, value, current.signInPath ?? DEFAULT_SIGN_IN_PATH);
|
|
66
|
+
return result.ok ? undefined : result.error;
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
let signInPath = current.signInPath;
|
|
71
|
+
if (signInPath === undefined) {
|
|
72
|
+
signInPath = await ctx.prompter.text({
|
|
73
|
+
message: 'Where should the sign-in page be mounted?',
|
|
74
|
+
defaultValue: DEFAULT_SIGN_IN_PATH,
|
|
75
|
+
placeholder: DEFAULT_SIGN_IN_PATH,
|
|
76
|
+
validate: (value) => {
|
|
77
|
+
const result = validateRoutePaths(ctx, adminPath, value);
|
|
78
|
+
return result.ok ? undefined : result.error;
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
const routes = validateRoutePaths(ctx, adminPath, signInPath);
|
|
83
|
+
if (!routes.ok) {
|
|
84
|
+
ctx.logger.error(routes.error);
|
|
85
|
+
return { state: 'blocked' };
|
|
86
|
+
}
|
|
87
|
+
ctx.state.patchAnswers({
|
|
88
|
+
adminPath: routes.value.adminPath,
|
|
89
|
+
signInPath: routes.value.signInPath,
|
|
90
|
+
});
|
|
42
91
|
let examples = current.examples;
|
|
43
92
|
if (examples === undefined) {
|
|
44
93
|
examples = await ctx.prompter.confirm({
|
|
@@ -53,7 +102,7 @@ export const promptsPhase = {
|
|
|
53
102
|
}
|
|
54
103
|
else if (importDocs === undefined) {
|
|
55
104
|
importDocs = await ctx.prompter.confirm({
|
|
56
|
-
message: 'Include the optional markdown → Byline import example script? Adds
|
|
105
|
+
message: 'Include the optional markdown → Byline import example script? Adds 6 devDependencies (gray-matter, unified, remark-parse, remark-gfm, mdast-util-to-string, @types/mdast) used only by byline/scripts/import-docs.ts. Copied helper tests are excluded so the host does not need Vitest.',
|
|
57
106
|
defaultValue: false,
|
|
58
107
|
});
|
|
59
108
|
}
|