@tinacms/graphql 0.60.8 → 0.61.0

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # tina-graphql
 
+## 0.61.0
+
+### Minor Changes
+
+- 4daf15b36: Updated matching logic to only return the correct extension.
+
+  This means if you are using any other files besides `.md` the format must be provided in the schema.
+
+  ```ts
+  // .tina/schema.ts
+
+  import { defineSchema } from 'tinacms'
+
+  const schema = defineSchema({
+    collections: [
+      {
+        name: 'page',
+        path: 'content/page',
+        label: 'Page',
+        // Need to provide the format if the file being used (default is `.md`)
+        format: 'mdx',
+        fields: [
+          //...
+        ],
+      },
+    ],
+  })
+  //...
+
+  export default schema
+  ```
+
+### Patch Changes
+
+- 2ef5a1f33: Use media config from the schema in the local media server
+- 2ef5a1f33: Uses new `schema.config` when resolving media/asset urls
+- b348f8b6b: Experimental isomorphic git bridge implementation
+- fb73fb355: Renames syncFolder to a mediaRoot when configuring Repo-Based Media
+- Updated dependencies [b348f8b6b]
+- Updated dependencies [fb73fb355]
+- Updated dependencies [4daf15b36]
+  - @tinacms/datalayer@0.2.0
+  - @tinacms/schema-tools@0.0.6
+
 ## 0.60.8
 
 ### Patch Changes

package/dist/database/bridge/index.d.ts

@@ -12,7 +12,7 @@ limitations under the License.
 */
 export interface Bridge {
     rootPath: string;
-    glob(pattern: string): Promise<string[]>;
+    glob(pattern: string, extension: string): Promise<string[]>;
     get(filepath: string): Promise<string>;
     put(filepath: string, data: string): Promise<void>;
     delete(filepath: string): Promise<void>;

package/dist/database/index.d.ts

@@ -28,6 +28,7 @@ declare type CreateDatabase = {
 export declare const createDatabase: (config: CreateDatabase) => Promise<Database>;
 /** Options for {@link Database.query} **/
 export declare type QueryOptions = {
+    fileExtension?: string;
     collection: string;
     filterChain?: (BinaryFilter | TernaryFilter)[];
     sort?: string;

package/dist/index.js

@@ -12693,7 +12693,7 @@ var validateField = async (field) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/package.json
 var name = "@tinacms/graphql";
-var version = "0.60.8";
+var version = "0.61.0";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -13091,7 +13091,7 @@ var _buildFragments = async (builder, tinaSchema, rootPath) => {
     definitions: import_lodash3.default.uniqBy(extractInlineTypes(fragmentDefinitionsFields), (node) => node.name.value)
   };
   const fragPath = import_path.default.join(rootPath, ".tina", "__generated__");
-  await import_fs_extra.default.outputFileSync(import_path.default.join(fragPath, "frags.gql"), (0, import_graphql2.print)(fragDoc));
+  await import_fs_extra.default.outputFile(import_path.default.join(fragPath, "frags.gql"), (0, import_graphql2.print)(fragDoc));
 };
 var _buildQueries = async (builder, tinaSchema, rootPath) => {
   const operationsDefinitions = [];
@@ -13115,7 +13115,7 @@ var _buildQueries = async (builder, tinaSchema, rootPath) => {
     definitions: import_lodash3.default.uniqBy(extractInlineTypes(operationsDefinitions), (node) => node.name.value)
   };
   const fragPath = import_path.default.join(rootPath, ".tina", "__generated__");
-  await import_fs_extra.default.outputFileSync(import_path.default.join(fragPath, "queries.gql"), (0, import_graphql2.print)(queryDoc));
+  await import_fs_extra.default.outputFile(import_path.default.join(fragPath, "queries.gql"), (0, import_graphql2.print)(queryDoc));
 };
 var _buildSchema = async (builder, tinaSchema) => {
   const definitions = [];
@@ -20483,9 +20483,9 @@ var resolveMediaCloudToRelative = (value, config = { useRelativeMedia: true }, s
     if (hasTinaMediaConfig(schema) === true) {
       const assetsURL = `https://${config.assetsHost}/${config.clientId}`;
       if (typeof value === "string" && value.includes(assetsURL)) {
-        const cleanSyncFolder = cleanUpSlashes(schema.config.media.tina.syncFolder);
+        const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
         const strippedURL = value.replace(assetsURL, "");
-        return `${cleanSyncFolder}${strippedURL}`;
+        return `${cleanMediaRoot}${strippedURL}`;
       }
       return value;
     }
@@ -20500,8 +20500,8 @@ var resolveMediaRelativeToCloud = (value, config = { useRelativeMedia: true }, s
       return value;
     }
     if (hasTinaMediaConfig(schema) === true) {
-      const cleanSyncFolder = cleanUpSlashes(schema.config.media.tina.syncFolder);
-      const strippedValue = value.replace(cleanSyncFolder, "");
+      const cleanMediaRoot = cleanUpSlashes(schema.config.media.tina.mediaRoot);
+      const strippedValue = value.replace(cleanMediaRoot, "");
       return `https://${config.assetsHost}/${config.clientId}${strippedValue}`;
     }
     return value;
@@ -20517,7 +20517,7 @@ var cleanUpSlashes = (path6) => {
 };
 var hasTinaMediaConfig = (schema) => {
   var _a, _b, _c, _d, _e, _f;
-  if (((_c = (_b = (_a = schema.config) == null ? void 0 : _a.media) == null ? void 0 : _b.tina) == null ? void 0 : _c.publicFolder) && ((_f = (_e = (_d = schema.config) == null ? void 0 : _d.media) == null ? void 0 : _e.tina) == null ? void 0 : _f.syncFolder)) {
+  if (((_c = (_b = (_a = schema.config) == null ? void 0 : _a.media) == null ? void 0 : _b.tina) == null ? void 0 : _c.publicFolder) && ((_f = (_e = (_d = schema.config) == null ? void 0 : _d.media) == null ? void 0 : _e.tina) == null ? void 0 : _f.mediaRoot)) {
     return true;
   }
   return false;
@@ -23129,7 +23129,8 @@ var Resolver = class {
         edges = result.edges;
         pageInfo = result.pageInfo;
       } else {
-        edges = (await this.database.store.glob(collection.path, this.getDocument)).map((document3) => ({
+        const ext = (collection == null ? void 0 : collection.format) || ".md";
+        edges = (await this.database.store.glob(collection.path, this.getDocument, ext)).map((document3) => ({
           node: document3
         }));
       }
@@ -23936,7 +23937,7 @@ var Database = class {
     this._indexAllContent = async () => {
       const tinaSchema = await this.getSchema();
       await sequential(tinaSchema.getCollections(), async (collection) => {
-        const documentPaths = await this.bridge.glob(normalizePath(collection.path));
+        const documentPaths = await this.bridge.glob(normalizePath(collection.path), collection.format || "md");
         await _indexContent(this, documentPaths, collection);
       });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.60.8",
+  "version": "0.61.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -47,8 +47,8 @@
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-    "@tinacms/datalayer": "0.1.1",
-    "@tinacms/schema-tools": "0.0.5",
+    "@tinacms/datalayer": "0.2.0",
+    "@tinacms/schema-tools": "0.0.6",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -98,9 +98,9 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.1.1",
-    "@tinacms/schema-tools": "0.0.5",
-    "@tinacms/scripts": "0.50.8",
+    "@tinacms/datalayer": "0.2.0",
+    "@tinacms/schema-tools": "0.0.6",
+    "@tinacms/scripts": "0.50.9",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",