@tinacms/cli 1.6.3 → 1.6.5

package/dist/cmds/forestry-migrate/util/index.d.ts

@@ -76,8 +76,8 @@ declare const forestryFieldWithoutField: z.ZodObject<{
     };
     name?: string;
     label?: string;
-    template_types?: string[];
     template?: string;
+    template_types?: string[];
 }, {
     type?: "number" | "boolean" | "file" | "color" | "text" | "include" | "list" | "datetime" | "select" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks";
     default?: any;
@@ -96,8 +96,8 @@ declare const forestryFieldWithoutField: z.ZodObject<{
     };
     name?: string;
     label?: string;
-    template_types?: string[];
     template?: string;
+    template_types?: string[];
 }>;
 type ForestryFieldWithoutFieldType = z.infer<typeof forestryFieldWithoutField>;
 interface ForestryFieldType extends ForestryFieldWithoutFieldType {

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.6.3";
+var version = "1.6.5";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -1633,6 +1633,7 @@ var loadGraphQLDocuments = async (globPath) => {
 // src/next/codegen/index.ts
 var import_esbuild2 = require("esbuild");
 var import_graphql7 = require("@tinacms/graphql");
+var import_normalize_path3 = __toESM(require("normalize-path"));
 var TINA_HOST = "content.tinajs.io";
 var Codegen = class {
   constructor({
@@ -1905,7 +1906,9 @@ export default databaseClient;
     const apiURL = this.getApiURL();
     const clientString = `import { createClient } from "tinacms/dist/client";
 import { queries } from "./types";
-export const client = createClient({ ${this.noClientBuildCache === false ? `cacheDir: '${this.configManager.generatedCachePath}', ` : ""}url: '${apiURL}', token: '${token}', queries, ${errorPolicy ? `errorPolicy: '${errorPolicy}'` : ""} });
+export const client = createClient({ ${this.noClientBuildCache === false ? `cacheDir: '${(0, import_normalize_path3.default)(
+      this.configManager.generatedCachePath
+    )}', ` : ""}url: '${apiURL}', token: '${token}', queries, ${errorPolicy ? `errorPolicy: '${errorPolicy}'` : ""} });
 export default client;
   `;
     return { apiURL, clientString };
@@ -5277,7 +5280,10 @@ var generateCollectionString = (args) => {
   if (args.collections) {
     return args.collections;
   }
-  const extraTinaCollections = (_b = (_a = args.config.authProvider) == null ? void 0 : _a.extraTinaCollections) == null ? void 0 : _b.join(",\n");
+  let extraTinaCollections = (_b = (_a = args.config.authProvider) == null ? void 0 : _a.extraTinaCollections) == null ? void 0 : _b.join(",\n");
+  if (extraTinaCollections) {
+    extraTinaCollections = extraTinaCollections + ",";
+  }
   const baseCollections = `[
     ${extraTinaCollections || ""}
     {
@@ -5290,7 +5296,6 @@ var generateCollectionString = (args) => {
   const nextExampleCollection = `[
     ${extraTinaCollections || ""}
     {
-      ${extraTinaCollections ? `${extraTinaCollections},` : ""}
       name: 'post',
       label: 'Posts',
       path: 'content/posts',
@@ -5528,7 +5533,7 @@ var makeVariableStatementVisitor = (sourceFile, variableStmtSourceFile, variable
 var makeImportsVisitor = (sourceFile, importMap) => (ctx) => (node) => {
   var _a;
   if (import_typescript3.default.isSourceFile(node)) {
-    let newStatements = [...node.statements];
+    const newStatements = [...node.statements];
     let changed = false;
     for (const [moduleName, imports] of Object.entries(importMap)) {
       let foundImportStatement = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -85,12 +85,12 @@
     "vite": "^4.3.9",
     "yup": "^0.32.9",
     "zod": "^3.14.3",
-    "@tinacms/app": "2.1.3",
+    "@tinacms/app": "2.1.5",
     "@tinacms/graphql": "1.5.2",
     "@tinacms/metrics": "1.0.5",
     "@tinacms/schema-tools": "1.6.2",
-    "@tinacms/search": "1.0.28",
-    "tinacms": "2.2.3"
+    "@tinacms/search": "1.0.29",
+    "tinacms": "2.2.5"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"