@anthusai/papyrus 1.0.0-next.16 → 1.0.0-next.17
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.
|
@@ -262,7 +262,10 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
262
262
|
const readerDomain = new amplify.CfnDomain(this, "ReaderDomain", {
|
|
263
263
|
appId: readerApp.attrAppId,
|
|
264
264
|
domainName: reader.domainName,
|
|
265
|
-
subDomainSettings: [
|
|
265
|
+
subDomainSettings: [
|
|
266
|
+
{ branchName: readerBranchName, prefix: "" },
|
|
267
|
+
...(reader.includeWww ? [{ branchName: readerBranchName, prefix: "www" }] : []),
|
|
268
|
+
],
|
|
266
269
|
});
|
|
267
270
|
readerDomain.addResourceDependency(readerBranch);
|
|
268
271
|
}
|
|
@@ -312,7 +312,10 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
312
312
|
const readerDomain = new amplify.CfnDomain(this, "ReaderDomain", {
|
|
313
313
|
appId: readerApp.attrAppId,
|
|
314
314
|
domainName: reader.domainName,
|
|
315
|
-
subDomainSettings: [
|
|
315
|
+
subDomainSettings: [
|
|
316
|
+
{ branchName: readerBranchName, prefix: "" },
|
|
317
|
+
...(reader.includeWww ? [{ branchName: readerBranchName, prefix: "www" }] : []),
|
|
318
|
+
],
|
|
316
319
|
});
|
|
317
320
|
readerDomain.addResourceDependency(readerBranch);
|
|
318
321
|
}
|
package/infra/site-config.js
CHANGED
|
@@ -121,10 +121,17 @@ export function parseSiteConfig(raw) {
|
|
|
121
121
|
if (frontend !== "markus-static")
|
|
122
122
|
fail("reader", `is only allowed when frontend is "markus-static"`);
|
|
123
123
|
const readerRecord = requireObject(record.reader, "reader");
|
|
124
|
-
rejectUnknownKeys(readerRecord, ["appName", "domainName", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
|
|
124
|
+
rejectUnknownKeys(readerRecord, ["appName", "domainName", "includeWww", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
|
|
125
|
+
if (readerRecord.includeWww !== undefined && typeof readerRecord.includeWww !== "boolean") {
|
|
126
|
+
fail("reader.includeWww", `must be a boolean, got ${JSON.stringify(readerRecord.includeWww)}`);
|
|
127
|
+
}
|
|
128
|
+
if (readerRecord.includeWww !== undefined && readerRecord.domainName === undefined) {
|
|
129
|
+
fail("reader.includeWww", "requires reader.domainName");
|
|
130
|
+
}
|
|
125
131
|
reader = {
|
|
126
132
|
appName: optionalString(readerRecord.appName, "reader.appName", APP_NAME_PATTERN),
|
|
127
133
|
domainName: optionalString(readerRecord.domainName, "reader.domainName", HOST_NAME_PATTERN, "host name"),
|
|
134
|
+
includeWww: readerRecord.includeWww,
|
|
128
135
|
branchName: optionalString(readerRecord.branchName, "reader.branchName", BRANCH_NAME_PATTERN),
|
|
129
136
|
buildCommand: requireString(readerRecord.buildCommand, "reader.buildCommand"),
|
|
130
137
|
baseDirectory: requireString(readerRecord.baseDirectory, "reader.baseDirectory"),
|
package/infra/site-config.ts
CHANGED
|
@@ -17,6 +17,7 @@ export type AmplifyAppShellSiteConfig = {
|
|
|
17
17
|
reader?: {
|
|
18
18
|
appName?: string;
|
|
19
19
|
domainName?: string;
|
|
20
|
+
includeWww?: boolean;
|
|
20
21
|
branchName?: string;
|
|
21
22
|
buildCommand: string;
|
|
22
23
|
baseDirectory: string;
|
|
@@ -175,10 +176,17 @@ export function parseSiteConfig(raw: unknown): AmplifyAppShellSiteConfig {
|
|
|
175
176
|
if (record.reader !== undefined) {
|
|
176
177
|
if (frontend !== "markus-static") fail("reader", `is only allowed when frontend is "markus-static"`);
|
|
177
178
|
const readerRecord = requireObject(record.reader, "reader");
|
|
178
|
-
rejectUnknownKeys(readerRecord, ["appName", "domainName", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
|
|
179
|
+
rejectUnknownKeys(readerRecord, ["appName", "domainName", "includeWww", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
|
|
180
|
+
if (readerRecord.includeWww !== undefined && typeof readerRecord.includeWww !== "boolean") {
|
|
181
|
+
fail("reader.includeWww", `must be a boolean, got ${JSON.stringify(readerRecord.includeWww)}`);
|
|
182
|
+
}
|
|
183
|
+
if (readerRecord.includeWww !== undefined && readerRecord.domainName === undefined) {
|
|
184
|
+
fail("reader.includeWww", "requires reader.domainName");
|
|
185
|
+
}
|
|
179
186
|
reader = {
|
|
180
187
|
appName: optionalString(readerRecord.appName, "reader.appName", APP_NAME_PATTERN),
|
|
181
188
|
domainName: optionalString(readerRecord.domainName, "reader.domainName", HOST_NAME_PATTERN, "host name"),
|
|
189
|
+
includeWww: readerRecord.includeWww as boolean | undefined,
|
|
182
190
|
branchName: optionalString(readerRecord.branchName, "reader.branchName", BRANCH_NAME_PATTERN),
|
|
183
191
|
buildCommand: requireString(readerRecord.buildCommand, "reader.buildCommand"),
|
|
184
192
|
baseDirectory: requireString(readerRecord.baseDirectory, "reader.baseDirectory"),
|
package/package.json
CHANGED
package/routes.manifest.json
CHANGED