@byline/cli 6.4.0 → 6.6.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/dist/lib/release-policy.d.ts +14 -1
- package/dist/lib/release-policy.d.ts.map +1 -1
- package/dist/lib/release-policy.js +13 -3
- package/dist/lib/release-policy.js.map +1 -1
- package/dist/lib/release-policy.test.js +5 -5
- package/dist/lib/release-policy.test.js.map +1 -1
- package/dist/phases/db-init.js +1 -1
- package/dist/phases/db-init.js.map +1 -1
- package/dist/phases/db.d.ts.map +1 -1
- package/dist/phases/db.js +5 -1
- package/dist/phases/db.js.map +1 -1
- package/dist/phases/deps.test.js +15 -5
- package/dist/phases/deps.test.js.map +1 -1
- package/dist/templates/byline-examples/blocks/photo-block.ts +2 -2
- package/dist/templates/byline-examples/generated/collection-types.ts +3 -3
- package/dist/templates/byline-examples/seeds/docs.ts +1 -1
- package/dist/templates/ui-byline/blocks/photo-block/index.tsx +3 -3
- package/dist/templates/ui-byline/components/inline-image/index.tsx +66 -4
- package/dist/templates/ui-byline/components/link/link-lexical.tsx +1 -1
- package/dist/templates/ui-byline/components/richtext-lexical/serialize/index.tsx +45 -2
- package/dist/templates/ui-byline/components/richtext-lexical/serialize/types.ts +16 -7
- package/dist/templates/ui-byline/render-blocks.tsx +45 -28
- package/dist/templates/ui-byline/types/content.ts +20 -10
- package/dist/ui-template-contract.test.js +21 -13
- package/dist/ui-template-contract.test.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,9 +1,22 @@
|
|
|
1
1
|
export interface BylineReleasePolicy {
|
|
2
|
+
/** Range written into `package.json` when the CLI installs a `@byline/*` package. */
|
|
2
3
|
dependencyRange: string;
|
|
4
|
+
/** Range an already-declared `@byline/*` dependency must fall within to pass the gate. */
|
|
3
5
|
supportedRange: string;
|
|
6
|
+
/** Human-readable form of `supportedRange` for prompts and error messages. */
|
|
4
7
|
displayFloor: string;
|
|
5
8
|
}
|
|
6
|
-
/**
|
|
9
|
+
/**
|
|
10
|
+
* Derive every CLI package-compatibility value from one release version.
|
|
11
|
+
*
|
|
12
|
+
* Installing and accepting are deliberately different ranges. A fresh install
|
|
13
|
+
* pins `^<cli version>`, because there is no reason to scaffold an app onto
|
|
14
|
+
* anything but the current release. Acceptance spans the whole major line,
|
|
15
|
+
* because `npx @byline/cli` always fetches the newest CLI: gating on the CLI's
|
|
16
|
+
* own version would reject every app that is even one patch behind, which is
|
|
17
|
+
* most of them. The `@byline/*` packages release in lockstep within a major,
|
|
18
|
+
* so any release in the line is a coherent target for this CLI.
|
|
19
|
+
*/
|
|
7
20
|
export declare function deriveBylineReleasePolicy(cliVersion: string): BylineReleasePolicy;
|
|
8
21
|
/** Version of the installed CLI package; Changesets updates this at release time. */
|
|
9
22
|
export declare const CLI_PACKAGE_VERSION: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-policy.d.ts","sourceRoot":"","sources":["../../src/lib/release-policy.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED
|
|
1
|
+
{"version":3,"file":"release-policy.d.ts","sourceRoot":"","sources":["../../src/lib/release-policy.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,mBAAmB;IAClC,qFAAqF;IACrF,eAAe,EAAE,MAAM,CAAA;IACvB,0FAA0F;IAC1F,cAAc,EAAE,MAAM,CAAA;IACtB,8EAA8E;IAC9E,YAAY,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAWjF;AAID,qFAAqF;AACrF,eAAO,MAAM,mBAAmB,QAAiE,CAAA;AAEjG,+DAA+D;AAC/D,eAAO,MAAM,qBAAqB,qBAAiD,CAAA"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';
|
|
2
2
|
import { parse } from 'semver';
|
|
3
|
-
/**
|
|
3
|
+
/**
|
|
4
|
+
* Derive every CLI package-compatibility value from one release version.
|
|
5
|
+
*
|
|
6
|
+
* Installing and accepting are deliberately different ranges. A fresh install
|
|
7
|
+
* pins `^<cli version>`, because there is no reason to scaffold an app onto
|
|
8
|
+
* anything but the current release. Acceptance spans the whole major line,
|
|
9
|
+
* because `npx @byline/cli` always fetches the newest CLI: gating on the CLI's
|
|
10
|
+
* own version would reject every app that is even one patch behind, which is
|
|
11
|
+
* most of them. The `@byline/*` packages release in lockstep within a major,
|
|
12
|
+
* so any release in the line is a coherent target for this CLI.
|
|
13
|
+
*/
|
|
4
14
|
export function deriveBylineReleasePolicy(cliVersion) {
|
|
5
15
|
const parsed = parse(cliVersion);
|
|
6
16
|
if (!parsed) {
|
|
@@ -8,8 +18,8 @@ export function deriveBylineReleasePolicy(cliVersion) {
|
|
|
8
18
|
}
|
|
9
19
|
return {
|
|
10
20
|
dependencyRange: `^${parsed.version}`,
|
|
11
|
-
supportedRange: `>=${parsed.
|
|
12
|
-
displayFloor: `${parsed.major}
|
|
21
|
+
supportedRange: `>=${parsed.major}.0.0 <${parsed.major + 1}.0.0-0`,
|
|
22
|
+
displayFloor: `${parsed.major}.x`,
|
|
13
23
|
};
|
|
14
24
|
}
|
|
15
25
|
const require = createRequire(import.meta.url);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-policy.js","sourceRoot":"","sources":["../../src/lib/release-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"release-policy.js","sourceRoot":"","sources":["../../src/lib/release-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAW9B;;;;;;;;;;GAUG;AACH,MAAM,UAAU,yBAAyB,CAAC,UAAkB;IAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,CAAA;IAChC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,wCAAwC,UAAU,EAAE,CAAC,CAAA;IACvE,CAAC;IAED,OAAO;QACL,eAAe,EAAE,IAAI,MAAM,CAAC,OAAO,EAAE;QACrC,cAAc,EAAE,KAAK,MAAM,CAAC,KAAK,SAAS,MAAM,CAAC,KAAK,GAAG,CAAC,QAAQ;QAClE,YAAY,EAAE,GAAG,MAAM,CAAC,KAAK,IAAI;KAClC,CAAA;AACH,CAAC;AAED,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;AAE9C,qFAAqF;AACrF,MAAM,CAAC,MAAM,mBAAmB,GAAI,OAAO,CAAC,oBAAoB,CAAyB,CAAC,OAAO,CAAA;AAEjG,+DAA+D;AAC/D,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,mBAAmB,CAAC,CAAA"}
|
|
@@ -6,8 +6,8 @@ describe('deriveBylineReleasePolicy', () => {
|
|
|
6
6
|
'3.21.0',
|
|
7
7
|
{
|
|
8
8
|
dependencyRange: '^3.21.0',
|
|
9
|
-
supportedRange: '>=3.
|
|
10
|
-
displayFloor: '3.
|
|
9
|
+
supportedRange: '>=3.0.0 <4.0.0-0',
|
|
10
|
+
displayFloor: '3.x',
|
|
11
11
|
},
|
|
12
12
|
],
|
|
13
13
|
[
|
|
@@ -15,15 +15,15 @@ describe('deriveBylineReleasePolicy', () => {
|
|
|
15
15
|
{
|
|
16
16
|
dependencyRange: '^4.0.0',
|
|
17
17
|
supportedRange: '>=4.0.0 <5.0.0-0',
|
|
18
|
-
displayFloor: '4.
|
|
18
|
+
displayFloor: '4.x',
|
|
19
19
|
},
|
|
20
20
|
],
|
|
21
21
|
[
|
|
22
22
|
'5.2.1',
|
|
23
23
|
{
|
|
24
24
|
dependencyRange: '^5.2.1',
|
|
25
|
-
supportedRange: '>=5.
|
|
26
|
-
displayFloor: '5.
|
|
25
|
+
supportedRange: '>=5.0.0 <6.0.0-0',
|
|
26
|
+
displayFloor: '5.x',
|
|
27
27
|
},
|
|
28
28
|
],
|
|
29
29
|
])('derives the lockstep policy for %s', (version, expected) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-policy.test.js","sourceRoot":"","sources":["../../src/lib/release-policy.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAE/D,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,IAAI,CAAC;QACN;YACE,QAAQ;YACR;gBACE,eAAe,EAAE,SAAS;gBAC1B,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"release-policy.test.js","sourceRoot":"","sources":["../../src/lib/release-policy.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAE/D,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,IAAI,CAAC;QACN;YACE,QAAQ;YACR;gBACE,eAAe,EAAE,SAAS;gBAC1B,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,KAAK;aACpB;SACF;QACD;YACE,OAAO;YACP;gBACE,eAAe,EAAE,QAAQ;gBACzB,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,KAAK;aACpB;SACF;QACD;YACE,OAAO;YACP;gBACE,eAAe,EAAE,QAAQ;gBACzB,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,KAAK;aACpB;SACF;KACF,CAAC,CAAC,oCAAoC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QAC7D,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAA;IAChG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/dist/phases/db-init.js
CHANGED
|
@@ -194,7 +194,7 @@ async function resolveAppPassword(ctx, databaseLabel) {
|
|
|
194
194
|
return fromEnv;
|
|
195
195
|
}
|
|
196
196
|
const password = await ctx.prompter.password({
|
|
197
|
-
message: `Choose a password for
|
|
197
|
+
message: `Choose a password for that ${databaseLabel} database login (min 8 chars)`,
|
|
198
198
|
validate: (value) => (value.length < 8 ? 'must be at least 8 characters' : undefined),
|
|
199
199
|
});
|
|
200
200
|
return password || null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/phases/db-init.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/phases/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EACL,6BAA6B,EAC7B,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAI9D,MAAM,CAAC,MAAM,WAAW,GAAU;IAChC,EAAE,EAAE,SAAS;IACb,KAAK,EAAE,kFAAkF;IACzF,WAAW,EAAE,SAAS;IAEtB,KAAK,CAAC,MAAM,CAAC,GAAG;QACd,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,MAAM,CAAA;QAClD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAA;QACvC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAChF,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAG;QACZ,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAA;QACvC,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,IAAI,OAAO,CAAC,SAAS;YAAE,KAAK,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC3E,IAAI,OAAO,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,uBAAuB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QACxE,IAAI,OAAO,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,4BAA4B,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QAC7E,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAA;QACrE,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;YACpE,KAAK,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAA;QACpF,CAAC;QACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,aAAa,GAAG,yBAAyB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,aAAa,CAAA;YAChF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,KAAK,CAAC,IAAI,CAAC,0BAA0B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClE,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,KAAK,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,SAAS,yBAAyB,CAAC,CAAA;QAC7E,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG;QACpB,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAA;QACvC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAA;YAC1E,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;QACD,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACpE,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,oCAAoC,6BAA6B,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CACzF,CAAA;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;QACD,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,oCAAoC,6BAA6B,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CACrF,CAAA;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;QAED,MAAM,UAAU,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAA;QACrD,IAAI,UAAU,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,0CAA0C,CAAC,CAAA;YAC/E,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QACpF,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAE1C,MAAM,eAAe,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACrD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,WAAW,CAAA;QACpE,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,WAAW,CAAA;QACpE,IACE,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;YACrE,SAAS,KAAK,eAAe,EAC7B,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,6FAA6F,CAC9F,CAAA;YACD,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,yBAAyB,OAAO,CAAC,MAAM,IAAI,eAAe,6BAA6B,eAAe,CAAC,IAAI,IAAI,SAAS,EAAE,CAC3H,CAAA;YACD,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,oGAAoG,CACrG,CAAA;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;QAED,MAAM,WAAW,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAA;QAElE,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YACrC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACpC,OAAO,EAAE,6BAA6B,OAAO,CAAC,MAAM,2BAA2B;gBAC/E,YAAY,EAAE,KAAK;aACpB,CAAC,CAAA;YACF,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;gBAClC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;YAC7B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,OAAO,CAAC,MAAM,uBAAuB,CAAC,CAAA;YAC9E,MAAM,WAAW,GAAG,gBAAgB,CAClC,MAAM,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAC1D,CAAA;YACD,IAAI,WAAW,KAAK,eAAe,IAAI,WAAW,KAAK,iBAAiB,EAAE,CAAC;gBACzE,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;gBAC/D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;YAC7B,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,CAAA;QAChE,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC1C,GAAG,CAAC,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAA;QAEjC,MAAM,WAAW,CAAC,eAAe,CAAC;YAChC,QAAQ;YACR,QAAQ,EAAE,OAAO,CAAC,MAAM;YACxB,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,QAAQ;YACR,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAA;QAEF,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE;YACzC,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,QAAQ;YACR,QAAQ,EAAE,OAAO,CAAC,MAAM;SACzB,CAAC,CAAA;QACF,MAAM,WAAW,CAAC,aAAa,CAAC;YAC9B,cAAc;YACd,gBAAgB,EAAE,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC;YAC1D,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAC1B,CAAC;CACF,CAAA;AAED,MAAM,UAAU,mBAAmB,CAAC,OAA0B;IAC5D,OAAO,qDAAqD,mBAAmB,gBAAgB,OAAO,gBAAgB,CAAA;AACxH,CAAC;AAED,SAAS,oBAAoB,CAC3B,GAAY,EACZ,OAA0B,EAC1B,QAAgB,EAChB,KAAkE;IAElE,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;QAC9B,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,sCAAsC,QAAQ,0CAA0C,CACzF,CAAA;QACD,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,mGAAmG,CACpG,CAAA;QACD,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,6EAA6E,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAC5G,CAAA;QACD,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,yHAAyH,CAC1H,CAAA;IACH,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,sCAAsC,QAAQ,qCAAqC,CACpF,CAAA;QACD,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,sHAAsH,CACvH,CAAA;QACD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAA;IAChF,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;AACnD,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,GAAY,EACZ,OAA0B,EAC1B,IAAY,EACZ,IAAa;IAEb,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACzC,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAA;IACrD,MAAM,SAAS,GAAG,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9D,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE;QACnC,IAAI;QACJ,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,WAAW;QACxC,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU,CAAC,oBAAoB;KAC1C,CAAC,CAAA;IACF,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClC,OAAO,EAAE,GAAG,UAAU,CAAC,KAAK,iEAAiE;QAC7F,WAAW,EAAE,QAAQ;QACrB,YAAY,EAAE,QAAQ;KACvB,CAAC,CAAA;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAA;QACpF,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACH,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAA;QAC1C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;IAC1B,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,GAAY,EAAE,aAAqB;IACnE,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAA;IACzD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC9C,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAA;YACpE,OAAO,IAAI,CAAA;QACb,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAA;QAC3E,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC3C,OAAO,EAAE,8BAA8B,aAAa,+BAA+B;QACnF,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,SAAS,CAAC;KACtF,CAAC,CAAA;IACF,OAAO,QAAQ,IAAI,IAAI,CAAA;AACzB,CAAC"}
|
package/dist/phases/db.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/phases/db.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,eAAO,MAAM,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/phases/db.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,eAAO,MAAM,OAAO,EAAE,KA2HrB,CAAA"}
|
package/dist/phases/db.js
CHANGED
|
@@ -72,8 +72,12 @@ export const dbPhase = {
|
|
|
72
72
|
ctx.logger.error(`invalid database name "${dbName}" — ${databaseIdentifierRequirement(adapter, 'database')}`);
|
|
73
73
|
return { state: 'blocked' };
|
|
74
74
|
}
|
|
75
|
+
// Not to be confused with Byline's own admin roles: this is the database
|
|
76
|
+
// login the running application connects as, created if it is absent.
|
|
77
|
+
// Postgres calls such a login a role, which reads as a permission role
|
|
78
|
+
// next to the admin roles in the CMS, so the wording says both.
|
|
75
79
|
const dbUser = await ctx.prompter.text({
|
|
76
|
-
message: `
|
|
80
|
+
message: `Database login for the app to connect as (${adapter === 'postgres' ? 'a Postgres role' : 'a MySQL user'}, created if it does not exist)`,
|
|
77
81
|
defaultValue: 'byline',
|
|
78
82
|
});
|
|
79
83
|
if (!isValidDatabaseIdentifier(adapter, 'user', dbUser)) {
|
package/dist/phases/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/phases/db.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/phases/db.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/deps.test.js
CHANGED
|
@@ -15,11 +15,14 @@ const CURRENT_VERSION = BYLINE_VERSION.slice(1);
|
|
|
15
15
|
const [CURRENT_MAJOR, CURRENT_MINOR, CURRENT_PATCH] = CURRENT_VERSION.split('.').map(Number);
|
|
16
16
|
const NEXT_MAJOR_VERSION = `${CURRENT_MAJOR + 1}.0.0`;
|
|
17
17
|
const SAME_MAJOR_LATER_VERSION = `${CURRENT_MAJOR}.${CURRENT_MINOR}.${CURRENT_PATCH + 1}`;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Genuinely outside the supported range. The CLI accepts its whole major
|
|
20
|
+
* line, so only a previous major is below the floor — an earlier release
|
|
21
|
+
* within the same major is supported (see EARLIER_SAME_MAJOR_VERSION).
|
|
22
|
+
*/
|
|
23
|
+
const BELOW_FLOOR_VERSION = `${CURRENT_MAJOR - 1}.0.0`;
|
|
24
|
+
/** The oldest release this CLI still supports: its own major's baseline. */
|
|
25
|
+
const EARLIER_SAME_MAJOR_VERSION = `${CURRENT_MAJOR}.0.0`;
|
|
23
26
|
afterEach(() => {
|
|
24
27
|
for (const ctx of contexts.splice(0))
|
|
25
28
|
rmSync(ctx.cwd, { recursive: true, force: true });
|
|
@@ -90,6 +93,13 @@ describe('Byline dependency compatibility', () => {
|
|
|
90
93
|
[`workspace:${CURRENT_VERSION}`, true],
|
|
91
94
|
[`workspace:^${BELOW_FLOOR_VERSION}`, false],
|
|
92
95
|
[`^${BELOW_FLOOR_VERSION}`, false],
|
|
96
|
+
// An app one release behind this CLI is still supported. `npx` always
|
|
97
|
+
// fetches the newest CLI, so gating on the CLI's own version rejected
|
|
98
|
+
// every app that was not on the latest release.
|
|
99
|
+
[`^${EARLIER_SAME_MAJOR_VERSION}`, true],
|
|
100
|
+
[`workspace:^${EARLIER_SAME_MAJOR_VERSION}`, true],
|
|
101
|
+
[`~${EARLIER_SAME_MAJOR_VERSION}`, true],
|
|
102
|
+
[EARLIER_SAME_MAJOR_VERSION, true],
|
|
93
103
|
[`>=${CURRENT_VERSION}`, false],
|
|
94
104
|
[`^${NEXT_MAJOR_VERSION}`, false],
|
|
95
105
|
[`${BYLINE_VERSION} || ^${NEXT_MAJOR_VERSION}`, false],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.test.js","sourceRoot":"","sources":["../../src/phases/deps.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deps.test.js","sourceRoot":"","sources":["../../src/phases/deps.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,8 @@ export const PhotoBlock = defineBlock({
|
|
|
14
14
|
helpText: 'A block for displaying a photo with optional caption and alt text.',
|
|
15
15
|
fields: [
|
|
16
16
|
{
|
|
17
|
-
name: '
|
|
18
|
-
label: '
|
|
17
|
+
name: 'position',
|
|
18
|
+
label: 'Position',
|
|
19
19
|
type: 'select',
|
|
20
20
|
optional: true,
|
|
21
21
|
defaultValue: 'default',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Generated by @byline/core/codegen
|
|
2
2
|
// Format version: 3
|
|
3
|
-
// Hash:
|
|
3
|
+
// Hash: 9e08bef615857958ced3838c95144963e3c2edd7af287d454eda1a142bea187b
|
|
4
4
|
|
|
5
5
|
import type {
|
|
6
6
|
JsonValue,
|
|
@@ -12,7 +12,7 @@ declare module '@byline/generated-types' {
|
|
|
12
12
|
export type PhotoBlockData = {
|
|
13
13
|
_id: string
|
|
14
14
|
_type: 'photoBlock'
|
|
15
|
-
|
|
15
|
+
position?: 'default' | 'wide' | 'full_width' | undefined
|
|
16
16
|
photo?: RelatedDocumentValue | undefined
|
|
17
17
|
alt: string
|
|
18
18
|
caption?: JsonValue | undefined
|
|
@@ -21,7 +21,7 @@ declare module '@byline/generated-types' {
|
|
|
21
21
|
export type PhotoBlockDataAllLocales = {
|
|
22
22
|
_id: string
|
|
23
23
|
_type: 'photoBlock'
|
|
24
|
-
|
|
24
|
+
position?: 'default' | 'wide' | 'full_width' | undefined
|
|
25
25
|
photo?: RelatedDocumentValue | undefined
|
|
26
26
|
alt: string
|
|
27
27
|
caption?: { [locale: string]: JsonValue } | undefined
|
|
@@ -25,13 +25,13 @@ export function PhotoBlock({
|
|
|
25
25
|
className,
|
|
26
26
|
constrainedLayout,
|
|
27
27
|
}: Props): React.JSX.Element | null {
|
|
28
|
-
const { photo, alt, caption,
|
|
28
|
+
const { photo, alt, caption, position } = block
|
|
29
29
|
|
|
30
30
|
// Missing, unresolved, and cycle-suppressed relations have no document.
|
|
31
31
|
const media = photo?.document?.fields
|
|
32
32
|
if (media == null) return null
|
|
33
33
|
|
|
34
|
-
const Comp =
|
|
34
|
+
const Comp = position === 'full_width' ? 'div' : Container
|
|
35
35
|
|
|
36
36
|
const captionRoot =
|
|
37
37
|
caption != null && !Array.isArray(caption) && typeof caption === 'object'
|
|
@@ -48,7 +48,7 @@ export function PhotoBlock({
|
|
|
48
48
|
className={cx(
|
|
49
49
|
'px-0',
|
|
50
50
|
{
|
|
51
|
-
'lg:max-w-[920px] xl:max-w-[920px] 2xl:max-w-[920px] mx-auto':
|
|
51
|
+
'lg:max-w-[920px] xl:max-w-[920px] 2xl:max-w-[920px] mx-auto': position === 'default',
|
|
52
52
|
},
|
|
53
53
|
className
|
|
54
54
|
)}
|
|
@@ -7,6 +7,8 @@ import type { InlineImagePosition, SerializedInlineImageNode } from '@byline/ric
|
|
|
7
7
|
import { FadeInLift } from '@byline/ui/react'
|
|
8
8
|
|
|
9
9
|
import { ResponsiveImage } from '../responsive-image/index.tsx'
|
|
10
|
+
import { getHref, type LinkAttributes } from '../link/link-lexical.tsx'
|
|
11
|
+
import { LangLink } from '@/ui/byline/components/link/lang-link'
|
|
10
12
|
import type { Locale } from '@/ui/byline/types/i18n'
|
|
11
13
|
import type { SerializeOptions, SerializeProps } from '../richtext-lexical/serialize/index.tsx'
|
|
12
14
|
|
|
@@ -44,7 +46,7 @@ interface Props {
|
|
|
44
46
|
}
|
|
45
47
|
|
|
46
48
|
export function InlineImageSerializer({ node, serialize, lng, options }: Props): React.JSX.Element {
|
|
47
|
-
const { showCaption, position, altText, document: pickerDoc, caption } = node
|
|
49
|
+
const { showCaption, position, altText, document: pickerDoc, caption, link } = node
|
|
48
50
|
const image = pickerDoc?.image as StoredFileValue | undefined
|
|
49
51
|
|
|
50
52
|
const floatLeft = position === 'left'
|
|
@@ -86,16 +88,76 @@ export function InlineImageSerializer({ node, serialize, lng, options }: Props):
|
|
|
86
88
|
</FadeInLift>
|
|
87
89
|
)
|
|
88
90
|
|
|
91
|
+
// Optional click-through target.
|
|
92
|
+
//
|
|
93
|
+
// The anchor goes INSIDE the floated wrapper and wraps the image only.
|
|
94
|
+
// Two reasons, both load-bearing:
|
|
95
|
+
//
|
|
96
|
+
// - the float and the 50% column live on the outer span, so an anchor
|
|
97
|
+
// outside it would take the float and change the layout;
|
|
98
|
+
// - the caption is a nested editor that can contain its own links, and
|
|
99
|
+
// an `<a>` inside an `<a>` is invalid — browsers un-nest it and the
|
|
100
|
+
// layout breaks with it. The caption stays outside the anchor.
|
|
101
|
+
//
|
|
102
|
+
// `display: block` stops the inline `<a>` adding a descender gap beneath
|
|
103
|
+
// the image. `getHref` returns '' for a target the walker marked
|
|
104
|
+
// unresolved, in which case the image renders with no anchor at all —
|
|
105
|
+
// the same degradation a text link gets.
|
|
106
|
+
//
|
|
107
|
+
// `options.insideLink` suppresses the anchor entirely: the image is
|
|
108
|
+
// already inside a text link, whose anchor would be invalidated by a
|
|
109
|
+
// nested one. The outer link wins.
|
|
110
|
+
const href = options?.insideLink === true || link == null ? '' : getHref(link as LinkAttributes)
|
|
111
|
+
|
|
112
|
+
// Target and rel are derived here rather than through the text link's
|
|
113
|
+
// `getAdditionalProps`. That helper forces `target="_blank"` for any
|
|
114
|
+
// external href regardless of the node's own `newTab`, which suits a text
|
|
115
|
+
// link (they also get a visible external-link icon) but makes the image
|
|
116
|
+
// dialog's "Open in new tab" checkbox a no-op for exactly the URLs an
|
|
117
|
+
// editor is most likely to tick it for. Here the editor's choice is
|
|
118
|
+
// authoritative.
|
|
119
|
+
//
|
|
120
|
+
// `rel="noopener"` is belt-and-braces, not a fix for a live hole: the
|
|
121
|
+
// HTML standard has `target="_blank"` imply `noopener` unless a rel
|
|
122
|
+
// explicitly opts back in, and conforming browsers have done so for
|
|
123
|
+
// years. It is stated anyway so the guarantee does not rest on the
|
|
124
|
+
// implied behaviour, and it matches what text links emit for `newTab`.
|
|
125
|
+
// `noreferrer` is deliberately NOT added — it would additionally strip
|
|
126
|
+
// the referrer, a separate behavioural choice that belongs with the
|
|
127
|
+
// site's referrer policy rather than with this checkbox.
|
|
128
|
+
const newTab = link?.newTab === true
|
|
129
|
+
const anchorProps = newTab
|
|
130
|
+
? { target: '_blank', rel: 'noopener' }
|
|
131
|
+
: ({} as { target?: string; rel?: string })
|
|
132
|
+
|
|
133
|
+
const Linked =
|
|
134
|
+
href.length === 0 ? (
|
|
135
|
+
ImgSlot
|
|
136
|
+
) : href.startsWith('/') ? (
|
|
137
|
+
<LangLink lng={lng} to={href} {...anchorProps} className="block">
|
|
138
|
+
{ImgSlot}
|
|
139
|
+
</LangLink>
|
|
140
|
+
) : (
|
|
141
|
+
<a href={href} {...anchorProps} className="block">
|
|
142
|
+
{ImgSlot}
|
|
143
|
+
</a>
|
|
144
|
+
)
|
|
145
|
+
|
|
89
146
|
if (showCaption) {
|
|
90
147
|
return (
|
|
91
148
|
<span className={classes}>
|
|
92
|
-
{
|
|
149
|
+
{Linked}
|
|
93
150
|
<span className="block inline-image-block--caption">
|
|
94
151
|
{caption?.editorState?.root?.children != null ? (
|
|
152
|
+
// The caption is a nested serialize pass and can hold its own
|
|
153
|
+
// links, so the surrounding options travel with it. Dropping
|
|
154
|
+
// them would let a caption link emit an anchor inside the text
|
|
155
|
+
// link this image sits in — the image's own anchor is already
|
|
156
|
+
// suppressed for that reason, and the caption is no different.
|
|
95
157
|
serialize({
|
|
96
158
|
nodes: caption.editorState.root.children,
|
|
97
159
|
lng,
|
|
98
|
-
options: { renderParagraphInline: true },
|
|
160
|
+
options: { ...options, renderParagraphInline: true },
|
|
99
161
|
})
|
|
100
162
|
) : (
|
|
101
163
|
<span>Caption not found for inline image.</span>
|
|
@@ -105,5 +167,5 @@ export function InlineImageSerializer({ node, serialize, lng, options }: Props):
|
|
|
105
167
|
)
|
|
106
168
|
}
|
|
107
169
|
|
|
108
|
-
return <span className={classes}>{
|
|
170
|
+
return <span className={classes}>{Linked}</span>
|
|
109
171
|
}
|
|
@@ -108,7 +108,7 @@ function isLocalHref(href: string): boolean {
|
|
|
108
108
|
* walked sessions.
|
|
109
109
|
* 4. Neither — strip wrapper.
|
|
110
110
|
*/
|
|
111
|
-
function getHref(args: LinkAttributes): string {
|
|
111
|
+
export function getHref(args: LinkAttributes): string {
|
|
112
112
|
let href = ''
|
|
113
113
|
const publicWebsiteUrl = '/' // getPublicWebsiteUrl()
|
|
114
114
|
|
|
@@ -10,7 +10,7 @@ import { CodeSerializer } from '../../code/code-serializer.tsx'
|
|
|
10
10
|
import { HeadingWithAnchorSerializer } from '../../heading-anchor/index.ts'
|
|
11
11
|
import { InlineImageSerializer } from '../../inline-image/index.tsx'
|
|
12
12
|
import { LayoutContainerSerializer, LayoutItemSerializer } from '../../layout/index.tsx'
|
|
13
|
-
import { LinkLexicalSerializer } from '../../link/link-lexical.tsx'
|
|
13
|
+
import { getHref, LinkLexicalSerializer } from '../../link/link-lexical.tsx'
|
|
14
14
|
import { ListItemSerializer, ListSerializer } from '../../list/index.ts'
|
|
15
15
|
import { TableCellSerializer } from '../../table-cell/index.tsx'
|
|
16
16
|
import { VimeoSerializer } from '../../vimeo/index.tsx'
|
|
@@ -30,6 +30,20 @@ import type { SerializedLexicalNode } from './types.ts'
|
|
|
30
30
|
export interface SerializeOptions {
|
|
31
31
|
renderParagraphInline: boolean
|
|
32
32
|
disableAnimation?: boolean
|
|
33
|
+
/**
|
|
34
|
+
* True while serializing the children of a `link` node.
|
|
35
|
+
*
|
|
36
|
+
* An `<a>` may not contain another `<a>`: the HTML parser un-nests them,
|
|
37
|
+
* which silently changes the document structure and breaks the layout
|
|
38
|
+
* around it. An inline image carries its own optional click target, and
|
|
39
|
+
* an image inside a text link is reachable — a markdown import turns
|
|
40
|
+
* `[](url)` into a `link` node containing an `inline-image`
|
|
41
|
+
* node, and the image dialog can then give that image a link of its own.
|
|
42
|
+
*
|
|
43
|
+
* The outer link wins: it already makes the image clickable, which is
|
|
44
|
+
* what a reader expects from an image inside a link.
|
|
45
|
+
*/
|
|
46
|
+
insideLink?: boolean
|
|
33
47
|
}
|
|
34
48
|
|
|
35
49
|
export interface SerializeProps {
|
|
@@ -148,9 +162,38 @@ export function Serialize({
|
|
|
148
162
|
)
|
|
149
163
|
}
|
|
150
164
|
case 'link': {
|
|
165
|
+
// `LinkLexicalSerializer` renders its children plain when the
|
|
166
|
+
// href is unusable (an unresolved internal target, an empty
|
|
167
|
+
// custom url), so a link node does not always produce an
|
|
168
|
+
// anchor. `insideLink` must track the anchor, not the node —
|
|
169
|
+
// setting it unconditionally would strip a working image link
|
|
170
|
+
// for the benefit of an outer anchor that was never emitted.
|
|
171
|
+
//
|
|
172
|
+
// When an anchor IS emitted, children are re-serialized with
|
|
173
|
+
// the flag rather than reusing `serializedChildren`, so nested
|
|
174
|
+
// anchor-bearing nodes (an inline image with its own link)
|
|
175
|
+
// render without their own `<a>`.
|
|
176
|
+
//
|
|
177
|
+
// A link node reached while already inside an anchor renders its
|
|
178
|
+
// children plain. `<a>` inside `<a>` is un-nested by the parser
|
|
179
|
+
// whatever produced it, and a link node is just as capable of
|
|
180
|
+
// nesting as an inline image — an image caption, for instance,
|
|
181
|
+
// is a nested editor whose links arrive here with the flag set.
|
|
182
|
+
if (options?.insideLink === true) {
|
|
183
|
+
return <Fragment key={index}>{serializedChildren}</Fragment>
|
|
184
|
+
}
|
|
185
|
+
const rendersAnchor = getHref(node.attributes).length > 0
|
|
151
186
|
return (
|
|
152
187
|
<LinkLexicalSerializer key={index} attributes={node.attributes} lng={lng}>
|
|
153
|
-
{
|
|
188
|
+
{node.children != null && rendersAnchor ? (
|
|
189
|
+
<Serialize
|
|
190
|
+
nodes={node.children}
|
|
191
|
+
lng={lng}
|
|
192
|
+
options={{ ...options, insideLink: true }}
|
|
193
|
+
/>
|
|
194
|
+
) : (
|
|
195
|
+
serializedChildren
|
|
196
|
+
)}
|
|
154
197
|
</LinkLexicalSerializer>
|
|
155
198
|
)
|
|
156
199
|
}
|
|
@@ -6,10 +6,7 @@
|
|
|
6
6
|
* Copyright (c) Infonomic Company Limited
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
-
import type {
|
|
10
|
-
SerializedLexicalNode as LexicalSerializedLexicalNode,
|
|
11
|
-
SerializedRootNode as LexicalSerializedRootNode,
|
|
12
|
-
} from '@byline/richtext-lexical'
|
|
9
|
+
import type { SerializedRootNode as LexicalSerializedRootNode } from '@byline/richtext-lexical'
|
|
13
10
|
|
|
14
11
|
/**
|
|
15
12
|
* Root of a Lexical editor state — `editorState.root` from a persisted
|
|
@@ -33,10 +30,22 @@ export interface SerializedLexicalEditorState {
|
|
|
33
30
|
* `checked`, `attributes`, `headerState`, `kind`, etc.) without
|
|
34
31
|
* enumerating every node type.
|
|
35
32
|
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
33
|
+
* Deliberately standalone rather than an intersection with Lexical's
|
|
34
|
+
* `SerializedLexicalNode`. Lexical 0.51 types a nested editor's children —
|
|
35
|
+
* an inline image's caption, say — as `SerializedPartialNode[]`, whose
|
|
36
|
+
* `version` and `$slots` relax because a compact export omits what parsing
|
|
37
|
+
* restores on its own. Intersecting with the strict type reimposes those
|
|
38
|
+
* requirements at every depth (`$slots` recurses), which would reject the
|
|
39
|
+
* partial form over properties this dispatcher never reads and force a cast
|
|
40
|
+
* at every nested-editor call site.
|
|
41
|
+
*
|
|
42
|
+
* The open index signature is what makes both flavours assignable, so
|
|
43
|
+
* strict and partial nodes alike flow through the dispatcher without casts.
|
|
38
44
|
*/
|
|
39
|
-
export type SerializedLexicalNode =
|
|
45
|
+
export type SerializedLexicalNode = {
|
|
46
|
+
type: string
|
|
47
|
+
/** @deprecated Lexical writes it, nothing reads it; a compact export omits it. */
|
|
48
|
+
version?: number
|
|
40
49
|
format?: number | string
|
|
41
50
|
text?: string
|
|
42
51
|
mode?: string
|
|
@@ -12,6 +12,41 @@ interface Props {
|
|
|
12
12
|
constrainedLayout?: boolean
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
+
interface BlockProps<Block> {
|
|
16
|
+
id: string
|
|
17
|
+
block: Block
|
|
18
|
+
lng: Locale
|
|
19
|
+
constrainedLayout?: boolean
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Registry of block renderers, keyed by `_type`.
|
|
24
|
+
*
|
|
25
|
+
* The mapped type is the point: it requires an entry for every member of the
|
|
26
|
+
* `PopulatedContentBlock` union, so adding a block to a collection's `content`
|
|
27
|
+
* field without writing a renderer fails to compile here rather than showing
|
|
28
|
+
* up as a hole in a page. Each entry's `block` prop is narrowed to that
|
|
29
|
+
* `_type`'s own shape, so a renderer cannot be registered under the wrong key.
|
|
30
|
+
*/
|
|
31
|
+
type BlockRegistry = {
|
|
32
|
+
[Key in PopulatedContentBlock['_type']]: React.ComponentType<
|
|
33
|
+
BlockProps<Extract<PopulatedContentBlock, { _type: Key }>>
|
|
34
|
+
>
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
const blockComponents: BlockRegistry = {
|
|
38
|
+
photoBlock: PhotoBlock,
|
|
39
|
+
richTextBlock: RichTextBlock,
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Loose alias for the call site. `BlockRegistry` enforces correctness where
|
|
44
|
+
* the components are registered; TypeScript cannot carry that correlation
|
|
45
|
+
* through the map loop, and a per-block cast there would assert the same
|
|
46
|
+
* thing less visibly.
|
|
47
|
+
*/
|
|
48
|
+
type AnyBlockComponent = React.ComponentType<BlockProps<any>>
|
|
49
|
+
|
|
15
50
|
export function RenderBlocks({
|
|
16
51
|
blocks,
|
|
17
52
|
constrainedLayout = false,
|
|
@@ -22,12 +57,12 @@ export function RenderBlocks({
|
|
|
22
57
|
return (
|
|
23
58
|
<>
|
|
24
59
|
{blocks.map((block) => {
|
|
25
|
-
const
|
|
26
|
-
if (
|
|
60
|
+
const Block = blockComponents[block._type] as AnyBlockComponent | undefined
|
|
61
|
+
if (Block == null) return reportUnsupportedBlock(block)
|
|
27
62
|
|
|
28
63
|
return (
|
|
29
64
|
<Section className={toKebabCase(block._type)} key={block._id}>
|
|
30
|
-
{
|
|
65
|
+
<Block id={block._id} block={block} lng={lng} constrainedLayout={constrainedLayout} />
|
|
31
66
|
</Section>
|
|
32
67
|
)
|
|
33
68
|
})}
|
|
@@ -35,31 +70,13 @@ export function RenderBlocks({
|
|
|
35
70
|
)
|
|
36
71
|
}
|
|
37
72
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return (
|
|
46
|
-
<PhotoBlock id={block._id} block={block} lng={lng} constrainedLayout={constrainedLayout} />
|
|
47
|
-
)
|
|
48
|
-
case 'richTextBlock':
|
|
49
|
-
return (
|
|
50
|
-
<RichTextBlock
|
|
51
|
-
id={block._id}
|
|
52
|
-
block={block}
|
|
53
|
-
lng={lng}
|
|
54
|
-
constrainedLayout={constrainedLayout}
|
|
55
|
-
/>
|
|
56
|
-
)
|
|
57
|
-
default:
|
|
58
|
-
return reportUnsupportedBlock(block)
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
function reportUnsupportedBlock(block: never): null {
|
|
73
|
+
/**
|
|
74
|
+
* Compile-time exhaustiveness does not cover runtime data: a document written
|
|
75
|
+
* before a block was removed, or by a newer deployment, can still carry a
|
|
76
|
+
* `_type` this build has no renderer for. Report it and skip, rather than
|
|
77
|
+
* failing the whole page.
|
|
78
|
+
*/
|
|
79
|
+
function reportUnsupportedBlock(block: PopulatedContentBlock): null {
|
|
63
80
|
const type = (block as { _type?: unknown })._type
|
|
64
81
|
console.error(`Unsupported content block type: "${String(type)}"`)
|
|
65
82
|
return null
|
|
@@ -5,21 +5,31 @@ import type { DocsFields, MediaFields, PagesFields } from '@byline/generated-typ
|
|
|
5
5
|
type ContentBlockOf<Fields extends { content?: unknown }> =
|
|
6
6
|
NonNullable<Fields['content']> extends Array<infer Block> ? Block : never
|
|
7
7
|
type ContentBlock = ContentBlockOf<DocsFields> | ContentBlockOf<PagesFields>
|
|
8
|
+
|
|
8
9
|
type PhotoBlockData = Extract<ContentBlock, { _type: 'photoBlock' }>
|
|
9
|
-
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Overlay every relation a content block can hold. A block's relation is only
|
|
13
|
+
* resolved when the read's populate map names it, so this mirrors the populate
|
|
14
|
+
* maps in the detail loaders: keep the two in step or a block renders with an
|
|
15
|
+
* unresolved envelope.
|
|
16
|
+
*
|
|
17
|
+
* Add an arm per relational block. A block with several relations nests
|
|
18
|
+
* `WithPopulated` once per field.
|
|
19
|
+
*/
|
|
20
|
+
type PopulateBlockRelations<Block> = Block extends PhotoBlockData
|
|
10
21
|
? WithPopulated<Block, 'photo', MediaFields>
|
|
11
22
|
: Block
|
|
12
|
-
type PopulatePhotoBlockContent<Content> =
|
|
13
|
-
Content extends Array<infer Block> ? Array<PopulatePhotoBlock<Block>> : Content
|
|
14
23
|
|
|
15
|
-
|
|
24
|
+
type PopulateBlockContent<Content> =
|
|
25
|
+
Content extends Array<infer Block> ? Array<PopulateBlockRelations<Block>> : Content
|
|
26
|
+
|
|
27
|
+
/** Block shape returned by reads that populate photo relations inside content. */
|
|
16
28
|
export type PopulatedPhotoBlockData = WithPopulated<PhotoBlockData, 'photo', MediaFields>
|
|
17
29
|
|
|
18
|
-
export type PopulatedContentBlock =
|
|
30
|
+
export type PopulatedContentBlock = PopulateBlockRelations<ContentBlock>
|
|
19
31
|
|
|
20
|
-
/** Overlay populated
|
|
21
|
-
export type
|
|
22
|
-
[Key in keyof Fields]: Key extends 'content'
|
|
23
|
-
? PopulatePhotoBlockContent<Fields[Key]>
|
|
24
|
-
: Fields[Key]
|
|
32
|
+
/** Overlay the populated content-block union while preserving field optionality. */
|
|
33
|
+
export type WithPopulatedBlockContent<Fields> = {
|
|
34
|
+
[Key in keyof Fields]: Key extends 'content' ? PopulateBlockContent<Fields[Key]> : Fields[Key]
|
|
25
35
|
}
|
|
@@ -34,24 +34,32 @@ describe('public block renderer templates', () => {
|
|
|
34
34
|
...contentBlockNames('PagesFields'),
|
|
35
35
|
]);
|
|
36
36
|
const expectedTypes = [...blockNames].map(blockDiscriminant).sort();
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
.
|
|
44
|
-
|
|
37
|
+
// The renderer is a `_type`-keyed registry. `BlockRegistry` makes a
|
|
38
|
+
// missing entry a compile error in a scaffolded app, but nothing
|
|
39
|
+
// typechecks the templates here (see templates-editor-api-drift), so the
|
|
40
|
+
// registry's keys are compared against the generated discriminants
|
|
41
|
+
// directly.
|
|
42
|
+
const registry = renderer
|
|
43
|
+
.getVariableDeclarationOrThrow('blockComponents')
|
|
44
|
+
.getInitializerIfKindOrThrow(SyntaxKind.ObjectLiteralExpression);
|
|
45
|
+
const renderedTypes = registry
|
|
46
|
+
.getProperties()
|
|
47
|
+
.flatMap((property) => {
|
|
48
|
+
if (!property.isKind(SyntaxKind.PropertyAssignment))
|
|
45
49
|
return [];
|
|
46
|
-
const
|
|
47
|
-
|
|
50
|
+
const name = property.getNameNode();
|
|
51
|
+
if (name.isKind(SyntaxKind.StringLiteral))
|
|
52
|
+
return [name.getLiteralValue()];
|
|
53
|
+
if (name.isKind(SyntaxKind.Identifier))
|
|
54
|
+
return [name.getText()];
|
|
55
|
+
return [];
|
|
48
56
|
})
|
|
49
57
|
.sort();
|
|
50
58
|
expect(renderedTypes).toEqual(expectedTypes);
|
|
51
59
|
});
|
|
52
60
|
it('combines both consumers and preserves consumer-specific content in the overlay', () => {
|
|
53
61
|
expect(contentTypes.getTypeAliasOrThrow('ContentBlock').getTypeNodeOrThrow().getText()).toBe('ContentBlockOf<DocsFields> | ContentBlockOf<PagesFields>');
|
|
54
|
-
expect(contentTypes.getTypeAlias('
|
|
62
|
+
expect(contentTypes.getTypeAlias('WithPopulatedBlockContent')).toBeDefined();
|
|
55
63
|
});
|
|
56
64
|
it('typechecks the populated union and consumer-specific overlay contract', () => {
|
|
57
65
|
const typeProject = new Project({
|
|
@@ -83,7 +91,7 @@ describe('public block renderer templates', () => {
|
|
|
83
91
|
import type { DocsFields, MediaFields, PagesFields } from './generated.js'
|
|
84
92
|
import type {
|
|
85
93
|
PopulatedContentBlock,
|
|
86
|
-
|
|
94
|
+
WithPopulatedBlockContent,
|
|
87
95
|
} from './content.js'
|
|
88
96
|
|
|
89
97
|
type Equal<Left, Right> =
|
|
@@ -102,7 +110,7 @@ describe('public block renderer templates', () => {
|
|
|
102
110
|
content?: Array<NonNullable<PagesFields['content']>[number] | PagesOnlyBlock>
|
|
103
111
|
}
|
|
104
112
|
type PopulatedExtendedBlock = NonNullable<
|
|
105
|
-
|
|
113
|
+
WithPopulatedBlockContent<ExtendedPages>['content']
|
|
106
114
|
>[number]
|
|
107
115
|
|
|
108
116
|
type PopulatedUnionContract = Assert<Equal<PopulatedContentBlock, ExpectedBlock>>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-template-contract.test.js","sourceRoot":"","sources":["../src/ui-template-contract.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAC9F,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;AAC/E,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,2BAA2B,EAAE,IAAI,EAAE,CAAC,CAAA;AAClE,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAC3C,OAAO,CAAC,SAAS,EAAE,+CAA+C,CAAC,CACpE,CAAA;AACD,oEAAoE;AACpE,gEAAgE;AAChE,SAAS,yBAAyB,CAAC,IAAY;IAC7C,MAAM,KAAK,GAAG,SAAS;SACpB,oBAAoB,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACrD,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,CAAA;IACxD,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,IAAI,CAAC,CAAA;IAC3E,OAAO,KAAK,CAAA;AACd,CAAC;AACD,wEAAwE;AACxE,wEAAwE;AACxE,SAAS,mBAAmB;IAC1B,MAAM,KAAK,GAAG,SAAS;SACpB,WAAW,EAAE;SACb,KAAK,CAAC,gFAAgF,CAAC,CAAA;IAC1F,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;IAC1F,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;AACxC,CAAC;AACD,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC,CAAA;AAClG,MAAM,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC,CAAA;AAE/F,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;YACzB,GAAG,iBAAiB,CAAC,YAAY,CAAC;YAClC,GAAG,iBAAiB,CAAC,aAAa,CAAC;SACpC,CAAC,CAAA;QACF,MAAM,aAAa,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAA;QACnE,
|
|
1
|
+
{"version":3,"file":"ui-template-contract.test.js","sourceRoot":"","sources":["../src/ui-template-contract.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@byline/cli",
|
|
3
3
|
"private": false,
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
|
-
"version": "6.
|
|
5
|
+
"version": "6.6.0",
|
|
6
6
|
"engines": {
|
|
7
7
|
"node": ">=20.9.0"
|
|
8
8
|
},
|
|
@@ -48,12 +48,12 @@
|
|
|
48
48
|
"yaml": "^2.9.1"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@biomejs/biome": "2.5.
|
|
51
|
+
"@biomejs/biome": "2.5.14",
|
|
52
52
|
"@types/mdast": "^4.0.4",
|
|
53
|
-
"@types/node": "^26.6.
|
|
53
|
+
"@types/node": "^26.6.2",
|
|
54
54
|
"@types/pg": "^8.23.1",
|
|
55
55
|
"@types/semver": "^7.8.0",
|
|
56
|
-
"dotenv": "^
|
|
56
|
+
"dotenv": "^18.0.1",
|
|
57
57
|
"mdast-util-to-string": "^4.0.0",
|
|
58
58
|
"remark-gfm": "^4.0.1",
|
|
59
59
|
"remark-parse": "^11.0.0",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"typescript": "^7.0.2",
|
|
62
62
|
"unified": "^11.0.5",
|
|
63
63
|
"vitest": "^5.0.1",
|
|
64
|
-
"@byline/core": "6.
|
|
64
|
+
"@byline/core": "6.6.0"
|
|
65
65
|
},
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public",
|