@tinacms/cli 1.5.1 → 1.5.2

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

@@ -76,7 +76,7 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     };
     name?: string;
-    type?: "number" | "boolean" | "file" | "text" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "include" | "blocks" | "color";
+    type?: "number" | "boolean" | "file" | "text" | "include" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks" | "color";
     label?: string;
     template_types?: string[];
 }, {
@@ -95,7 +95,7 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     };
     name?: string;
-    type?: "number" | "boolean" | "file" | "text" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "include" | "blocks" | "color";
+    type?: "number" | "boolean" | "file" | "text" | "include" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks" | "color";
     label?: string;
     template_types?: string[];
 }>;
@@ -150,10 +150,10 @@ export declare const parseSections: ({ val }: {
 }) => {
     sections?: {
         match?: string;
+        exclude?: string;
         path?: string;
         type?: "directory" | "document" | "heading" | "jekyll-pages" | "jekyll-posts";
         label?: string;
-        exclude?: string;
         create?: "none" | "all" | "documents";
         templates?: string[];
         new_doc_ext?: string;

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion6 = require("clipanion");
 
 // package.json
-var version = "1.5.1";
+var version = "1.5.2";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion = require("clipanion");
@@ -207,10 +207,6 @@ var ConfigManager = class {
       import_path.default.join(this.tinaFolderPath, "database")
     );
     this.generatedFolderPath = import_path.default.join(this.tinaFolderPath, GENERATED_FOLDER);
-    this.config = await this.loadConfigFile(
-      this.generatedFolderPath,
-      this.tinaConfigFilePath
-    );
     this.generatedGraphQLGQLPath = import_path.default.join(
       this.generatedFolderPath,
       GRAPHQL_GQL_FILE
@@ -235,16 +231,6 @@ var ConfigManager = class {
       this.generatedFolderPath,
       "frags.gql"
     );
-    const fullLocalContentPath = import_path.default.join(
-      this.tinaFolderPath,
-      this.config.localContentPath || ""
-    );
-    if (this.config.localContentPath && await import_fs_extra.default.existsSync(fullLocalContentPath)) {
-      logger.info(`Using separate content repo at ${fullLocalContentPath}`);
-      this.contentRootPath = fullLocalContentPath;
-    } else {
-      this.contentRootPath = this.rootPath;
-    }
     this.generatedTypesTSFilePath = import_path.default.join(
       this.generatedFolderPath,
       "types.ts"
@@ -273,6 +259,19 @@ var ConfigManager = class {
       this.generatedFolderPath,
       "client.js"
     );
+    const clientExists = this.isUsingTs() ? await import_fs_extra.default.pathExists(this.generatedClientTSFilePath) : await import_fs_extra.default.pathExists(this.generatedClientJSFilePath);
+    if (!clientExists) {
+      const file = "export default ()=>({})\nexport const client = ()=>({})";
+      if (this.isUsingTs()) {
+        await import_fs_extra.default.outputFile(this.generatedClientTSFilePath, file);
+      } else {
+        await import_fs_extra.default.outputFile(this.generatedClientJSFilePath, file);
+      }
+    }
+    this.config = await this.loadConfigFile(
+      this.generatedFolderPath,
+      this.tinaConfigFilePath
+    );
     this.publicFolderPath = import_path.default.join(
       this.rootPath,
       this.config.build.publicFolder
@@ -283,6 +282,16 @@ var ConfigManager = class {
     );
     this.outputHTMLFilePath = import_path.default.join(this.outputFolderPath, "index.html");
     this.outputGitignorePath = import_path.default.join(this.outputFolderPath, ".gitignore");
+    const fullLocalContentPath = import_path.default.join(
+      this.tinaFolderPath,
+      this.config.localContentPath || ""
+    );
+    if (this.config.localContentPath && await import_fs_extra.default.existsSync(fullLocalContentPath)) {
+      logger.info(`Using separate content repo at ${fullLocalContentPath}`);
+      this.contentRootPath = fullLocalContentPath;
+    } else {
+      this.contentRootPath = this.rootPath;
+    }
     this.spaMainPath = require.resolve("@tinacms/app");
     this.spaRootPath = import_path.default.join(this.spaMainPath, "..", "..");
   }
@@ -364,7 +373,8 @@ var ConfigManager = class {
       entryPoints: [this.selfHostedDatabaseFilePath],
       bundle: true,
       platform: "node",
-      outfile
+      outfile,
+      loader: loaders
     });
     const result = require(outfile);
     await import_fs_extra.default.removeSync(outfile);
@@ -381,13 +391,15 @@ var ConfigManager = class {
       bundle: true,
       target: ["es2020"],
       platform: "node",
-      outfile
+      outfile,
+      loader: loaders
     });
     await esbuild.build({
       entryPoints: [outfile],
       bundle: true,
       platform: "node",
-      outfile: outfile2
+      outfile: outfile2,
+      loader: loaders
     });
     const result = require(outfile2);
     await import_fs_extra.default.removeSync(outfile);
@@ -395,6 +407,31 @@ var ConfigManager = class {
     return result.default;
   }
 };
+var loaders = {
+  ".aac": "file",
+  ".css": "file",
+  ".eot": "file",
+  ".flac": "file",
+  ".gif": "file",
+  ".jpeg": "file",
+  ".jpg": "file",
+  ".json": "json",
+  ".mp3": "file",
+  ".mp4": "file",
+  ".ogg": "file",
+  ".otf": "file",
+  ".png": "file",
+  ".svg": "file",
+  ".ttf": "file",
+  ".wav": "file",
+  ".webm": "file",
+  ".webp": "file",
+  ".woff": "file",
+  ".woff2": "file",
+  ".js": "jsx",
+  ".jsx": "jsx",
+  ".tsx": "tsx"
+};
 
 // src/next/commands/dev-command/html.ts
 var devHTML = (port) => `<!DOCTYPE html>
@@ -424,7 +461,7 @@ var devHTML = (port) => `<!DOCTYPE html>
 </html>`;
 
 // src/next/commands/dev-command/server/index.ts
-var import_vite2 = require("vite");
+var import_vite3 = require("vite");
 
 // src/next/vite/index.ts
 var import_path3 = __toESM(require("path"));
@@ -768,6 +805,9 @@ var createConfig = async ({
 };
 
 // src/next/vite/plugins.ts
+var import_pluginutils = require("@rollup/pluginutils");
+var import_fs = __toESM(require("fs"));
+var import_vite2 = require("vite");
 var import_esbuild = require("esbuild");
 var import_path5 = __toESM(require("path"));
 var import_body_parser = __toESM(require("body-parser"));
@@ -1001,14 +1041,50 @@ var devServerEndPointsPlugin = ({
   };
   return plug;
 };
+function viteTransformExtension({
+  exportAsDefault = true,
+  svgrOptions,
+  esbuildOptions,
+  include = "**/*.svg",
+  exclude
+} = {}) {
+  const filter = (0, import_pluginutils.createFilter)(include, exclude);
+  return {
+    name: "vite-plugin-svgr",
+    async transform(code, id) {
+      if (filter(id)) {
+        const { transform: transform2 } = await Promise.resolve().then(() => __toESM(require("@svgr/core")));
+        const svgCode = await import_fs.default.promises.readFile(
+          id.replace(/\?.*$/, ""),
+          "utf8"
+        );
+        const componentCode = await transform2(svgCode, svgrOptions, {
+          filePath: id,
+          caller: {
+            previousExport: exportAsDefault ? null : code
+          }
+        });
+        const res = await (0, import_vite2.transformWithEsbuild)(componentCode, id, {
+          loader: "jsx",
+          ...esbuildOptions
+        });
+        return {
+          code: res.code,
+          map: null
+        };
+      }
+    }
+  };
+}
 
 // src/next/commands/dev-command/server/index.ts
 var createDevServer = async (configManager, database, apiURL, noWatch) => {
   const plugins = [
     transformTsxPlugin({ configManager }),
-    devServerEndPointsPlugin({ apiURL, configManager, database })
+    devServerEndPointsPlugin({ apiURL, configManager, database }),
+    viteTransformExtension()
   ];
-  return (0, import_vite2.createServer)(
+  return (0, import_vite3.createServer)(
     await createConfig({
       configManager,
       database,
@@ -1819,7 +1895,7 @@ var import_fs_extra5 = __toESM(require("fs-extra"));
 var import_graphql9 = require("@tinacms/graphql");
 
 // src/next/commands/build-command/server.ts
-var import_vite4 = require("vite");
+var import_vite5 = require("vite");
 var buildProductionSpa = async (configManager, database, apiURL) => {
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
@@ -1839,13 +1915,13 @@ var buildProductionSpa = async (configManager, database, apiURL) => {
     }
   });
   const config3 = await createConfig({
-    plugins: [transformTsxPlugin({ configManager })],
+    plugins: [transformTsxPlugin({ configManager }), viteTransformExtension()],
     configManager,
     database,
     apiURL,
     noWatch: true
   });
-  return (0, import_vite4.build)(config3);
+  return (0, import_vite5.build)(config3);
 };
 
 // src/next/commands/build-command/index.ts
@@ -3167,6 +3243,10 @@ var transformForestryFieldsToTinaFields = ({
             label: template2.label,
             name: stringifyTemplateName(tem, tem)
           };
+          if (t.name != tem) {
+            ;
+            t.nameOverride = tem;
+          }
           templates.push(t);
         });
         field = {
@@ -3253,7 +3333,11 @@ var transformForestryMatchToTinaMatch = (match) => {
   var _a, _b;
   const newMatch = (_b = (_a = match.replace(" ", "").replace(/\.?(mdx|md|json|yaml|yml|toml)/g, "")) == null ? void 0 : _a.replace(/\..*$/g, "")) == null ? void 0 : _b.replace("{}", "");
   if (match !== newMatch) {
-    logger.warn(`Warning: Match ${match} was transformed to ${newMatch}`);
+    logger.info(
+      `Info: Match ${match} was transformed to ${newMatch}. See ${linkText(
+        "https://tina.io/docs/forestry/common-errors/#info-match-match-was-transformed-to-newmatch"
+      )}`
+    );
   }
   return newMatch;
 };

package/dist/next/commands/dev-command/server/index.d.ts

@@ -1,3 +1,3 @@
-import { Database } from '@tinacms/graphql';
+import type { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../../config-manager';
 export declare const createDevServer: (configManager: ConfigManager, database: Database, apiURL: string, noWatch: boolean) => Promise<import("vite").ViteDevServer>;

package/dist/next/config-manager.d.ts

@@ -1,3 +1,4 @@
+import type { Loader } from 'esbuild';
 import { Config } from '@tinacms/schema-tools';
 export declare const TINA_FOLDER = "tina";
 export declare const LEGACY_TINA_FOLDER = ".tina";
@@ -58,3 +59,6 @@ export declare class ConfigManager {
     loadDatabaseFile(): Promise<any>;
     loadConfigFile(generatedFolderPath: string, configFilePath: string): Promise<any>;
 }
+export declare const loaders: {
+    [ext: string]: Loader;
+};

package/dist/next/vite/plugins.d.ts

@@ -1,4 +1,7 @@
 import type { Plugin } from 'vite';
+import { FilterPattern } from '@rollup/pluginutils';
+import type { Config } from '@svgr/core';
+import { transformWithEsbuild } from 'vite';
 import type { Database } from '@tinacms/graphql';
 import type { ConfigManager } from '../config-manager';
 export declare const transformTsxPlugin: ({ configManager: _configManager, }: {
@@ -9,3 +12,17 @@ export declare const devServerEndPointsPlugin: ({ configManager, apiURL, databas
     database: Database;
     configManager: ConfigManager;
 }) => Plugin;
+export interface ViteSvgrOptions {
+    /**
+     * Export React component as default. Notice that it will overrides
+     * the default behavior of Vite, which exports the URL as default
+     *
+     * @default false
+     */
+    exportAsDefault?: boolean;
+    svgrOptions?: Config;
+    esbuildOptions?: Parameters<typeof transformWithEsbuild>[2];
+    exclude?: FilterPattern;
+    include?: FilterPattern;
+}
+export declare function viteTransformExtension({ exportAsDefault, svgrOptions, esbuildOptions, include, exclude, }?: ViteSvgrOptions): Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,6 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "1.1.0",
     "@types/clear": "0.1.0",
     "@types/cli-spinner": "^0.2.1",
     "@types/cors": "2.8.5",
@@ -41,7 +40,8 @@
     "@types/prompts": "^2.0.13",
     "@types/yup": "^0.29.11",
     "jest": "^27.0.6",
-    "typescript": "4.3.5"
+    "typescript": "4.3.5",
+    "@tinacms/scripts": "1.1.0"
   },
   "dependencies": {
     "@graphql-codegen/core": "^2.1.0",
@@ -53,15 +53,12 @@
     "@graphql-inspector/core": "^4.0.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
+    "@rollup/pluginutils": "^5.0.2",
+    "@svgr/core": "6.3.1",
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.2",
-    "@tinacms/datalayer": "1.2.2",
-    "@tinacms/graphql": "1.4.2",
-    "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.2",
-    "@vitejs/plugin-react": "^2.1.0",
+    "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",
@@ -103,7 +100,12 @@
     "vite": "4.1.4",
     "yarn": "^1.22.17",
     "yup": "^0.32.9",
-    "zod": "^3.14.3"
+    "zod": "^3.14.3",
+    "@tinacms/app": "1.2.3",
+    "@tinacms/datalayer": "1.2.3",
+    "@tinacms/graphql": "1.4.3",
+    "@tinacms/metrics": "1.0.2",
+    "@tinacms/schema-tools": "1.4.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"