@tinacms/graphql 2.2.4 → 2.3.0

package/dist/database/util.d.ts

@@ -16,8 +16,6 @@ yupSchema: (args: typeof yup) => yup.ObjectSchema<any>, markdownParseConfig?: {
     lineWidth?: number;
     frontmatterDelimiters?: [string, string] | string;
 }) => T;
-export declare const atob: (b64Encoded: string) => string;
-export declare const btoa: (string: string) => string;
 export declare const scanAllContent: (tinaSchema: TinaSchema, bridge: Bridge, callback: (collection: Collection<true>, contentPaths: string[]) => Promise<void>) => Promise<string[]>;
 export declare const scanContentByPaths: (tinaSchema: TinaSchema, documentPaths: string[], callback: (collection: Collection<true> | undefined, documentPaths: string[]) => Promise<void>) => Promise<void>;
 export declare const partitionPathsByCollection: (tinaSchema: TinaSchema, documentPaths: string[]) => Promise<{

package/dist/index.js

@@ -3035,7 +3035,7 @@ var validateField = async (field) => {
 var package_default = {
   name: "@tinacms/graphql",
   type: "module",
-  version: "2.2.4",
+  version: "2.3.0",
   main: "dist/index.js",
   module: "./dist/index.js",
   files: [
@@ -3685,7 +3685,7 @@ var scanAllContent = async (tinaSchema, bridge, callback) => {
         `"${path9}" Found in multiple collections: ${filesSeen.get(path9).map((collection2) => `"${collection2}"`).join(
           ", "
         )}. This can cause unexpected behavior. We recommend updating the \`match\` property of those collections so that each file is in only one collection.
-This will be an error in the future. See https://tina.io/docs/errors/file-in-mutpliple-collections/
+This will be an error in the future. See https://tina.io/docs/r/content-modelling-collections#path-matching
 `
       );
     });
@@ -3792,7 +3792,7 @@ var loadAndParseWithAliases = async (bridge, filepath, collection, templateInfo)
   const template = getTemplateForFile(templateInfo, data);
   if (!template) {
     console.warn(
-      `Document: ${filepath} has an ambiguous template, skipping from indexing. See https://tina.io/docs/errors/ambiguous-template/ for more info.`
+      `Document: ${filepath} has an ambiguous template, skipping from indexing. See https://tina.io/docs/r/ambiguous-template for more info.`
     );
     return;
   }
@@ -4638,21 +4638,17 @@ var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, s
     }
     if (hasTinaMediaConfig(schema) === true) {
       const assetsURL = `https://${config.assetsHost}/${config.clientId}`;
+      const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
       if (typeof value === "string" && value.includes(assetsURL)) {
-        const cleanMediaRoot = cleanUpSlashes(
-          schema.config.media.tina.mediaRoot
-        );
-        const strippedURL = value.replace(assetsURL, "");
-        return `${cleanMediaRoot}${strippedURL}`;
+        return `${cleanMediaRoot}${stripStagingPrefix(
+          value.replace(assetsURL, "")
+        )}`;
       }
       if (Array.isArray(value)) {
         return value.map((v) => {
           if (!v || typeof v !== "string") return v;
-          const cleanMediaRoot = cleanUpSlashes(
-            schema.config.media.tina.mediaRoot
-          );
           const strippedURL = v.replace(assetsURL, "");
-          return `${cleanMediaRoot}${strippedURL}`;
+          return `${cleanMediaRoot}${stripStagingPrefix(strippedURL)}`;
         });
       }
       return value;
@@ -4669,15 +4665,16 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     }
     if (hasTinaMediaConfig(schema) === true) {
       const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
+      const prefix = stagingPrefix(config);
       if (typeof value === "string") {
         const strippedValue = value.replace(cleanMediaRoot, "");
-        return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+        return `https://${config.assetsHost}/${config.clientId}${prefix}${strippedValue}`;
       }
       if (Array.isArray(value)) {
         return value.map((v) => {
           if (!v || typeof v !== "string") return v;
           const strippedValue = v.replace(cleanMediaRoot, "");
-          return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
+          return `https://${config.assetsHost}/${config.clientId}${prefix}${strippedValue}`;
         });
       }
     }
@@ -4686,6 +4683,12 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
     return value;
   }
 };
+var stagingPrefix = (config) => config.branch && config.branch !== config.mediaBranch ? `/__staging/${encodeURIComponent(config.branch)}` : "";
+var STAGING_SEGMENT = /^\/__staging\/[^/]+(\/.*)$/;
+var stripStagingPrefix = (path9) => {
+  const match = path9.match(STAGING_SEGMENT);
+  return match ? match[1] : path9;
+};
 var cleanUpSlashes = (path9) => {
   if (path9) {
     return `/${path9.replace(/^\/+|\/+$/gm, "")}`;
@@ -8648,3 +8651,8 @@ export {
 };
 //! Replaces _.get()
 //! Replaces _.flattenDeep()
+/**
+ * @license
+ * Copyright 2023 Forestry.io Holdings, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/dist/resolver/media-utils.d.ts

@@ -1,6 +1,8 @@
 /**
-
-*/
+ * @license
+ * Copyright 2023 Forestry.io Holdings, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import type { Schema } from '@tinacms/schema-tools';
 import type { GraphQLConfig } from '../types';
 /**

package/dist/types.d.ts

@@ -7,4 +7,6 @@ export type GraphQLConfig = {
     useRelativeMedia: false;
     clientId: string;
     assetsHost: string;
+    branch?: string;
+    mediaBranch?: string;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/graphql",
   "type": "module",
-  "version": "2.2.4",
+  "version": "2.3.0",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "files": [
@@ -43,8 +43,8 @@
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.7.0",
     "yup": "^1.6.1",
-    "@tinacms/mdx": "2.1.2",
-    "@tinacms/schema-tools": "2.7.2"
+    "@tinacms/schema-tools": "2.7.3",
+    "@tinacms/mdx": "2.1.3"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -72,7 +72,7 @@
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
     "zod": "^3.24.2",
-    "@tinacms/schema-tools": "2.7.2",
+    "@tinacms/schema-tools": "2.7.3",
     "@tinacms/scripts": "1.6.0"
   },
   "scripts": {