npm - @tinacms/cli - Versions diffs - 1.4.0 → 1.5.0 - Mend

@tinacms/cli 1.4.0 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/dist/cmds/forestry-migrate/index.d.ts +4 -8
package/dist/cmds/forestry-migrate/util/errorSingleton.d.ts +2 -2
package/dist/cmds/forestry-migrate/util/index.d.ts +9 -12
package/dist/cmds/init/index.d.ts +2 -2
package/dist/index.js +571 -534
package/dist/next/codegen/index.d.ts +1 -3
package/dist/next/commands/audit-command/audit.d.ts +1 -9
package/dist/next/commands/audit-command/index.d.ts +1 -0
package/dist/next/commands/build-command/index.d.ts +1 -0
package/dist/next/commands/build-command/server.d.ts +1 -1
package/dist/next/commands/dev-command/index.d.ts +1 -0
package/dist/next/commands/dev-command/server/index.d.ts +1 -1
package/dist/next/commands/init-command/index.d.ts +1 -1
package/dist/next/config-manager.d.ts +7 -1
package/dist/next/database.d.ts +1 -1
package/dist/next/vite/index.d.ts +1 -2
package/dist/next/vite/plugins.d.ts +11 -0
package/package.json +7 -6
package/dist/next/commands/codemod-command/server/index.d.ts +0 -2

package/dist/index.js CHANGED Viewed

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion5 = require("clipanion");
 // package.json
-var version = "1.4.0";
+var version = "1.5.0";
 // src/next/commands/dev-command/index.ts
 var import_clipanion = require("clipanion");
@@ -45,7 +45,6 @@ var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_os = __toESM(require("os"));
 var esbuild = __toESM(require("esbuild"));
-var url = __toESM(require("url"));
 var dotenv = __toESM(require("dotenv"));
 var import_normalize_path = __toESM(require("normalize-path"));
@@ -165,9 +164,14 @@ var GRAPHQL_GQL_FILE = "schema.gql";
 var SCHEMA_JSON_FILE = "_schema.json";
 var LOOKUP_JSON_FILE = "_lookup.json";
 var ConfigManager = class {
-  constructor(rootPath = process.cwd(), tinaGraphQLVersion) {
+  constructor({
+    rootPath = process.cwd(),
+    tinaGraphQLVersion,
+    legacyNoSDK
+  }) {
     this.rootPath = (0, import_normalize_path.default)(rootPath);
     this.tinaGraphQLVersionFromCLI = tinaGraphQLVersion;
+    this.legacyNoSDK = legacyNoSDK;
   }
   isUsingTs() {
     return [".ts", ".tsx"].includes(import_path.default.extname(this.tinaConfigFilePath));
@@ -178,6 +182,13 @@ var ConfigManager = class {
   hasSeparateContentRoot() {
     return this.rootPath !== this.contentRootPath;
   }
+  shouldSkipSDK() {
+    var _a;
+    if (this.legacyNoSDK) {
+      return this.legacyNoSDK;
+    }
+    return ((_a = this.config.client) == null ? void 0 : _a.skip) || false;
+  }
   async processConfig() {
     this.tinaFolderPath = await this.getTinaFolderPath(this.rootPath);
     this.envFilePath = import_path.default.resolve(
@@ -272,11 +283,8 @@ var ConfigManager = class {
     );
     this.outputHTMLFilePath = import_path.default.join(this.outputFolderPath, "index.html");
     this.outputGitignorePath = import_path.default.join(this.outputFolderPath, ".gitignore");
-    this.spaHTMLPath = url.pathToFileURL(
-      require.resolve("@tinacms/app")
-    ).pathname;
-    this.spaRootPath = this.spaHTMLPath.replace("/index.html", "");
-    this.spaMainPath = import_path.default.join(this.spaRootPath, "src", "main.tsx");
+    this.spaMainPath = require.resolve("@tinacms/app");
+    this.spaRootPath = import_path.default.join(this.spaMainPath, "..", "..");
   }
   async getTinaFolderPath(rootPath) {
     const tinaFolderPath = import_path.default.join(rootPath, TINA_FOLDER);
@@ -416,166 +424,12 @@ var devHTML = (port) => `<!DOCTYPE html>
 </html>`;
 // src/next/commands/dev-command/server/index.ts
-var import_body_parser = __toESM(require("body-parser"));
-var import_path5 = __toESM(require("path"));
-var import_cors = __toESM(require("cors"));
 var import_vite2 = require("vite");
-var import_graphql = require("@tinacms/graphql");
-// src/next/commands/dev-command/server/media.ts
-var import_fs_extra2 = __toESM(require("fs-extra"));
-var import_path2 = __toESM(require("path"));
-var import_busboy = __toESM(require("busboy"));
-var createMediaRouter = (config3) => {
-  const mediaFolder = import_path2.default.join(
-    config3.rootPath,
-    config3.publicFolder,
-    config3.mediaRoot
-  );
-  const mediaModel = new MediaModel(config3);
-  const handleList = async (req, res) => {
-    const requestURL = new URL(req.url, config3.apiURL);
-    const folder = requestURL.pathname.replace("/media/list/", "");
-    const limit = requestURL.searchParams.get("limit");
-    const cursor = requestURL.searchParams.get("cursor");
-    const media = await mediaModel.listMedia({
-      searchPath: folder,
-      cursor,
-      limit
-    });
-    res.end(JSON.stringify(media));
-  };
-  const handleDelete = async (req, res) => {
-    const file = decodeURIComponent(req.url.slice("/media/".length));
-    const didDelete = await mediaModel.deleteMedia({ searchPath: file });
-    res.end(JSON.stringify(didDelete));
-  };
-  const handlePost = async function(req, res) {
-    const bb = (0, import_busboy.default)({ headers: req.headers });
-    bb.on("file", (name2, file, info) => {
-      const saveTo = import_path2.default.join(mediaFolder, info.filename);
-      file.pipe(import_fs_extra2.default.createWriteStream(saveTo));
-    });
-    bb.on("error", (error) => {
-      res.statusCode = 500;
-      if (error instanceof Error) {
-        res.end(JSON.stringify({ message: error }));
-      } else {
-        res.end(JSON.stringify({ message: "Unknown error while uploading" }));
-      }
-    });
-    bb.on("close", () => {
-      res.statusCode = 200;
-      res.end(JSON.stringify({ success: true }));
-    });
-    req.pipe(bb);
-  };
-  return { handleList, handleDelete, handlePost };
-};
-var parseMediaFolder = (str) => {
-  let returnString = str;
-  if (returnString.startsWith("/"))
-    returnString = returnString.substr(1);
-  if (returnString.endsWith("/"))
-    returnString = returnString.substr(0, returnString.length - 1);
-  return returnString;
-};
-var MediaModel = class {
-  constructor({ rootPath, publicFolder, mediaRoot }) {
-    this.rootPath = rootPath;
-    this.mediaRoot = mediaRoot;
-    this.publicFolder = publicFolder;
-  }
-  async listMedia(args) {
-    try {
-      const folderPath = (0, import_path2.join)(
-        this.rootPath,
-        this.publicFolder,
-        this.mediaRoot,
-        args.searchPath
-      );
-      const searchPath = parseMediaFolder(args.searchPath);
-      const filesStr = await import_fs_extra2.default.readdir(folderPath);
-      const filesProm = filesStr.map(async (file) => {
-        const filePath = (0, import_path2.join)(folderPath, file);
-        const stat = await import_fs_extra2.default.stat(filePath);
-        let src = `/${file}`;
-        const isFile = stat.isFile();
-        if (!isFile) {
-          return {
-            isFile,
-            size: stat.size,
-            src,
-            filename: file
-          };
-        }
-        if (searchPath) {
-          src = `/${searchPath}${src}`;
-        }
-        if (this.mediaRoot) {
-          src = `/${this.mediaRoot}${src}`;
-        }
-        return {
-          isFile,
-          size: stat.size,
-          src,
-          filename: file
-        };
-      });
-      const offset = Number(args.cursor) || 0;
-      const limit = Number(args.limit) || 20;
-      const rawItems = await Promise.all(filesProm);
-      const sortedItems = rawItems.sort((a, b) => {
-        if (a.isFile && !b.isFile) {
-          return 1;
-        }
-        if (!a.isFile && b.isFile) {
-          return -1;
-        }
-        return 0;
-      });
-      const limitItems = sortedItems.slice(offset, offset + limit);
-      const files = limitItems.filter((x) => x.isFile);
-      const directories = limitItems.filter((x) => !x.isFile).map((x) => x.src);
-      const cursor = rawItems.length > offset + limit ? String(offset + limit) : null;
-      return {
-        files,
-        directories,
-        cursor
-      };
-    } catch (error) {
-      console.error(error);
-      return {
-        files: [],
-        directories: [],
-        error: error == null ? void 0 : error.toString()
-      };
-    }
-  }
-  async deleteMedia(args) {
-    try {
-      const file = (0, import_path2.join)(
-        this.rootPath,
-        this.publicFolder,
-        this.mediaRoot,
-        args.searchPath
-      );
-      await import_fs_extra2.default.stat(file);
-      await import_fs_extra2.default.remove(file);
-      return { ok: true };
-    } catch (error) {
-      console.error(error);
-      return { ok: false, message: error == null ? void 0 : error.toString() };
-    }
-  }
-};
-// src/next/commands/dev-command/server/index.ts
-var import_esbuild = require("esbuild");
 // src/next/vite/index.ts
-var import_path4 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var import_vite = require("vite");
+var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
 // src/next/vite/tailwind.ts
 var import_tailwindcss = __toESM(require("tailwindcss"));
@@ -585,15 +439,15 @@ var import_defaultTheme = __toESM(require("tailwindcss/defaultTheme.js"));
 var import_typography = __toESM(require("@tailwindcss/typography"));
 var import_line_clamp = __toESM(require("@tailwindcss/line-clamp"));
 var import_aspect_ratio = __toESM(require("@tailwindcss/aspect-ratio"));
-var import_path3 = __toESM(require("path"));
+var import_path2 = __toESM(require("path"));
 var tinaTailwind = (spaPath, configFilePath) => {
   return {
     name: "vite-plugin-tina",
     config: (viteConfig) => {
       const plugins = [];
       const content2 = [
-        import_path3.default.join(spaPath, "src/**/*.{vue,js,ts,jsx,tsx,svelte}"),
-        import_path3.default.join(configFilePath)
+        import_path2.default.join(spaPath, "src/**/*.{vue,js,ts,jsx,tsx,svelte}"),
+        import_path2.default.join(configFilePath, "../**/*.{vue,js,ts,jsx,tsx,svelte}")
       ];
       const tw = (0, import_tailwindcss.default)({
         important: ".tina-tailwind",
@@ -837,7 +691,6 @@ var createConfig = async ({
   database,
   apiURL,
   plugins = [],
-  noSDK,
   noWatch,
   rollupOptions
 }) => {
@@ -862,8 +715,8 @@ var createConfig = async ({
     TINA_IMPORT: configManager.tinaConfigFilePath,
     SCHEMA_IMPORT: configManager.generatedGraphQLJSONPath
   };
-  if (noSDK) {
-    alias["CLIENT_IMPORT"] = import_path4.default.join(
+  if (configManager.shouldSkipSDK()) {
+    alias["CLIENT_IMPORT"] = import_path3.default.join(
       configManager.spaRootPath,
       "src",
       "dummy-client.ts"
@@ -899,12 +752,13 @@ var createConfig = async ({
       }
     },
     build: {
-      sourcemap: true,
+      sourcemap: false,
       outDir: configManager.outputFolderPath,
       emptyOutDir: true,
       rollupOptions
     },
     plugins: [
+      (0, import_plugin_react.default)(),
       (0, import_vite.splitVendorChunkPlugin)(),
       tinaTailwind(configManager.spaRootPath, configManager.tinaConfigFilePath),
       ...plugins
@@ -913,77 +767,246 @@ var createConfig = async ({
   return config3;
 };
-// src/next/commands/dev-command/server/index.ts
-var createDevServer = async (configManager, database, apiURL, noSDK, noWatch) => {
-  const plugins = [
-    {
-      name: "transform-tsx",
-      async transform(code, id) {
-        if (id.startsWith(configManager.rootPath)) {
-          const extName = import_path5.default.extname(id);
-          if (extName.startsWith(".tsx") || extName.startsWith(".ts")) {
-            const result = await (0, import_esbuild.transform)(code, { loader: "tsx" });
-            return {
-              code: result.code
-            };
-          }
+// src/next/vite/plugins.ts
+var import_esbuild = require("esbuild");
+var import_path5 = __toESM(require("path"));
+var import_body_parser = __toESM(require("body-parser"));
+var import_cors = __toESM(require("cors"));
+var import_graphql = require("@tinacms/graphql");
+// src/next/commands/dev-command/server/media.ts
+var import_fs_extra2 = __toESM(require("fs-extra"));
+var import_path4 = __toESM(require("path"));
+var import_busboy = __toESM(require("busboy"));
+var createMediaRouter = (config3) => {
+  const mediaFolder = import_path4.default.join(
+    config3.rootPath,
+    config3.publicFolder,
+    config3.mediaRoot
+  );
+  const mediaModel = new MediaModel(config3);
+  const handleList = async (req, res) => {
+    const requestURL = new URL(req.url, config3.apiURL);
+    const folder = requestURL.pathname.replace("/media/list/", "");
+    const limit = requestURL.searchParams.get("limit");
+    const cursor = requestURL.searchParams.get("cursor");
+    const media = await mediaModel.listMedia({
+      searchPath: folder,
+      cursor,
+      limit
+    });
+    res.end(JSON.stringify(media));
+  };
+  const handleDelete = async (req, res) => {
+    const file = decodeURIComponent(req.url.slice("/media/".length));
+    const didDelete = await mediaModel.deleteMedia({ searchPath: file });
+    res.end(JSON.stringify(didDelete));
+  };
+  const handlePost = async function(req, res) {
+    const bb = (0, import_busboy.default)({ headers: req.headers });
+    bb.on("file", (name2, file, info) => {
+      const saveTo = import_path4.default.join(mediaFolder, info.filename);
+      file.pipe(import_fs_extra2.default.createWriteStream(saveTo));
+    });
+    bb.on("error", (error) => {
+      res.statusCode = 500;
+      if (error instanceof Error) {
+        res.end(JSON.stringify({ message: error }));
+      } else {
+        res.end(JSON.stringify({ message: "Unknown error while uploading" }));
+      }
+    });
+    bb.on("close", () => {
+      res.statusCode = 200;
+      res.end(JSON.stringify({ success: true }));
+    });
+    req.pipe(bb);
+  };
+  return { handleList, handleDelete, handlePost };
+};
+var parseMediaFolder = (str) => {
+  let returnString = str;
+  if (returnString.startsWith("/"))
+    returnString = returnString.substr(1);
+  if (returnString.endsWith("/"))
+    returnString = returnString.substr(0, returnString.length - 1);
+  return returnString;
+};
+var MediaModel = class {
+  constructor({ rootPath, publicFolder, mediaRoot }) {
+    this.rootPath = rootPath;
+    this.mediaRoot = mediaRoot;
+    this.publicFolder = publicFolder;
+  }
+  async listMedia(args) {
+    try {
+      const folderPath = (0, import_path4.join)(
+        this.rootPath,
+        this.publicFolder,
+        this.mediaRoot,
+        args.searchPath
+      );
+      const searchPath = parseMediaFolder(args.searchPath);
+      const filesStr = await import_fs_extra2.default.readdir(folderPath);
+      const filesProm = filesStr.map(async (file) => {
+        const filePath = (0, import_path4.join)(folderPath, file);
+        const stat = await import_fs_extra2.default.stat(filePath);
+        let src = `/${file}`;
+        const isFile = stat.isFile();
+        if (!isFile) {
+          return {
+            isFile,
+            size: stat.size,
+            src,
+            filename: file
+          };
+        }
+        if (searchPath) {
+          src = `/${searchPath}${src}`;
         }
+        if (this.mediaRoot) {
+          src = `/${this.mediaRoot}${src}`;
+        }
+        return {
+          isFile,
+          size: stat.size,
+          src,
+          filename: file
+        };
+      });
+      const offset = Number(args.cursor) || 0;
+      const limit = Number(args.limit) || 20;
+      const rawItems = await Promise.all(filesProm);
+      const sortedItems = rawItems.sort((a, b) => {
+        if (a.isFile && !b.isFile) {
+          return 1;
+        }
+        if (!a.isFile && b.isFile) {
+          return -1;
+        }
+        return 0;
+      });
+      const limitItems = sortedItems.slice(offset, offset + limit);
+      const files = limitItems.filter((x) => x.isFile);
+      const directories = limitItems.filter((x) => !x.isFile).map((x) => x.src);
+      const cursor = rawItems.length > offset + limit ? String(offset + limit) : null;
+      return {
+        files,
+        directories,
+        cursor
+      };
+    } catch (error) {
+      console.error(error);
+      return {
+        files: [],
+        directories: [],
+        error: error == null ? void 0 : error.toString()
+      };
+    }
+  }
+  async deleteMedia(args) {
+    try {
+      const file = (0, import_path4.join)(
+        this.rootPath,
+        this.publicFolder,
+        this.mediaRoot,
+        args.searchPath
+      );
+      await import_fs_extra2.default.stat(file);
+      await import_fs_extra2.default.remove(file);
+      return { ok: true };
+    } catch (error) {
+      console.error(error);
+      return { ok: false, message: error == null ? void 0 : error.toString() };
+    }
+  }
+};
+// src/next/vite/plugins.ts
+var transformTsxPlugin = ({
+  configManager: _configManager
+}) => {
+  const plug = {
+    name: "transform-tsx",
+    async transform(code, id) {
+      const extName = import_path5.default.extname(id);
+      if (extName.startsWith(".tsx") || extName.startsWith(".ts")) {
+        const result = await (0, import_esbuild.transform)(code, { loader: "tsx" });
+        return {
+          code: result.code
+        };
       }
-    },
-    {
-      name: "graphql-endpoints",
-      configureServer(server) {
-        server.middlewares.use((0, import_cors.default)());
-        server.middlewares.use(import_body_parser.default.json());
-        server.middlewares.use(async (req, res, next) => {
-          var _a;
-          const mediaPaths = (_a = configManager.config.media) == null ? void 0 : _a.tina;
-          const mediaRouter = createMediaRouter({
-            rootPath: configManager.rootPath,
-            apiURL,
-            publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
-            mediaRoot: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.mediaRoot) || "")
-          });
-          if (req.url.startsWith("/media/upload")) {
-            await mediaRouter.handlePost(req, res);
-            return;
-          }
-          if (req.url.startsWith("/media")) {
-            if (req.method === "DELETE") {
-              await mediaRouter.handleDelete(req, res);
-              return;
-            }
-          }
-          if (req.url.startsWith("/media/list")) {
-            await mediaRouter.handleList(req, res);
-            return;
-          }
-          if (req.url === "/altair") {
-            res.end(
-              JSON.stringify({
-                status: "The GraphQL playground has moved to <your-dev-url>/index.html#/graphql"
-              })
-            );
-            return;
-          }
-          if (req.url === "/graphql") {
-            const { query, variables } = req.body;
-            const result = await (0, import_graphql.resolve)({
-              config: {
-                useRelativeMedia: true
-              },
-              database,
-              query,
-              variables,
-              verbose: false
-            });
-            res.end(JSON.stringify(result));
+    }
+  };
+  return plug;
+};
+var devServerEndPointsPlugin = ({
+  configManager,
+  apiURL,
+  database
+}) => {
+  const plug = {
+    name: "graphql-endpoints",
+    configureServer(server) {
+      server.middlewares.use((0, import_cors.default)());
+      server.middlewares.use(import_body_parser.default.json());
+      server.middlewares.use(async (req, res, next) => {
+        var _a;
+        const mediaPaths = (_a = configManager.config.media) == null ? void 0 : _a.tina;
+        const mediaRouter = createMediaRouter({
+          rootPath: configManager.rootPath,
+          apiURL,
+          publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
+          mediaRoot: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.mediaRoot) || "")
+        });
+        if (req.url.startsWith("/media/upload")) {
+          await mediaRouter.handlePost(req, res);
+          return;
+        }
+        if (req.url.startsWith("/media")) {
+          if (req.method === "DELETE") {
+            await mediaRouter.handleDelete(req, res);
             return;
           }
-          next();
-        });
-      }
+        }
+        if (req.url.startsWith("/media/list")) {
+          await mediaRouter.handleList(req, res);
+          return;
+        }
+        if (req.url === "/altair") {
+          res.end(
+            JSON.stringify({
+              status: "The GraphQL playground has moved to <your-dev-url>/index.html#/graphql"
+            })
+          );
+          return;
+        }
+        if (req.url === "/graphql") {
+          const { query, variables } = req.body;
+          const result = await (0, import_graphql.resolve)({
+            config: {
+              useRelativeMedia: true
+            },
+            database,
+            query,
+            variables,
+            verbose: false
+          });
+          res.end(JSON.stringify(result));
+          return;
+        }
+        next();
+      });
     }
+  };
+  return plug;
+};
+// src/next/commands/dev-command/server/index.ts
+var createDevServer = async (configManager, database, apiURL, noWatch) => {
+  const plugins = [
+    transformTsxPlugin({ configManager }),
+    devServerEndPointsPlugin({ apiURL, configManager, database })
   ];
   return (0, import_vite2.createServer)(
     await createConfig({
@@ -991,7 +1014,6 @@ var createDevServer = async (configManager, database, apiURL, noSDK, noWatch) =>
       database,
       apiURL,
       plugins,
-      noSDK,
       noWatch,
       rollupOptions: {
         input: configManager.spaMainPath
@@ -1204,14 +1226,12 @@ var Codegen = class {
     configManager,
     port,
     schema,
-    noSDK,
     queryDoc,
     fragDoc
   }) {
     this.configManager = configManager;
     this.port = port;
     this.schema = schema;
-    this.noSDK = noSDK;
     this.queryDoc = queryDoc;
     this.fragDoc = fragDoc;
   }
@@ -1226,7 +1246,7 @@ var Codegen = class {
   }
   async execute() {
     const apiURL = this.getApiURL();
-    if (this.noSDK) {
+    if (this.configManager.shouldSkipSDK()) {
       await this.removeGeneratedFilesIfExists();
       return apiURL;
     }
@@ -1423,7 +1443,7 @@ var import_readable_stream = require("readable-stream");
 var import_net = require("net");
 var import_many_level = require("many-level");
 var import_memory_level = require("memory-level");
-var createDBServer = () => {
+var createDBServer = (port) => {
   const levelHost = new import_many_level.ManyLevelHost(
     new import_memory_level.MemoryLevel({
       valueEncoding: "json"
@@ -1435,10 +1455,12 @@ var createDBServer = () => {
   });
   dbServer.once("error", (err) => {
     if ((err == null ? void 0 : err.code) === "EADDRINUSE") {
-      throw new Error(`Tina Dev server is already in use`);
+      throw new Error(
+        `Tina Dev server is already in use. Datalayer server is busy on port ${port}`
+      );
     }
   });
-  dbServer.listen(9e3);
+  dbServer.listen(port);
 };
 async function createAndInitializeDatabase(configManager, bridgeOverride) {
   let database;
@@ -1508,6 +1530,9 @@ var DevCommand = class extends import_clipanion.Command {
     this.port = import_clipanion.Option.String("-p,--port", "4001", {
       description: "Specify a port to run the server on. (default 4001)"
     });
+    this.datalayerPort = import_clipanion.Option.String("--datalayer-port", "9000", {
+      description: "Specify a port to run the datalayer server on. (default 4001)"
+    });
     this.subCommand = import_clipanion.Option.String("-c,--command", {
       description: "The sub-command to run"
     });
@@ -1530,7 +1555,7 @@ var DevCommand = class extends import_clipanion.Command {
       description: "Don't regenerate config on file changes"
     });
     this.noSDK = import_clipanion.Option.Boolean("--noSDK", false, {
-      description: "Don't generate the generated client SDK"
+      description: "DEPRECATED - This should now be set in the config at client.skip = true'. Don't generate the generated client SDK"
     });
     this.noTelemetry = import_clipanion.Option.Boolean("--noTelemetry", false, {
       description: "Disable anonymous telemetry that is collected"
@@ -1555,9 +1580,17 @@ var DevCommand = class extends import_clipanion.Command {
         "--experimentalDataLayer has been deprecated, the data layer is now built-in automatically"
       );
     }
-    const configManager = new ConfigManager(this.rootPath);
+    if (this.noSDK) {
+      logger.warn(
+        "--noSDK has been deprecated, and will be unsupported in a future release. This should be set in the config at client.skip = true"
+      );
+    }
+    const configManager = new ConfigManager({
+      rootPath: this.rootPath,
+      legacyNoSDK: this.noSDK
+    });
     logger.info("Starting Tina Dev Server");
-    createDBServer();
+    createDBServer(Number(this.datalayerPort));
     let database = null;
     const setup = async ({ firstTime }) => {
       try {
@@ -1600,7 +1633,6 @@ var DevCommand = class extends import_clipanion.Command {
         schema: await (0, import_graphql8.getASTSchema)(database),
         configManager,
         port: Number(this.port),
-        noSDK: this.noSDK,
         queryDoc,
         fragDoc
       });
@@ -1637,7 +1669,6 @@ var DevCommand = class extends import_clipanion.Command {
       configManager,
       database,
       apiURL,
-      this.noSDK,
       this.noWatch
     );
     await server.listen(Number(this.port));
@@ -1689,7 +1720,7 @@ var DevCommand = class extends import_clipanion.Command {
         ]
       }
     ];
-    if (!this.noSDK) {
+    if (!configManager.shouldSkipSDK()) {
       summaryItems.push({
         emoji: "\u{1F916}",
         heading: "Auto-generated files",
@@ -1786,7 +1817,7 @@ var import_graphql9 = require("@tinacms/graphql");
 // src/next/commands/build-command/server.ts
 var import_vite4 = require("vite");
-var buildProductionSpa = async (configManager, database, apiURL, noSDK) => {
+var buildProductionSpa = async (configManager, database, apiURL) => {
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
     if (key.startsWith("TINA_PUBLIC_") || key.startsWith("NEXT_PUBLIC_") || key === "NODE_ENV" || key === "HEAD") {
@@ -1805,10 +1836,10 @@ var buildProductionSpa = async (configManager, database, apiURL, noSDK) => {
     }
   });
   const config3 = await createConfig({
+    plugins: [transformTsxPlugin({ configManager })],
     configManager,
     database,
     apiURL,
-    noSDK,
     noWatch: true
   });
   return (0, import_vite4.build)(config3);
@@ -1929,7 +1960,10 @@ var BuildCommand = class extends import_clipanion2.Command {
       description: "increase verbosity of logged output"
     });
     this.noSDK = import_clipanion2.Option.Boolean("--noSDK", false, {
-      description: "Don't generate the generated client SDK"
+      description: "DEPRECATED - This should now be set in the config at client.skip = true'. Don't generate the generated client SDK"
+    });
+    this.datalayerPort = import_clipanion2.Option.String("--datalayer-port", "9000", {
+      description: "Specify a port to run the datalayer server on. (default 4001)"
     });
     this.isomorphicGitBridge = import_clipanion2.Option.Boolean("--isomorphicGitBridge", {
       description: "DEPRECATED - Enable Isomorphic Git Bridge Implementation"
@@ -1952,10 +1986,11 @@ var BuildCommand = class extends import_clipanion2.Command {
     process.exit(1);
   }
   async execute() {
-    const configManager = new ConfigManager(
-      this.rootPath,
-      this.tinaGraphQLVersion
-    );
+    const configManager = new ConfigManager({
+      rootPath: this.rootPath,
+      tinaGraphQLVersion: this.tinaGraphQLVersion,
+      legacyNoSDK: this.noSDK
+    });
     logger.info("Starting Tina build");
     if (this.isomorphicGitBridge) {
       logger.warn("--isomorphicGitBridge has been deprecated");
@@ -1968,6 +2003,11 @@ var BuildCommand = class extends import_clipanion2.Command {
     if (this.localOption) {
       logger.warn("--local has been deprecated");
     }
+    if (this.noSDK) {
+      logger.warn(
+        "--noSDK has been deprecated, and will be unsupported in a future release. This should be set in the config at client.skip = true"
+      );
+    }
     try {
       await configManager.processConfig();
     } catch (e) {
@@ -1975,7 +2015,7 @@ var BuildCommand = class extends import_clipanion2.Command {
       logger.error("Unable to build, please fix your Tina config and try again");
       process.exit(1);
     }
-    createDBServer();
+    createDBServer(Number(this.datalayerPort));
     const database = await createAndInitializeDatabase(configManager);
     const { queryDoc, fragDoc } = await (0, import_graphql9.buildSchema)(
       database,
@@ -1984,7 +2024,6 @@ var BuildCommand = class extends import_clipanion2.Command {
     const codegen2 = new Codegen({
       schema: await (0, import_graphql9.getASTSchema)(database),
       configManager,
-      noSDK: this.noSDK,
       queryDoc,
       fragDoc
     });
@@ -1992,13 +2031,13 @@ var BuildCommand = class extends import_clipanion2.Command {
     await this.checkClientInfo(configManager, apiURL);
     await waitForDB(configManager.config, apiURL, false);
     await this.checkGraphqlSchema(configManager, database, apiURL);
-    await buildProductionSpa(configManager, database, apiURL, this.noSDK);
+    await buildProductionSpa(configManager, database, apiURL);
     await import_fs_extra5.default.outputFile(
       configManager.outputGitignorePath,
       "index.html\nassets/"
     );
     const summaryItems = [];
-    if (!this.noSDK) {
+    if (!configManager.shouldSkipSDK()) {
       summaryItems.push({
         emoji: "\u{1F916}",
         heading: "Auto-generated files",
@@ -2036,13 +2075,13 @@ var BuildCommand = class extends import_clipanion2.Command {
     const { config: config3 } = configManager;
     const token = config3.token;
     const { clientId, branch, host } = (0, import_schema_tools2.parseURL)(apiURL);
-    const url2 = `https://${host}/db/${clientId}/status/${branch}`;
+    const url = `https://${host}/db/${clientId}/status/${branch}`;
     const bar2 = new import_progress2.default("Checking clientId and token. :prog", 1);
     let branchKnown = false;
     try {
       const res = await request({
         token,
-        url: url2
+        url
       });
       bar2.tick({
         prog: "\u2705"
@@ -2084,7 +2123,7 @@ var BuildCommand = class extends import_clipanion2.Command {
         fn: async () => {
           const res = await request({
             token,
-            url: url2
+            url
           });
           if (this.verbose) {
             logger.info(
@@ -2157,8 +2196,8 @@ async function request(args) {
     headers.append("X-API-KEY", args.token);
   }
   headers.append("Content-Type", "application/json");
-  const url2 = args == null ? void 0 : args.url;
-  const res = await (0, import_node_fetch2.default)(url2, {
+  const url = args == null ? void 0 : args.url;
+  const res = await (0, import_node_fetch2.default)(url, {
     method: "GET",
     headers,
     redirect: "follow"
@@ -2192,7 +2231,7 @@ Message from server: ${json.message}`;
   };
 }
 var fetchRemoteGraphqlSchema = async ({
-  url: url2,
+  url,
   token
 }) => {
   const headers = new import_node_fetch2.Headers();
@@ -2201,7 +2240,7 @@ var fetchRemoteGraphqlSchema = async ({
   }
   const body = JSON.stringify({ query: (0, import_graphql10.getIntrospectionQuery)(), variables: {} });
   headers.append("Content-Type", "application/json");
-  const res = await (0, import_node_fetch2.default)(url2, {
+  const res = await (0, import_node_fetch2.default)(url, {
     method: "POST",
     headers,
     body
@@ -2212,13 +2251,12 @@ var fetchRemoteGraphqlSchema = async ({
 // src/next/commands/audit-command/index.ts
 var import_clipanion3 = require("clipanion");
-var import_graphql13 = require("@tinacms/graphql");
+var import_graphql12 = require("@tinacms/graphql");
 // src/next/commands/audit-command/audit.ts
 var import_prompts = __toESM(require("prompts"));
 var import_metrics = require("@tinacms/metrics");
 var import_graphql11 = require("@tinacms/graphql");
-var import_graphql12 = require("@tinacms/graphql");
 var import_chalk4 = __toESM(require("chalk"));
 var audit = async ({
   database,
@@ -2331,14 +2369,12 @@ var auditDocuments = async (args) => {
           }
         });
       }
-      const params = transformDocumentIntoMutationRequestPayload(
+      const tinaSchema = await database.getSchema();
+      const values = mergeValuesWithDefaults(
         docResult.data.document._values,
-        {
-          includeCollection: true,
-          includeTemplate: typeof collection.templates !== "undefined"
-        },
         topLevelDefaults
       );
+      const params = tinaSchema.transformPayload(collection.name, values);
       const mutation = `mutation($collection: String!, $relativePath: String!, $params: DocumentUpdateMutation!) {
         updateDocument(
           collection: $collection,
@@ -2368,46 +2404,8 @@ var auditDocuments = async (args) => {
   }
   return error;
 };
-var transformDocumentIntoMutationRequestPayload = (document, instructions, defaults) => {
-  const { _collection, __typename, _template, ...rest } = document;
-  const params = transformParams(rest);
-  const paramsWithTemplate = instructions.includeTemplate ? { [_template]: params } : params;
-  return instructions.includeCollection ? { [_collection]: { ...defaults, ...filterObject(paramsWithTemplate) } } : { ...defaults, ...filterObject(paramsWithTemplate) };
-};
-var transformParams = (data) => {
-  if (["string", "number", "boolean"].includes(typeof data)) {
-    return data;
-  }
-  if (Array.isArray(data)) {
-    return data.map((item) => transformParams(item));
-  }
-  try {
-    (0, import_graphql12.assertShape)(
-      data,
-      (yup) => yup.object({ _template: yup.string().required() })
-    );
-    const { _template, __typename, ...rest } = data;
-    const nested = transformParams(rest);
-    return { [_template]: nested };
-  } catch (e) {
-    if (e.message === "Failed to assertShape - _template is a required field") {
-      if (!data) {
-        return void 0;
-        return [];
-      }
-      const accum = {};
-      Object.entries(data).map(([keyName, value]) => {
-        accum[keyName] = transformParams(value);
-      });
-      return accum;
-    } else {
-      if (!data) {
-        return void 0;
-        return [];
-      }
-      throw e;
-    }
-  }
+var mergeValuesWithDefaults = (document, defaults) => {
+  return { ...defaults, ...filterObject(document) };
 };
 function filterObject(obj) {
   const ret = {};
@@ -2416,7 +2414,7 @@ function filterObject(obj) {
 }
 // src/next/commands/audit-command/index.ts
-var import_graphql14 = require("@tinacms/graphql");
+var import_graphql13 = require("@tinacms/graphql");
 var AuditCommand = class extends import_clipanion3.Command {
   constructor() {
     super(...arguments);
@@ -2435,6 +2433,9 @@ var AuditCommand = class extends import_clipanion3.Command {
     this.noTelemetry = import_clipanion3.Option.Boolean("--noTelemetry", false, {
       description: "Disable anonymous telemetry that is collected"
     });
+    this.datalayerPort = import_clipanion3.Option.String("--datalayer-port", "9000", {
+      description: "Specify a port to run the datalayer server on. (default 4001)"
+    });
   }
   async catch(error) {
     logger.error("Error occured during tinacms audit");
@@ -2444,7 +2445,7 @@ var AuditCommand = class extends import_clipanion3.Command {
     process.exit(1);
   }
   async execute() {
-    const configManager = new ConfigManager(this.rootPath);
+    const configManager = new ConfigManager({ rootPath: this.rootPath });
     logger.info("Starting Tina Audit");
     try {
       await configManager.processConfig();
@@ -2452,12 +2453,12 @@ var AuditCommand = class extends import_clipanion3.Command {
       logger.error(e.message);
       process.exit(1);
     }
-    createDBServer();
+    createDBServer(Number(this.datalayerPort));
     const database = await createAndInitializeDatabase(
       configManager,
-      this.clean ? void 0 : new import_graphql14.AuditFileSystemBridge(configManager.rootPath)
+      this.clean ? void 0 : new import_graphql13.AuditFileSystemBridge(configManager.rootPath)
     );
-    const { tinaSchema, graphQLSchema } = await (0, import_graphql13.buildSchema)(
+    const { tinaSchema, graphQLSchema } = await (0, import_graphql12.buildSchema)(
       database,
       configManager.config
     );
@@ -2842,6 +2843,13 @@ var configExamples = {
   jekyll: other
 };
+// src/cmds/forestry-migrate/index.ts
+var import_fs_extra7 = __toESM(require("fs-extra"));
+var import_path8 = __toESM(require("path"));
+var import_js_yaml2 = __toESM(require("js-yaml"));
+var import_minimatch = __toESM(require("minimatch"));
+var import_graphql14 = require("@tinacms/graphql");
 // src/cmds/forestry-migrate/util/index.ts
 var import_fs_extra6 = __toESM(require("fs-extra"));
 var import_path7 = __toESM(require("path"));
@@ -2855,28 +2863,29 @@ var ErrorSingleton = class {
   static getInstance() {
     if (!ErrorSingleton.instance) {
       ErrorSingleton.instance = new ErrorSingleton();
-      ErrorSingleton.instance.allErrorNames = [];
+      ErrorSingleton.instance.collectionNameErrors = [];
     }
     return ErrorSingleton.instance;
   }
   addErrorName(error) {
-    this.allErrorNames.push(error);
+    this.collectionNameErrors.push(error);
   }
-  printNameErrors() {
-    logger.error(
-      dangerText("ERROR: TinaCMS only supports alphanumeric field names")
-    );
-    logger.error(
-      `If you wish to edit any of the following fields or template names you will have to update your content and code to use the new name. See ${linkText(
-        "https://tina.io/docs/forestry/common-errors/#migrating-fields-with-non-alphanumeric-characters"
-      )} for more information.`
-    );
-    logger.error("The following template and field names have been renamed:`");
-    this.allErrorNames.forEach((error) => {
+  printCollectionNameErrors() {
+    var _a;
+    if ((_a = this.collectionNameErrors) == null ? void 0 : _a.length) {
       logger.error(
-        `- Content that uses ${error.template}.yaml: ${error.name} -> ${error.newName}`
+        dangerText("ERROR: TinaCMS only supports alphanumeric template names")
       );
-    });
+      logger.error("The following templates have been renamed:");
+      this.collectionNameErrors.forEach((error) => {
+        logger.error(`- ${error.template}.yaml -> ${error.newName}`);
+      });
+      logger.error(
+        `If you wish to edit any of the following templates, you will have to update your content and code to use the new name. See ${linkText(
+          "https://tina.io/docs/forestry/common-errors/#migrating-fields-with-non-alphanumeric-characters"
+        )} for more information.`
+      );
+    }
   }
 };
@@ -2982,11 +2991,12 @@ var FrontmatterTemplateSchema = import_zod.default.object({
 });
 var transformForestryFieldsToTinaFields = ({
   fields,
-  rootPath,
+  pathToForestryConfig,
   template,
   skipBlocks = false
 }) => {
   const tinaFields = [];
+  const blockFields = [];
   fields == null ? void 0 : fields.forEach((forestryField2) => {
     var _a, _b, _c, _d;
     if (forestryField2.name === "menu") {
@@ -3054,6 +3064,14 @@ var transformForestryFieldsToTinaFields = ({
           label: forestryField2.label
         };
         break;
+      case "image_gallery":
+        field = {
+          type: "image",
+          ...getTinaFieldsFromName(forestryField2.name),
+          label: forestryField2.label,
+          list: true
+        };
+        break;
       case "select":
         if ((_a = forestryField2.config) == null ? void 0 : _a.options) {
           field = {
@@ -3099,7 +3117,7 @@ var transformForestryFieldsToTinaFields = ({
           label: forestryField2.label,
           fields: transformForestryFieldsToTinaFields({
             fields: forestryField2.fields,
-            rootPath,
+            pathToForestryConfig,
             template,
             skipBlocks
           })
@@ -3114,20 +3132,22 @@ var transformForestryFieldsToTinaFields = ({
           fields: transformForestryFieldsToTinaFields({
             fields: forestryField2.fields,
             template,
-            rootPath,
+            pathToForestryConfig,
             skipBlocks
           })
         };
         break;
       case "blocks":
-        if (skipBlocks)
+        if (skipBlocks) {
+          blockFields.push(forestryField2.name);
           break;
+        }
         const templates = [];
         forestryField2 == null ? void 0 : forestryField2.template_types.forEach((tem) => {
           const { fields: fields2, template: template2 } = getFieldsFromTemplates({
             tem,
             skipBlocks: true,
-            rootPath: process.cwd()
+            pathToForestryConfig
           });
           const t = {
             fields: fields2,
@@ -3144,7 +3164,6 @@ var transformForestryFieldsToTinaFields = ({
           templates
         };
         break;
-      case "image_gallery":
       case "include":
         logger.info(
           warnText(
@@ -3166,11 +3185,22 @@ var transformForestryFieldsToTinaFields = ({
       tinaFields.push(field);
     }
   });
+  if (blockFields.length > 0) {
+    logger.info(
+      warnText(
+        `Skipping blocks field${blockFields.length > 1 ? "s" : ""}: ${blockFields.map((b) => `"${b}"`).join(
+          ", "
+        )}" in ${template}.yaml. Blocks fields need to be manually imported: ${linkText(
+          "https://tina.io/docs/forestry/common-errors/#migrating-blocks"
+        )}`
+      )
+    );
+  }
   return tinaFields;
 };
-var getFieldsFromTemplates = ({ tem, rootPath, skipBlocks = false }) => {
+var getFieldsFromTemplates = ({ tem, pathToForestryConfig, skipBlocks = true }) => {
   const templatePath = import_path7.default.join(
-    rootPath,
+    pathToForestryConfig,
     ".forestry",
     "front_matter",
     "templates",
@@ -3190,7 +3220,7 @@ var getFieldsFromTemplates = ({ tem, rootPath, skipBlocks = false }) => {
   const template = parseTemplates({ val: templateObj });
   const fields = transformForestryFieldsToTinaFields({
     fields: template.fields,
-    rootPath,
+    pathToForestryConfig,
     template: tem,
     skipBlocks
   });
@@ -3200,25 +3230,12 @@ var parseTemplates = ({ val }) => {
   const template = FrontmatterTemplateSchema.parse(val);
   return template;
 };
-var hasForestryConfig = async ({ rootPath }) => {
-  const forestryPath = import_path7.default.join(rootPath, ".forestry", "settings.yml");
-  const exists = await import_fs_extra6.default.pathExists(forestryPath);
-  return {
-    path: forestryPath,
-    exists
-  };
-};
 var parseSections = ({ val }) => {
   const schema = forestryConfigSchema.parse(val);
   return schema;
 };
 // src/cmds/forestry-migrate/index.ts
-var import_fs_extra7 = __toESM(require("fs-extra"));
-var import_path8 = __toESM(require("path"));
-var import_js_yaml2 = __toESM(require("js-yaml"));
-var import_minimatch = __toESM(require("minimatch"));
-var import_graphql15 = require("@tinacms/graphql");
 var BODY_FIELD = {
   type: "rich-text",
   name: "body",
@@ -3229,18 +3246,34 @@ var BODY_FIELD = {
 var stringifyLabel = (label) => {
   return label.replace(/[^a-zA-Z0-9]/g, "_").toLowerCase();
 };
-var generateAllCollections = async ({
-  rootPath
+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}`);
+  }
+  return newMatch;
+};
+function checkExt(ext) {
+  const extReal = ext.replace(".", "");
+  if (["mdx", "md", "json", "yaml", "yml", "toml"].includes(extReal)) {
+    return extReal;
+  } else {
+    return false;
+  }
+}
+var generateAllTemplates = async ({
+  pathToForestryConfig
 }) => {
   const allTemplates = (await import_fs_extra7.default.readdir(
-    import_path8.default.join(rootPath, ".forestry", "front_matter", "templates")
+    import_path8.default.join(pathToForestryConfig, ".forestry", "front_matter", "templates")
   )).map((tem) => import_path8.default.basename(tem, ".yml"));
   const templateMap = /* @__PURE__ */ new Map();
   const proms = allTemplates.map(async (tem) => {
     try {
       const { fields, templateObj } = getFieldsFromTemplates({
         tem,
-        rootPath
+        pathToForestryConfig
       });
       templateMap.set(tem, { fields, templateObj });
     } catch (e) {
@@ -3252,158 +3285,176 @@ var generateAllCollections = async ({
   await Promise.all(proms);
   return templateMap;
 };
-var generateCollections = async ({
-  forestryPath,
-  rootPath
-}) => {
-  const templateMap = await generateAllCollections({ rootPath });
-  const forestryConfig = await import_fs_extra7.default.readFile(forestryPath);
-  const forestryYaml = import_js_yaml2.default.load(forestryConfig.toString());
-  const forestrySchema = parseSections({ val: forestryYaml });
-  const collections = [];
-  const sections = forestrySchema.sections;
-  for (let index = 0; index < sections.length; index++) {
-    const section = sections[index];
+var generateCollectionFromForestrySection = (section, templateMap) => {
+  if (section.read_only)
+    return;
+  {
     if (section.read_only)
       return;
-    switch (section.type) {
-      case "directory":
-        const forestryTemplates = (section == null ? void 0 : section.templates) || [];
-        if (forestryTemplates.length === 0 && section.create === "all") {
-          for (let templateKey of templateMap.keys()) {
-            const { templateObj } = templateMap.get(templateKey);
-            const pages = templateObj == null ? void 0 : templateObj.pages;
-            if (pages) {
-              if (pages.some(
-                (page) => (0, import_minimatch.default)(page, section.path + "/" + section.match)
-              )) {
-                forestryTemplates.push(templateKey);
-              }
+    const baseCollection = {
+      label: section.label,
+      name: stringifyLabel(section.label),
+      path: section.path
+    };
+    if (section.match) {
+      baseCollection.match = {
+        ...(baseCollection == null ? void 0 : baseCollection.match) || {},
+        include: transformForestryMatchToTinaMatch(section.match)
+      };
+    }
+    if (section.exclude) {
+      baseCollection.match = {
+        ...(baseCollection == null ? void 0 : baseCollection.match) || {},
+        exclude: transformForestryMatchToTinaMatch(section.exclude)
+      };
+    }
+    if (section.type === "directory") {
+      const forestryTemplates = (section == null ? void 0 : section.templates) || [];
+      if (forestryTemplates.length === 0 && section.create === "all") {
+        for (let templateKey of templateMap.keys()) {
+          const { templateObj } = templateMap.get(templateKey);
+          const pages = templateObj == null ? void 0 : templateObj.pages;
+          if (pages) {
+            if (pages.some(
+              (page) => (0, import_minimatch.default)(page, section.path + "/" + section.match)
+            )) {
+              forestryTemplates.push(templateKey);
             }
           }
         }
-        if (((forestryTemplates == null ? void 0 : forestryTemplates.length) || 0) > 1) {
-          const templates = [];
-          forestryTemplates.forEach((tem) => {
-            var _a;
-            try {
-              const { fields, templateObj } = templateMap.get(tem);
-              templates.push({
-                fields: [BODY_FIELD, ...fields],
-                label: tem,
-                name: stringifyLabel(tem)
-              });
-              (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
-                try {
-                  const filePath = import_path8.default.join(rootPath, page);
-                  const extname = import_path8.default.extname(filePath);
-                  const fileContent = import_fs_extra7.default.readFileSync(filePath).toString();
-                  const content2 = (0, import_graphql15.parseFile)(
-                    fileContent,
-                    extname,
-                    (yup) => yup.object({})
-                  );
-                  const newContent = {
-                    _template: stringifyLabel(tem),
-                    ...content2
-                  };
-                  import_fs_extra7.default.writeFileSync(
-                    filePath,
-                    (0, import_graphql15.stringifyFile)(newContent, extname, true)
-                  );
-                } catch (error) {
-                  console.log("Error updating file", page);
-                }
-              });
-            } catch (e) {
-              console.log("Error parsing template ", tem);
-              console.error(e);
-            }
-          });
-          const c = {
-            label: section.label,
-            name: stringifyLabel(section.label),
-            path: section.path,
-            templates
+      }
+      const c = ((forestryTemplates == null ? void 0 : forestryTemplates.length) || 0) > 1 ? {
+        ...baseCollection,
+        templates: forestryTemplates.map((tem) => {
+          const { fields } = templateMap.get(tem);
+          return {
+            fields: [BODY_FIELD, ...fields],
+            label: tem,
+            name: stringifyLabel(tem)
           };
-          if ((section == null ? void 0 : section.create) === "none") {
-            c.ui = {
-              ...c.ui,
-              allowedActions: {
-                create: false
-              }
-            };
-          }
-          collections.push(c);
-        } else {
-          const fields = [BODY_FIELD];
-          forestryTemplates == null ? void 0 : forestryTemplates.forEach((tem) => {
-            var _a;
+        })
+      } : {
+        ...baseCollection,
+        fields: [
+          BODY_FIELD,
+          ...(forestryTemplates || []).flatMap((tem) => {
             try {
-              const { fields: additionalFields, templateObj } = templateMap.get(tem);
-              fields.push(...additionalFields);
-              (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
-                try {
-                  const filePath = import_path8.default.join(rootPath, page);
-                  const extname = import_path8.default.extname(filePath);
-                  const fileContent = import_fs_extra7.default.readFileSync(filePath).toString();
-                  const content2 = (0, import_graphql15.parseFile)(
-                    fileContent,
-                    extname,
-                    (yup) => yup.object({})
-                  );
-                  const newContent = {
-                    _template: stringifyLabel(tem),
-                    ...content2
-                  };
-                  import_fs_extra7.default.writeFileSync(
-                    filePath,
-                    (0, import_graphql15.stringifyFile)(newContent, extname, true)
-                  );
-                } catch (error) {
-                  logger.log("Error updating file", page);
-                }
-              });
+              const { fields: additionalFields } = templateMap.get(tem);
+              return additionalFields;
             } catch (e) {
               logger.log("Error parsing template ", tem);
-              console.error(e);
+              return [];
             }
-          });
-          const c = {
-            label: section.label,
-            name: stringifyLabel(section.label),
-            path: section.path,
-            fields
-          };
-          if ((section == null ? void 0 : section.create) === "none") {
-            c.ui = {
-              ...c.ui,
-              allowedActions: {
-                create: false
-              }
-            };
+          })
+        ]
+      };
+      if ((section == null ? void 0 : section.create) === "none") {
+        c.ui = {
+          ...c.ui,
+          allowedActions: {
+            create: false
           }
-          collections.push(c);
+        };
+      }
+      return c;
+    } else if (section.type === "document") {
+      const filePath = section.path;
+      const extname = import_path8.default.extname(filePath);
+      const fileName = import_path8.default.basename(filePath, extname);
+      const dir = import_path8.default.dirname(filePath);
+      const ext = checkExt(extname);
+      if (ext) {
+        const fields = [];
+        if (ext === "md" || ext === "mdx") {
+          fields.push(BODY_FIELD);
         }
-        break;
-      case "document":
-        console.log(
+        for (let currentTemplateName of templateMap.keys()) {
+          const { templateObj, fields: additionalFields } = templateMap.get(currentTemplateName);
+          const pages = (templateObj == null ? void 0 : templateObj.pages) || [];
+          if (pages.includes(section.path)) {
+            fields.push(...additionalFields);
+            break;
+          }
+        }
+        if (fields.length === 0) {
+          fields.push({
+            name: "dummy",
+            label: "Dummy field",
+            type: "string",
+            description: "This is a dummy field, please replace it with the fields you want to edit. See https://tina.io/docs/schema/ for more info"
+          });
+          logger.warn(
+            warnText(
+              `No fields found for ${section.path}. Please add the fields you want to edit to the ${section.label} collection in the config file.`
+            )
+          );
+        }
+        return {
+          ...baseCollection,
+          path: dir,
+          format: ext,
+          ui: {
+            allowedActions: {
+              create: false,
+              delete: false
+            }
+          },
+          match: {
+            include: fileName
+          },
+          fields
+        };
+      } else {
+        logger.log(
           warnText(
-            `Single Document are not supported in TinaCMS yet. Skipping section ${section.label} (${section.path})`
+            `Error: document section has an unsupported file extension: ${extname} in ${section.path}`
           )
         );
-        break;
+      }
     }
   }
-  return collections;
+};
+var generateCollections = async ({
+  pathToForestryConfig
+}) => {
+  const templateMap = await generateAllTemplates({ pathToForestryConfig });
+  const forestryConfig = await import_fs_extra7.default.readFile(
+    import_path8.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+  );
+  rewriteTemplateKeysInDocs(templateMap, pathToForestryConfig);
+  return parseSections({ val: import_js_yaml2.default.load(forestryConfig.toString()) }).sections.map(
+    (section) => generateCollectionFromForestrySection(section, templateMap)
+  ).filter((c) => c !== void 0);
+};
+var rewriteTemplateKeysInDocs = (templateMap, rootPath) => {
+  var _a;
+  for (const templateKey of templateMap.keys()) {
+    const { templateObj } = templateMap.get(templateKey);
+    (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
+      try {
+        const filePath = import_path8.default.join(page);
+        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 newContent = {
+          _template: stringifyLabel(templateKey),
+          ...content2
+        };
+        import_fs_extra7.default.writeFileSync(filePath, (0, import_graphql14.stringifyFile)(newContent, extname, true));
+      } catch (error) {
+        console.log(
+          dangerText("Error updating template -> _template in ", page)
+        );
+      }
+    });
+  }
 };
 // src/cmds/init/index.ts
 async function initStaticTina({
-  rootPath,
+  pathToForestryConfig,
   noTelemetry
 }) {
-  const baseDir = rootPath;
   logger.level = "info";
   const clientId = await chooseClientId();
   let token = null;
@@ -3414,17 +3465,18 @@ async function initStaticTina({
   const framework = await chooseFramework();
   const usingTypescript = await chooseTypescript();
   const publicFolder = await choosePublicFolder({ framework });
-  const forestryPath = await hasForestryConfig({ rootPath });
   let collections;
-  if (forestryPath.exists) {
+  const hasForestryConfig = await import_fs_extra8.default.pathExists(
+    import_path9.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+  );
+  if (hasForestryConfig) {
     collections = await forestryMigrate({
-      forestryPath: forestryPath.path,
-      rootPath
+      pathToForestryConfig
     });
   }
   await reportTelemetry({
     usingTypescript,
-    hasForestryConfig: forestryPath.exists,
+    hasForestryConfig,
     noTelemetry
   });
   const hasPackageJSON = await import_fs_extra8.default.pathExistsSync("package.json");
@@ -3433,31 +3485,34 @@ async function initStaticTina({
   }
   const hasGitignore = await import_fs_extra8.default.pathExistsSync(".gitignore");
   if (!hasGitignore) {
-    await createGitignore({ baseDir });
+    await createGitignore({ baseDir: "" });
   } else {
     const hasNodeModulesIgnored = await checkGitignoreForNodeModules({
-      baseDir
+      baseDir: ""
     });
     if (!hasNodeModulesIgnored) {
-      await addNodeModulesToGitignore({ baseDir });
+      await addNodeModulesToGitignore({ baseDir: "" });
     }
   }
   await addDependencies(packageManager);
   await addConfigFile({
-    publicFolder,
-    baseDir,
+    publicFolder: import_path9.default.join(
+      import_path9.default.relative(process.cwd(), pathToForestryConfig),
+      publicFolder
+    ),
+    baseDir: "",
     usingTypescript,
     framework,
     collections,
     token,
     clientId
   });
-  if (!forestryPath.exists) {
-    await addContentFile({ baseDir });
+  if (!hasForestryConfig) {
+    await addContentFile({ baseDir: "" });
   }
   if (framework.reactive) {
     await addReactiveFile[framework.name]({
-      baseDir,
+      baseDir: "",
       framework,
       usingTypescript
     });
@@ -3549,48 +3604,30 @@ var chooseFramework = async () => {
   return option["selection"];
 };
 var forestryMigrate = async ({
-  forestryPath,
-  rootPath
+  pathToForestryConfig
 }) => {
-  logger.info(
-    `It looks like you have a ${focusText(
-      ".forestry/settings.yml"
-    )} file in your project.`
-  );
-  logger.info(
-    `This migration will update some of your content to match tina.  Please ${focusText(
-      "save a backup of your content"
-    )} before doing this migration. (This can be done with git)`
+  logger.info(`Forestry.io configuration found.`);
+  const disclaimer = logText(
+    `Note: This migration will update some of your content to match tina.  Please save a backup of your content before doing this migration. (This can be done with git)`
   );
   const option = await (0, import_prompts2.default)({
     name: "selection",
     type: "confirm",
     initial: true,
-    message: `Please note that this is a beta version and may contain some issues
-Would you like to migrate your Forestry templates?
-${logText(
-      "Note: This migration will not be perfect, but it will get you started."
-    )}`
+    message: `Would you like to migrate your Forestry templates?
+${disclaimer}`
   });
   if (!option["selection"]) {
     return null;
   }
-  const delay = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
-  await spin({
-    waitFor: async () => {
-      await delay(2e3);
-    },
-    text: ""
-  });
   const collections = await generateCollections({
-    forestryPath,
-    rootPath
+    pathToForestryConfig
   });
-  ErrorSingleton.getInstance().printNameErrors();
+  ErrorSingleton.getInstance().printCollectionNameErrors();
   return JSON.stringify(collections, null, 2);
 };
 var reportTelemetry = async ({
-  hasForestryConfig: hasForestryConfig2,
+  hasForestryConfig,
   noTelemetry,
   usingTypescript
 }) => {
@@ -3603,7 +3640,7 @@ var reportTelemetry = async ({
     event: {
       name: "tinacms:cli:init:invoke",
       schemaFileType,
-      hasForestryConfig: hasForestryConfig2
+      hasForestryConfig
     }
   });
 };
@@ -3788,8 +3825,8 @@ function execShellCommand(cmd) {
 var InitCommand = class extends import_clipanion4.Command {
   constructor() {
     super(...arguments);
-    this.rootPath = import_clipanion4.Option.String("--rootPath", {
-      description: "Specify the root directory to run the CLI from"
+    this.pathToForestryConfig = import_clipanion4.Option.String("--forestryPath", {
+      description: "Specify the relative path to the .forestry directory, if importing an existing forestry site."
     });
     this.noTelemetry = import_clipanion4.Option.Boolean("--noTelemetry", false, {
       description: "Disable anonymous telemetry that is collected"
@@ -3802,7 +3839,7 @@ var InitCommand = class extends import_clipanion4.Command {
   }
   async execute() {
     await initStaticTina({
-      rootPath: this.rootPath || process.cwd(),
+      pathToForestryConfig: this.pathToForestryConfig || process.cwd(),
       noTelemetry: this.noTelemetry
     });
     process.exit();