@tinacms/cli 1.5.5 → 1.5.7

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

@@ -7,7 +7,8 @@ export declare const generateAllTemplates: ({ pathToForestryConfig, }: {
     fields: TinaField[];
     templateObj: any;
 }>>;
-export declare const generateCollections: ({ pathToForestryConfig, usingTypescript, }: {
+export declare const generateCollections: ({ pathToForestryConfig, usingTypescript, frontMatterFormat, }: {
+    frontMatterFormat?: 'toml' | 'yaml' | 'json';
     pathToForestryConfig: string;
     usingTypescript: boolean;
 }) => Promise<{

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion6 = require("clipanion");
 
 // package.json
-var version = "1.5.5";
+var version = "1.5.7";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion = require("clipanion");
@@ -200,7 +200,7 @@ var ConfigManager = class {
     );
     if (!this.tinaConfigFilePath) {
       throw new Error(
-        `Unable to find confg file in ${this.tinaFolderPath}. Looking for a file named "config.{ts,tsx,js,jsx}"`
+        `Unable to find config file in ${this.tinaFolderPath}. Looking for a file named "config.{ts,tsx,js,jsx}"`
       );
     }
     this.selfHostedDatabaseFilePath = await this.getPathWithExtension(
@@ -339,13 +339,13 @@ var ConfigManager = class {
   }
   printRelativePath(filename) {
     if (filename) {
-      return filename.replace(`${this.rootPath}/`, "");
+      return filename.replace(/\\/g, "/").replace(`${this.rootPath}/`, "");
     }
     throw `No path provided to print`;
   }
   printContentRelativePath(filename) {
     if (filename) {
-      return filename.replace(`${this.contentRootPath}/`, "");
+      return filename.replace(/\\/g, "/").replace(`${this.contentRootPath}/`, "");
     }
     throw `No path provided to print`;
   }
@@ -989,7 +989,7 @@ var devServerEndPointsPlugin = ({
     name: "graphql-endpoints",
     configureServer(server) {
       server.middlewares.use((0, import_cors.default)());
-      server.middlewares.use(import_body_parser.default.json());
+      server.middlewares.use(import_body_parser.default.json({ limit: "5mb" }));
       server.middlewares.use(async (req, res, next) => {
         var _a;
         const mediaPaths = (_a = configManager.config.media) == null ? void 0 : _a.tina;
@@ -2110,9 +2110,11 @@ var BuildCommand = class extends import_clipanion2.Command {
       fragDoc
     });
     const apiURL = await codegen2.execute();
-    await this.checkClientInfo(configManager, apiURL);
-    await waitForDB(configManager.config, apiURL, false);
-    await this.checkGraphqlSchema(configManager, database, apiURL);
+    if (!configManager.hasSelfHostedConfig()) {
+      await this.checkClientInfo(configManager, apiURL);
+      await waitForDB(configManager.config, apiURL, false);
+      await this.checkGraphqlSchema(configManager, database, apiURL);
+    }
     await buildProductionSpa(configManager, database, apiURL);
     await import_fs_extra5.default.outputFile(
       configManager.outputGitignorePath,
@@ -2248,22 +2250,34 @@ var BuildCommand = class extends import_clipanion2.Command {
     const remoteGqlSchema = (0, import_graphql10.buildClientSchema)(remoteSchema);
     const localSchemaDocument = await database.getGraphQLSchemaFromBridge();
     const localGraphqlSchema = (0, import_graphql10.buildASTSchema)(localSchemaDocument);
-    const diffResult = await (0, import_core2.diff)(localGraphqlSchema, remoteGqlSchema);
-    if (diffResult.length === 0) {
-      bar2.tick({
-        prog: "\u2705"
-      });
-    } else {
-      bar2.tick({
-        prog: "\u274C"
-      });
-      let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to Github to update your remote GraphQL schema.`;
-      if (config3 == null ? void 0 : config3.branch) {
-        errorMessage += `
+    try {
+      const diffResult = await (0, import_core2.diff)(localGraphqlSchema, remoteGqlSchema);
+      if (diffResult.length === 0) {
+        bar2.tick({
+          prog: "\u2705"
+        });
+      } else {
+        bar2.tick({
+          prog: "\u274C"
+        });
+        let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to Github to update your remote GraphQL schema.`;
+        if (config3 == null ? void 0 : config3.branch) {
+          errorMessage += `
 
 Additional info: Branch: ${config3.branch}, Client ID: ${config3.clientId} `;
+        }
+        throw new Error(errorMessage);
+      }
+    } catch (e) {
+      if (e.message.startsWith("Cannot use")) {
+        logger.warn(
+          `${warnText(
+            "Skipping schema check due to conflicting GraphQL versions"
+          )}`
+        );
+      } else {
+        throw e;
       }
-      throw new Error(errorMessage);
     }
   }
 };
@@ -3449,7 +3463,8 @@ var generateAllTemplates = async ({
   await Promise.all(proms);
   return templateMap;
 };
-var generateCollectionFromForestrySection = (section, templateMap) => {
+var generateCollectionFromForestrySection = (args) => {
+  const { section, templateMap } = args;
   if (section.read_only)
     return;
   let format3 = "md";
@@ -3465,6 +3480,12 @@ var generateCollectionFromForestrySection = (section, templateMap) => {
     name: stringifyLabel(section.label),
     path: section.path || "/"
   };
+  if (args.frontMatterFormat) {
+    baseCollection.frontmatterFormat = args.frontMatterFormat;
+    if (args.frontMatterFormat === "toml") {
+      baseCollection.frontmatterDelimiters = "+++";
+    }
+  }
   if (section.match) {
     baseCollection.match = {
       ...(baseCollection == null ? void 0 : baseCollection.match) || {},
@@ -3622,7 +3643,8 @@ var generateCollectionFromForestrySection = (section, templateMap) => {
 };
 var generateCollections = async ({
   pathToForestryConfig,
-  usingTypescript
+  usingTypescript,
+  frontMatterFormat
 }) => {
   const templateMap = await generateAllTemplates({ pathToForestryConfig });
   const { importStatements, templateCodeText } = await makeTemplateFile({
@@ -3632,11 +3654,21 @@ var generateCollections = async ({
   const forestryConfig = await import_fs_extra7.default.readFile(
     import_path8.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
-  rewriteTemplateKeysInDocs(templateMap, pathToForestryConfig);
+  rewriteTemplateKeysInDocs({
+    templateMap,
+    markdownParseConfig: {
+      frontmatterFormat: frontMatterFormat,
+      frontmatterDelimiters: frontMatterFormat === "toml" ? "+++" : void 0
+    }
+  });
   const collections = parseSections({
     val: import_js_yaml2.default.load(forestryConfig.toString())
   }).sections.map(
-    (section) => generateCollectionFromForestrySection(section, templateMap)
+    (section) => generateCollectionFromForestrySection({
+      section,
+      templateMap,
+      frontMatterFormat
+    })
   ).filter((c) => c !== void 0);
   return {
     collections,
@@ -3644,8 +3676,9 @@ var generateCollections = async ({
     templateCode: templateCodeText
   };
 };
-var rewriteTemplateKeysInDocs = (templateMap, rootPath) => {
+var rewriteTemplateKeysInDocs = (args) => {
   var _a;
+  const { templateMap, markdownParseConfig } = args;
   for (const templateKey of templateMap.keys()) {
     const { templateObj } = templateMap.get(templateKey);
     (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
@@ -3656,12 +3689,20 @@ var rewriteTemplateKeysInDocs = (templateMap, rootPath) => {
         }
         const extname = import_path8.default.extname(filePath);
         const fileContent = import_fs_extra7.default.readFileSync(filePath).toString();
-        const content2 = (0, import_graphql14.parseFile)(fileContent, extname, (yup) => yup.object({}));
+        const content2 = (0, import_graphql14.parseFile)(
+          fileContent,
+          extname,
+          (yup) => yup.object({}),
+          markdownParseConfig
+        );
         const newContent = {
           _template: stringifyLabel(templateKey),
           ...content2
         };
-        import_fs_extra7.default.writeFileSync(filePath, (0, import_graphql14.stringifyFile)(newContent, extname, true));
+        import_fs_extra7.default.writeFileSync(
+          filePath,
+          (0, import_graphql14.stringifyFile)(newContent, extname, true, markdownParseConfig)
+        );
       } catch (error) {
         console.log(
           dangerText("Error updating template -> _template in ", page)
@@ -3765,7 +3806,9 @@ async function initStaticTina({
   if (hasForestryConfig) {
     const { collectionString, importStatements, templateCodeString } = await forestryMigrate({
       usingTypescript,
-      pathToForestryConfig
+      pathToForestryConfig,
+      rootPath,
+      framework
     });
     if (collectionString) {
       templateCode = templateCodeString;
@@ -3910,7 +3953,9 @@ var chooseFramework = async () => {
 };
 var forestryMigrate = async ({
   pathToForestryConfig,
-  usingTypescript
+  usingTypescript,
+  rootPath,
+  framework
 }) => {
   logger.info(`Forestry.io configuration found.`);
   const disclaimer = logText(
@@ -3926,11 +3971,15 @@ ${disclaimer}`
   if (!option["selection"]) {
     return null;
   }
+  let frontMatterFormat = null;
+  if (framework.name === "hugo") {
+    frontMatterFormat = await getFrontmatterFormat(rootPath);
+  }
   const { collections, importStatements, templateCode } = await generateCollections({
     pathToForestryConfig,
-    usingTypescript
+    usingTypescript,
+    frontMatterFormat
   });
-  ErrorSingleton.getInstance().printCollectionNameErrors();
   const JSONString = JSON.stringify(collections, null, 2);
   const { code } = addVariablesToCode(JSONString);
   return {
@@ -3939,6 +3988,32 @@ ${disclaimer}`
     templateCodeString: templateCode
   };
 };
+var getFrontmatterFormat = async (rootPath) => {
+  try {
+    const hugoConfigPath = import_path10.default.join(rootPath, "config.toml");
+    const hugoConfig = await import_fs_extra9.default.readFile(hugoConfigPath, "utf8");
+    const frontMatterFormat = hugoConfig.match(/metaDataFormat = "(.*)"/);
+    console.log({ frontMatterFormat });
+    if (frontMatterFormat && frontMatterFormat[1]) {
+      return frontMatterFormat[1];
+    }
+  } catch (e) {
+  }
+  const option = await (0, import_prompts2.default)({
+    name: "selection",
+    type: "select",
+    choices: [
+      { title: "yaml", value: "yaml" },
+      { title: "toml", value: "toml" },
+      { title: "json", value: "json" }
+    ],
+    message: `What format are you using in your frontmatter?`
+  });
+  if (!option["selection"]) {
+    return null;
+  }
+  return option["selection"];
+};
 var reportTelemetry = async ({
   hasForestryConfig,
   noTelemetry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,11 +58,11 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.5",
-    "@tinacms/datalayer": "1.2.6",
-    "@tinacms/graphql": "1.4.6",
+    "@tinacms/app": "1.2.7",
+    "@tinacms/datalayer": "1.2.8",
+    "@tinacms/graphql": "1.4.8",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.2",
+    "@tinacms/schema-tools": "1.4.3",
     "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",