@anthusai/papyrus 1.0.0-next.26 → 1.0.0-next.28

package/app/newsroom/layout.tsx

@@ -1,12 +1,5 @@
-import { NewsDeskClientProvider } from "../../components/news-desk-client-provider";
-import { resolveDevSandboxEditorAuth } from "../../lib/dev-sandbox-editor-auth";
+import { NewsroomClientShell } from "../../components/newsroom-client-shell";
 
 export default function NewsroomLayout({ children }: Readonly<{ children: React.ReactNode }>) {
-  const devSandboxEditorAuth = resolveDevSandboxEditorAuth();
-
-  return (
-    <NewsDeskClientProvider devSandboxEditorAuth={devSandboxEditorAuth}>
-      {children}
-    </NewsDeskClientProvider>
-  );
+  return <NewsroomClientShell>{children}</NewsroomClientShell>;
 }

package/app/page.tsx

@@ -18,6 +18,7 @@ import { SITE_BRAND, rootRoute } from "../lib/site-brand";
 import { notFound, redirect } from "next/navigation";
 import { getReaderBasePath } from "../lib/reader-base-path";
 import { buildRootRedirectTarget } from "../lib/root-route-redirect";
+import { NewsroomClientShell } from "../components/newsroom-client-shell";
 import NewsDeskRootPage, { type NewsDeskRootSearchParams } from "./newsroom/page";
 
 export const dynamic = "force-dynamic";
@@ -42,7 +43,11 @@ export default async function Home({ searchParams }: HomePageProps) {
   const publicationOwnsRoot = getReaderBasePath() !== "";
 
   if (!publicationOwnsRoot && rootRoute.kind === "newsroom" && !scenarioId) {
-    return <NewsDeskRootPage searchParams={searchParams} />;
+    return (
+      <NewsroomClientShell>
+        <NewsDeskRootPage searchParams={searchParams} />
+      </NewsroomClientShell>
+    );
   }
 
   if (!publicationOwnsRoot && rootRoute.kind === "redirect") {

package/components/newsroom-client-shell.tsx

@@ -0,0 +1,12 @@
+import { NewsDeskClientProvider } from "./news-desk-client-provider";
+import { resolveDevSandboxEditorAuth } from "../lib/dev-sandbox-editor-auth";
+
+export function NewsroomClientShell({ children }: Readonly<{ children: React.ReactNode }>) {
+  const devSandboxEditorAuth = resolveDevSandboxEditorAuth();
+
+  return (
+    <NewsDeskClientProvider devSandboxEditorAuth={devSandboxEditorAuth}>
+      {children}
+    </NewsDeskClientProvider>
+  );
+}

package/infra/build-specs.js

@@ -15,7 +15,6 @@ function commandLines(commands, indent) {
 const NPM_CLEAN_INSTALL = "npm ci --cache .npm --prefer-offline";
 const FRONTEND_ENVIRONMENT_CAPTURE = "env | grep -e '^PAPYRUS_' -e '^SITE_ENV=' -e '^NEXT_PUBLIC_' >> .env.production";
 const CHECKOUT_AS_PAPYRUS_ROOT = "PAPYRUS_ROOT=\"$PWD\"";
-const RUNTIME_OUTPUTS_ENVIRONMENT = "echo PAPYRUS_AMPLIFY_OUTPUTS=.next/amplify_outputs.json >> .env.production";
 const RUNTIME_OUTPUTS_COPY = "cp amplify_outputs.json .next/amplify_outputs.json";
 function pythonProvisioningCommands(config) {
     return [
@@ -55,7 +54,6 @@ export function cmsProductionBuildSpec(config) {
         ], "        "),
         ...frontendSection([], [
             FRONTEND_ENVIRONMENT_CAPTURE,
-            ...(config.frontend === "pretext" ? [RUNTIME_OUTPUTS_ENVIRONMENT] : []),
             "npx papyrus-app sync && npm run build",
             ...(config.frontend === "pretext" ? [RUNTIME_OUTPUTS_COPY] : []),
         ], ".next", [".next/cache/**/*", ".npm/**/*"]),
@@ -73,7 +71,6 @@ export function cmsStagingBuildSpec(config) {
         "version: 1",
         ...frontendSection(preBuild, [
             FRONTEND_ENVIRONMENT_CAPTURE,
-            RUNTIME_OUTPUTS_ENVIRONMENT,
             "npx papyrus-app sync && npm run build",
             RUNTIME_OUTPUTS_COPY,
         ], ".next", cachePaths),

package/infra/build-specs.ts

@@ -24,9 +24,6 @@ const FRONTEND_ENVIRONMENT_CAPTURE =
 
 const CHECKOUT_AS_PAPYRUS_ROOT = "PAPYRUS_ROOT=\"$PWD\"";
 
-const RUNTIME_OUTPUTS_ENVIRONMENT =
-  "echo PAPYRUS_AMPLIFY_OUTPUTS=.next/amplify_outputs.json >> .env.production";
-
 const RUNTIME_OUTPUTS_COPY = "cp amplify_outputs.json .next/amplify_outputs.json";
 
 function pythonProvisioningCommands(config: AmplifyAppShellSiteConfig): string[] {
@@ -85,7 +82,6 @@ export function cmsProductionBuildSpec(config: AmplifyAppShellSiteConfig): strin
       [],
       [
         FRONTEND_ENVIRONMENT_CAPTURE,
-        ...(config.frontend === "pretext" ? [RUNTIME_OUTPUTS_ENVIRONMENT] : []),
         "npx papyrus-app sync && npm run build",
         ...(config.frontend === "pretext" ? [RUNTIME_OUTPUTS_COPY] : []),
       ],
@@ -114,7 +110,6 @@ export function cmsStagingBuildSpec(config: AmplifyAppShellSiteConfig): string {
       preBuild,
       [
         FRONTEND_ENVIRONMENT_CAPTURE,
-        RUNTIME_OUTPUTS_ENVIRONMENT,
         "npx papyrus-app sync && npm run build",
         RUNTIME_OUTPUTS_COPY,
       ],

package/lib/amplify-outputs-path.ts

@@ -6,7 +6,11 @@ export function getAmplifyOutputsPath(): string {
   if (explicit) {
     return path.isAbsolute(explicit) ? explicit : path.join(process.cwd(), explicit);
   }
-  return path.join(process.cwd(), "amplify_outputs.json");
+  const checkoutRootPath = path.join(process.cwd(), "amplify_outputs.json");
+  if (fs.existsSync(checkoutRootPath)) return checkoutRootPath;
+  const shippedBundlePath = path.join(process.cwd(), ".next", "amplify_outputs.json");
+  if (fs.existsSync(shippedBundlePath)) return shippedBundlePath;
+  return checkoutRootPath;
 }
 
 export function readAmplifyOutputsFile(): Record<string, unknown> | null {

package/package.json

@@ -86,6 +86,7 @@
     "./components/newsroom-article-editor": "./components/newsroom-article-editor.tsx",
     "./components/newsroom-articles-view": "./components/newsroom-articles-view.tsx",
     "./components/newsroom-assignments-view": "./components/newsroom-assignments-view.tsx",
+    "./components/newsroom-client-shell": "./components/newsroom-client-shell.tsx",
     "./components/newsroom-ops-overview": "./components/newsroom-ops-overview.tsx",
     "./components/newsroom-ops-shell": "./components/newsroom-ops-shell.tsx",
     "./components/newsroom-references-view": "./components/newsroom-references-view.tsx",
@@ -293,7 +294,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.26",
+  "version": "1.0.0-next.28",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-sdk/client-cognito-identity-provider": "3.1045.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.26",
+  "version": "1.0.0-next.28",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",