alinea 1.7.0-preview.2 → 1.7.0-preview.4

package/dist/.init/content/pages/welcome.json

@@ -1,5 +1,5 @@
 {
-  "_id": "3A4KJkE8OM5K7E7Tp2eGGtTES6p",
+  "_id": "3A4eJ7Xd3lj9cOpXtEm4MKhUCdE",
   "_type": "Page",
   "_index": "a0",
   "_seeded": "welcome.json",

package/dist/LICENSES.md

@@ -28,11 +28,11 @@ SOFTWARE.
 
 ===
 
-# lib0@0.2.88 (MIT)
+# @headlessui/react@2.2.0 (MIT)
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2019 Kevin Jahns <kevin.jahns@protonmail.com>.
+Copyright (c) 2020 Tailwind Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,37 +52,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-
-===
-
-# htmlparser2@9.1.0 (MIT)
-
-Copyright 2010, 2011, Chris Winberry <chris@winberry.net>. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
 ===
 
-# @headlessui/react@2.2.0 (MIT)
+# react-query@3.39.3 (MIT)
 
 MIT License
 
-Copyright (c) 2020 Tailwind Labs
+Copyright (c) 2019 Tanner Linsley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -102,13 +78,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+
 ===
 
-# react-query@3.39.3 (MIT)
+# lib0@0.2.88 (MIT)
 
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2019 Tanner Linsley
+Copyright (c) 2019 Kevin Jahns <kevin.jahns@protonmail.com>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -129,6 +106,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+===
+
+# htmlparser2@9.1.0 (MIT)
+
+Copyright 2010, 2011, Chris Winberry <chris@winberry.net>. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
 ===
 
 # domhandler@5.0.3 (BSD-2-Clause)
@@ -148,7 +148,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# entities@4.5.0 (BSD-2-Clause)
+# domutils@3.1.0 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -165,7 +165,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# domutils@3.1.0 (BSD-2-Clause)
+# entities@4.5.0 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -233,33 +233,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-===
-
-# prop-types@15.8.1 (MIT)
-
-MIT License
-
-Copyright (c) 2013-present, Facebook, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ===
 
 # @juggle/resize-observer@3.4.0 (Apache-2.0)
@@ -469,11 +442,11 @@ SOFTWARE.
 
 ===
 
-# react-is@16.13.1 (MIT)
+# prop-types@15.8.1 (MIT)
 
 MIT License
 
-Copyright (c) Facebook, Inc. and its affiliates.
+Copyright (c) 2013-present, Facebook, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -513,15 +486,30 @@ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ===
 
-# @headless-tree/react@0.0.15 (MIT)
+# react-is@16.13.1 (MIT)
 
-MIT
+MIT License
 
-===
+Copyright (c) Facebook, Inc. and its affiliates.
 
-# @headless-tree/core@0.0.15 (MIT)
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
-MIT
 
 ===
 
@@ -550,6 +538,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+===
+
+# @headless-tree/core@0.0.15 (MIT)
+
+MIT
+
+===
+
+# @headless-tree/react@0.0.15 (MIT)
+
+MIT
+
 ===
 
 # @babel/runtime@7.25.4 (MIT)

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

@@ -95,8 +95,8 @@ function createRewrites(config, adminPath) {
     const nextHost = process.env.__NEXT_PRIVATE_HOST;
     const origin = nextOrigin ?? (nextHost ? `http://${nextHost}` : null);
     const location = origin ? new URL(adminPath, origin).href : adminPath;
-    if (isDev && !process.env._ALINEA_REPORTED) {
-      process.env._ALINEA_REPORTED = "true";
+    if (isDev && !process.env.__NEXT_PRIVATE_ALINEA_REPORTED) {
+      process.env.__NEXT_PRIVATE_ALINEA_REPORTED = "true";
       console.log(`
 ${cyan(bold("\u0251 Alinea CMS"))}:    ${location}
 `);

package/dist/backend/resolver/ParsePreview.d.ts

@@ -1,5 +1,5 @@
-import type { PreviewRequest } from 'alinea/core/Preview';
 import type { LocalDB } from 'alinea/core/db/LocalDB';
+import type { PreviewRequest } from 'alinea/core/Preview';
 export declare function createPreviewParser(local: LocalDB): {
     parse(preview: PreviewRequest, sync: () => Promise<unknown>): Promise<PreviewRequest | undefined>;
 };

package/dist/backend/resolver/ParsePreview.js

@@ -25,9 +25,17 @@ function createPreviewParser(local) {
       });
       if (!entry) return;
       const baseText = decoder.decode(
-        JsonLoader.format(local.config.schema, createRecord(entry, entry.status))
+        JsonLoader.format(
+          local.config.schema,
+          createRecord(entry, entry.status)
+        )
       );
-      const updatedText = await applyFilePatch(baseText, payload.patch);
+      let updatedText;
+      try {
+        updatedText = await applyFilePatch(baseText, payload.patch);
+      } catch {
+        return;
+      }
       const { data } = parseRecord(JSON.parse(updatedText));
       const { rowHash: _rowHash, fileHash: _fileHash, ...withoutHashes } = entry;
       const patched = await createEntryRow(

package/dist/bundled.d.ts

@@ -377,8 +377,8 @@ declare module 'alinea/backend/Previews' {
 
 declare module 'alinea/backend/resolver/ParsePreview' {
 
-  import type { PreviewRequest } from 'alinea/core/Preview';
   import type { LocalDB } from 'alinea/core/db/LocalDB';
+  import type { PreviewRequest } from 'alinea/core/Preview';
   export function createPreviewParser(local: LocalDB): {
       parse(preview: PreviewRequest, sync: () => Promise<unknown>): Promise<PreviewRequest | undefined>;
   };
@@ -4442,8 +4442,7 @@ declare module 'alinea/core/util/Encoding' {
 declare module 'alinea/core/util/EntryFilenames' {
 
   import type { Config } from 'alinea/core/Config';
-  import { type EntryStatus } from 'alinea/core/Entry';
-  import { type Entry } from 'alinea/core/Entry';
+  import { type Entry, type EntryStatus } from 'alinea/core/Entry';
   import type { EntryUrlMeta, Type } from 'alinea/core/Type';
   export function workspaceMediaDir(config: Config, workspace: string): string;
   export function entryInfo(fileName: string): [name: string, status: EntryStatus];
@@ -4476,6 +4475,12 @@ declare module 'alinea/core/util/EntryFilenames' {
   
 }
 
+declare module 'alinea/core/util/EntryFilenames.test' {
+
+  export {};
+  
+}
+
 declare module 'alinea/core/util/EntryRows' {
 
   import type { Config } from 'alinea/core/Config';

package/dist/chunks/{chunk-PGFXEUMB.js → chunk-KOHVBHWW.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "1.7.0-preview.2",
+  version: "1.7.0-preview.4",
   description: "Headless git-based CMS",
   repository: {
     type: "git",

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-PGFXEUMB.js";
+} from "../chunks/chunk-KOHVBHWW.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // src/cli/Serve.ts

package/dist/cli/bin.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-PGFXEUMB.js";
+} from "../chunks/chunk-KOHVBHWW.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // node_modules/mri/lib/index.mjs

package/dist/cloud/CloudRemote.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-PGFXEUMB.js";
+} from "../chunks/chunk-KOHVBHWW.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // src/cloud/CloudRemote.ts

package/dist/core/util/EntryFilenames.d.ts

@@ -1,6 +1,5 @@
 import type { Config } from '../Config.js';
-import { type EntryStatus } from '../Entry.js';
-import { type Entry } from '../Entry.js';
+import { type Entry, type EntryStatus } from '../Entry.js';
 import type { EntryUrlMeta, Type } from '../Type.js';
 export declare function workspaceMediaDir(config: Config, workspace: string): string;
 export declare function entryInfo(fileName: string): [name: string, status: EntryStatus];

package/dist/core/util/EntryFilenames.js

@@ -2,8 +2,10 @@ import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/core/util/EntryFilenames.ts
 import * as paths from "alinea/core/util/Paths";
-import { entryStatuses } from "../Entry.js";
-import { ALT_STATUS } from "../Entry.js";
+import {
+  ALT_STATUS,
+  entryStatuses
+} from "../Entry.js";
 import { getRoot, getType } from "../Internal.js";
 import { Workspace } from "../Workspace.js";
 import { join } from "./Paths.js";
@@ -36,16 +38,19 @@ function entryFilepath(config, entry, parentPaths) {
     throw new Error(`Entry has unknown phase: ${status}`);
   const statusSegment = status === "published" ? "" : `.${status}`;
   const location = `${entryChildrenDir(config, entry, parentPaths) + statusSegment}.json`.toLowerCase();
-  return location;
+  const workspace = config.workspaces[entry.workspace];
+  if (!workspace)
+    throw new Error(`Workspace "${entry.workspace}" does not exist`);
+  const root = Workspace.roots(workspace)[entry.root];
+  if (!root) throw new Error(`Root "${entry.root}" does not exist`);
+  return join(entry.root, location);
 }
 function entryFileName(config, entry, parentPaths) {
   const workspace = config.workspaces[entry.workspace];
   if (!workspace)
     throw new Error(`Workspace "${entry.workspace}" does not exist`);
   const { source: contentDir } = Workspace.data(workspace);
-  const root = Workspace.roots(workspace)[entry.root];
-  if (!root) throw new Error(`Root "${entry.root}" does not exist`);
-  return join(contentDir, entry.root, entryFilepath(config, entry, parentPaths));
+  return join(contentDir, entryFilepath(config, entry, parentPaths));
 }
 function entryFile(config, entry) {
   const workspace = config.workspaces[entry.workspace];

package/dist/core/util/EntryFilenames.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/next.cjs

@@ -118,8 +118,8 @@ function createRewrites(config, adminPath) {
     const nextHost = process.env.__NEXT_PRIVATE_HOST;
     const origin = nextOrigin ?? (nextHost ? `http://${nextHost}` : null);
     const location = origin ? new URL(adminPath, origin).href : adminPath;
-    if (isDev && !process.env._ALINEA_REPORTED) {
-      process.env._ALINEA_REPORTED = "true";
+    if (isDev && !process.env.__NEXT_PRIVATE_ALINEA_REPORTED) {
+      process.env.__NEXT_PRIVATE_ALINEA_REPORTED = "true";
       console.log(`
 ${(0, import_Report.cyan)((0, import_Report.bold)("\u0251 Alinea CMS"))}:    ${location}
 `);

package/package.json

@@ -1,7 +1,7 @@
 {
   "bin": "./dist/cli.js",
   "name": "alinea",
-  "version": "1.7.0-preview.2",
+  "version": "1.7.0-preview.4",
   "description": "Headless git-based CMS",
   "repository": {
     "type": "git",