alinea 0.11.2 → 1.0.0-preview.1

package/dist/adapter/core/cms.js

@@ -13,7 +13,7 @@ function createCMS(config) {
   const devUrl = process.env.ALINEA_DEV_SERVER;
   const cms = new VanillaCMS(
     config,
-    async () => new Client({ url: devUrl ?? "/api/cms" })
+    async () => new Client({ config: cms.config, url: devUrl ?? "/api/cms" })
   );
   return cms;
 }

package/dist/adapter/core/previewContext.d.ts

@@ -1,5 +1,5 @@
 import { ConnectionContext } from 'alinea/core/CMS';
 import type { AsyncLocalStorage } from 'node:async_hooks';
 import { VanillaCMS } from './cms.js';
-export declare const previewStore: WeakMap<VanillaCMS<import("alinea/alinea").Config>, AsyncLocalStorage<ConnectionContext>>;
+export declare const previewStore: WeakMap<VanillaCMS<import("alinea/core/Config").Config>, AsyncLocalStorage<ConnectionContext>>;
 export declare function previewContext(cms: VanillaCMS): ConnectionContext;

package/dist/adapter/next/cms.js

@@ -30,6 +30,7 @@ var NextCMS = class extends CMS {
     super(config, async () => {
       const context = await requestContext(config);
       const client = new Client({
+        config: this.config,
         url: context.handlerUrl.href,
         applyAuth(init2) {
           const headers = new Headers(init2?.headers);
@@ -42,17 +43,19 @@ var NextCMS = class extends CMS {
         async resolve(params) {
           const isDev = Boolean(devUrl());
           let preview;
-          const { cookies, draftMode } = await import("next/headers.js");
-          const [isDraft] = outcome(() => draftMode().isEnabled);
+          const { cookies, draftMode } = await import("next/headers");
+          const [isDraft] = await outcome(
+            async () => (await draftMode()).isEnabled
+          );
           if (isDraft) {
-            const cookie = cookies();
+            const cookie = await cookies();
             const payload = getPreviewPayloadFromCookies(cookie.getAll());
             if (payload)
               preview = { payload };
           }
           if (process.env.NEXT_RUNTIME === "edge" || isDev)
             return clientResolve({ preview, ...params });
-          const { PHASE_PRODUCTION_BUILD } = await import("next/constants.js");
+          const { PHASE_PRODUCTION_BUILD } = await import("next/constants");
           const isBuild = process.env.NEXT_PHASE === PHASE_PRODUCTION_BUILD;
           const { db, previews } = await init;
           const sync = () => db.syncWith(client);
@@ -79,13 +82,14 @@ var NextCMS = class extends CMS {
     this.baseUrl = baseUrl;
   }
   async user() {
-    const { cookies } = await import("next/headers.js");
+    const { cookies } = await import("next/headers");
     const context = await requestContext(this.config);
+    const cookie = await cookies();
     const client = new Client({
+      config: this.config,
       url: context.handlerUrl.href,
       applyAuth: (init) => {
         const headers = new Headers(init?.headers);
-        const cookie = cookies();
         const alinea = cookie.getAll().filter(({ name }) => name.startsWith("alinea"));
         for (const { name, value } of alinea)
           headers.append("cookie", `${name}=${value}`);
@@ -95,9 +99,9 @@ var NextCMS = class extends CMS {
     return client.user();
   }
   previews = async ({ widget, workspace, root }) => {
-    const { draftMode } = await import("next/headers.js");
-    const { default: dynamic } = await import("next/dynamic.js");
-    const [isDraft] = outcome(() => draftMode().isEnabled);
+    const { draftMode } = await import("next/headers");
+    const { default: dynamic } = await import("next/dynamic");
+    const [isDraft] = await outcome(async () => (await draftMode()).isEnabled);
     if (!isDraft)
       return null;
     const context = await requestContext(this.config);

package/dist/adapter/next/context.js

@@ -26,13 +26,15 @@ async function requestOrigin() {
   const protocol = proto.endsWith(":") ? proto : proto + ":";
   return `${protocol}//${host}`;
 }
-async function requestHeaders() {
-  try {
-    const { getExpectedRequestStore } = await import("next/dist/client/components/request-async-storage.external.js");
-    return getExpectedRequestStore("headers").headers;
-  } catch {
-    return new Headers();
-  }
+function requestHeaders() {
+  return import(
+    // @ts-ignore
+    "next/dist/client/components/request-async-storage.external.js"
+  ).catch(
+    () => import("next/dist/server/app-render/work-unit-async-storage.external.js")
+  ).then(
+    ({ getExpectedRequestStore }) => getExpectedRequestStore("headers").headers
+  ).catch(() => new Headers());
 }
 export {
   devUrl,

package/dist/adapter/next/handler.js

@@ -8,7 +8,6 @@ import { createHandler as createCoreHandler } from "alinea/backend/Handler";
 import { JWTPreviews } from "alinea/backend/util/JWTPreviews";
 import { cloudBackend } from "alinea/cloud/CloudBackend";
 import { Entry } from "alinea/core/Entry";
-import { createSelection } from "alinea/core/pages/CreateSelection";
 import { getPreviewPayloadFromCookies } from "alinea/preview/PreviewCookies";
 import { devUrl, requestContext } from "./context.js";
 var handlers = /* @__PURE__ */ new WeakMap();
@@ -30,13 +29,13 @@ function createHandler(cms, backend = cloudBackend(cms.config)) {
         if (!previewToken2)
           return new Response("Not found", { status: 404 });
         const info = await previews.verify(previewToken2);
-        const cookie = cookies();
+        const cookie = await cookies();
         const connection = devUrl() ? await cms.connect() : handleBackend.connect(context);
         const payload = getPreviewPayloadFromCookies(cookie.getAll());
         const url = await connection.resolve({
-          selection: createSelection(
-            Entry({ entryId: info.entryId }).select(Entry.url).first()
-          ),
+          first: true,
+          select: Entry.url,
+          id: info.entryId,
           preview: payload ? { payload } : void 0
         });
         if (!url)
@@ -45,7 +44,8 @@ function createHandler(cms, backend = cloudBackend(cms.config)) {
         if (source.hostname === "0.0.0.0")
           source.hostname = "localhost";
         const location = new URL(url, source.origin);
-        draftMode().enable();
+        const dm = await draftMode();
+        dm.enable();
         return new Response(`Redirecting...`, {
           status: 302,
           headers: { location: String(location) }

package/dist/adapter/next/with-alinea.js

@@ -0,0 +1,38 @@
+import "../../chunks/chunk-U5RRZUYZ.js";
+
+// src/adapter/next/with-alinea.ts
+import pkg from "next/package.json";
+function withAlinea(config) {
+  const majorVersion = Number(pkg.version.split(".")[0]);
+  if (majorVersion < 15)
+    return {
+      ...config,
+      experimental: {
+        ...config.experimental,
+        serverComponentsExternalPackages: [
+          ...config.experimental?.serverComponentsExternalPackages ?? [],
+          "@alinea/generated"
+        ]
+      }
+    };
+  return {
+    ...config,
+    experimental: {
+      ...config.experimental,
+      turbo: {
+        ...config.experimental?.turbo,
+        resolveAlias: {
+          ...config.experimental?.turbo?.resolveAlias,
+          "next/dist/client/components/request-async-storage.external.js": "next/dist/server/app-render/work-unit-async-storage.external.js"
+        }
+      }
+    },
+    serverExternalPackages: [
+      ...config.serverExternalPackages ?? [],
+      "@alinea/generated"
+    ]
+  };
+}
+export {
+  withAlinea
+};

package/dist/backend/Database.d.ts

@@ -2,7 +2,7 @@ import { Config } from 'alinea/core/Config';
 import { SyncResponse, Syncable } from 'alinea/core/Connection';
 import { EntryRecord } from 'alinea/core/EntryRecord';
 import { Mutation } from 'alinea/core/Mutation';
-import { PageSeed } from 'alinea/core/Page';
+import { Page } from 'alinea/core/Page';
 import { Resolver } from 'alinea/core/Resolver';
 import { Sql } from 'rado';
 import { EntryRow } from '../core/EntryRow.js';
@@ -14,7 +14,7 @@ interface Seed {
     workspace: string;
     root: string;
     filePath: string;
-    page: PageSeed;
+    page: Page;
 }
 export declare class Database implements Syncable {
     config: Config;
@@ -35,6 +35,9 @@ export declare class Database implements Syncable {
     meta(): Promise<{
         commitHash: string;
         contentHash: string;
+    } | {
+        commitHash: string;
+        contentHash: string;
         modifiedAt: number;
     }>;
     static index(tx: Store): Promise<void[]>;