@tinacms/cli 0.57.0 → 0.58.1

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # tinacms-cli
 
+## 0.58.1
+
+### Patch Changes
+
+- Updated dependencies [4700d7ae4]
+  - @tinacms/graphql@0.58.1
+
+## 0.58.0
+
+### Minor Changes
+
+- fa7a0419f: Adds experimental support for a data layer between file-based content and the GraphQL API. This allows documents to be indexed so the CMS can behave more like a traditional CMS, with the ability enforce foreign reference constraints and filtering/pagination capabilities.
+- 8c14f29ef: Updated cli to include a new option, `--noSDK`. When this flag is present it will not generate the SDK.
+
+### Patch Changes
+
+- 9c5f888a3: Modifies `tinacms init` for `TinaAdmin`-ready page
+- Updated dependencies [eb5fbfac7]
+- Updated dependencies [fa7a0419f]
+- Updated dependencies [47d126029]
+  - @tinacms/graphql@0.58.0
+
+## 0.57.2
+
+### Patch Changes
+
+- edb2f4011: Trim path property on collections during compilation
+- Updated dependencies [edb2f4011]
+  - @tinacms/graphql@0.57.2
+
+## 0.57.1
+
+### Patch Changes
+
+- 50710e1d0: Add no-check for Typescript-generated file
+- c78d981e6: Reset entire **generated** folder on re-compile
+- Updated dependencies [60729f60c]
+  - @tinacms/graphql@0.57.1
+
 ## 0.57.0
 
 ### Minor Changes

package/dist/cmds/compile/index.d.ts

@@ -11,5 +11,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import type { TinaCloudSchema } from '@tinacms/graphql';
+export declare const resetGeneratedFolder: () => Promise<void>;
 export declare const compile: (_ctx: any, _next: any) => Promise<void>;
 export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;

package/dist/cmds/init/setup-files/index.d.ts

@@ -10,8 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-export declare const adminPage = "import { useEffect } from \"react\";\nimport { useRouter } from \"next/router\";\nimport { useEditState } from \"tinacms/dist/edit-state\";\n\nconst GoToEditPage = () => {\n  const { setEdit } = useEditState();\n  const router = useRouter();\n  useEffect(() => {\n    setEdit(true);\n    router.back();\n  }, []);\n  return <div>Entering edit mode..</div>;\n};\n\nexport default GoToEditPage;\n";
-export declare const exitAdminPage = "import { useEffect } from \"react\";\nimport { useRouter } from \"next/router\";\nimport { useEditState } from \"tinacms/dist/edit-state\";\n\nconst GoToEditPage = () => {\n  const { setEdit } = useEditState();\n  const router = useRouter();\n  useEffect(() => {\n    setEdit(false);\n    router.back();\n  }, []);\n  return <div>Exiting edit mode..</div>;;\n};\n\nexport default GoToEditPage;\n";
+export declare const adminPage = "import { TinaAdmin } from 'tinacms';\nexport default TinaAdmin;\n";
 export declare const blogPost = "---\ntitle: Vote For Pedro\n---\n# Welcome to the blog.\n\n> To edit this site head over to the [` /\n  admin`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \uD83E\uDD99. \n\n\n# Dixi gaude Arethusa\n\n## Oscula mihi\n\nLorem markdownum numerabilis armentorum platanus, cultros coniunx sibi per\nsilvas, nostris clausit sequemur diverso scopulosque. Fecit tum alta sed non\nfalcato murmura, geminas donata Amyntore, quoque Nox. Invitam inquit, modo\nnocte; ut ignis faciemque manes in imagine sinistra ut mucrone non ramos\nsepulcro supplex. Crescentesque populos motura, fit cumque. Verumque est; retro\nsibi tristia bracchia Aetola telae caruerunt et.\n\n\n## Mutato fefellimus sit demisit aut alterius sollicito\n\nPhaethonteos vestes quem involvite iuvenca; furiali anne: sati totumque,\n**corpora** cum rapacibus nunc! Nervis repetatne, miserabile doleas, deprensum\nhunc, fluctus Threicio, ad urbes, magicaeque, quid. Per credensque series adicis\npoteram [quidem](#)! Iam uni mensas victrix\nvittas ut flumina Satyri adulter; bellum iacet domitae repercusso truncis urnis\nmille rigidi sub taurum.\n\n\n";
 export declare const nextPostPage: () => string;
 export declare const AppJsContent: (extraImports?: string) => string;

package/dist/cmds/start-server/index.d.ts

@@ -13,8 +13,9 @@ limitations under the License.
 interface Options {
     port?: number;
     command?: string;
-    experimental?: boolean;
+    experimentalData?: boolean;
     noWatch?: boolean;
+    noSDK: boolean;
 }
-export declare function startServer(_ctx: any, _next: any, { port, command, experimental, noWatch }: Options): Promise<void>;
+export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK }: Options): Promise<void>;
 export {};

package/dist/cmds/start-server/server.d.ts

@@ -12,5 +12,5 @@ limitations under the License.
 */
 /// <reference types="node" />
 import http from 'http';
-declare const gqlServer: () => Promise<http.Server>;
+declare const gqlServer: (database: any) => Promise<http.Server>;
 export default gqlServer;

package/dist/codegen/index.d.ts

@@ -11,4 +11,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { GraphQLSchema } from 'graphql';
-export declare const generateTypes: (schema: GraphQLSchema, queryPathGlob?: string, fragDocPath?: string) => Promise<string>;
+export declare const generateTypes: (schema: GraphQLSchema, queryPathGlob?: string, fragDocPath?: string, options?: {
+    noSDK: boolean;
+}) => Promise<string>;

package/dist/index.js

@@ -25,22 +25,21 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
 var server_exports = {};
 __export(server_exports, {
   default: () => server_default
 });
-var import_path3, import_cors, import_http, import_express, import_altair_express_middleware, import_body_parser, GITHUB_ACCESS_TOKEN, gqlServer, server_default;
+var import_cors, import_http, import_express, import_altair_express_middleware, import_body_parser, GITHUB_ACCESS_TOKEN, gqlServer, server_default;
 var init_server = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
-    import_path3 = __toModule(require("path"));
+  "pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
     import_cors = __toModule(require("cors"));
     import_http = __toModule(require("http"));
     import_express = __toModule(require("express"));
     import_altair_express_middleware = __toModule(require("altair-express-middleware"));
     import_body_parser = __toModule(require("body-parser"));
     GITHUB_ACCESS_TOKEN = process.env.GITHUB_PERSONAL_ACCESS_TOKEN;
-    gqlServer = async () => {
+    gqlServer = async (database) => {
       const gqlPackage = require("@tinacms/graphql");
       const app = (0, import_express.default)();
       const server = import_http.default.createServer(app);
@@ -63,11 +62,10 @@ var init_server = __esm({
         }
       }`
       }));
-      const rootPath = import_path3.default.join(process.cwd());
       app.post("/graphql", async (req, res) => {
         const { query, variables } = req.body;
-        const result = await gqlPackage.gql({
-          rootPath,
+        const result = await gqlPackage.resolve({
+          database,
           query,
           variables
         });
@@ -109,18 +107,18 @@ var init_server = __esm({
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/index.ts
 __export(exports, {
   defineSchema: () => defineSchema,
   init: () => init
 });
 var commander = __toModule(require("commander"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.57.0";
+var version = "0.58.0";
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
 var successText = import_chalk.default.bold.green;
 var dangerText = import_chalk.default.bold.red;
@@ -131,7 +129,7 @@ var logText = import_chalk.default.italic.gray;
 var warnText = import_chalk.default.yellowBright.bgBlack;
 var CONFIRMATION_TEXT = import_chalk.default.dim("enter to confirm");
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/middleware.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/middleware.ts
 var chain = async (cmds, options) => {
   const ctx = {};
   const next = async (middlewareIndex) => {
@@ -150,10 +148,10 @@ var chain = async (cmds, options) => {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/logger/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/logger/index.ts
 var import_log4js = __toModule(require("log4js"));
 var logger = import_log4js.default.getLogger();
 import_log4js.default.configure({
@@ -164,22 +162,25 @@ import_log4js.default.configure({
 });
 logger.level = "info";
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 async function attachSchema(ctx, next, options) {
   logger.info(logText("Building schema..."));
   const rootPath = process.cwd();
-  const schema = await (0, import_graphql.buildSchema)(rootPath);
+  const bridge = new import_graphql.FilesystemBridge(rootPath);
+  const store = new import_graphql.FilesystemStore({ rootPath });
+  const database = await (0, import_graphql.createDatabase)({ store, bridge });
+  const schema = await (0, import_graphql.buildSchema)(rootPath, database);
   ctx.schema = schema;
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/index.ts
 var import_graphql5 = __toModule(require("graphql"));
 var import_core = __toModule(require("@graphql-codegen/core"));
 var import_typescript = __toModule(require("@graphql-codegen/typescript"));
 var import_typescript_operations = __toModule(require("@graphql-codegen/typescript-operations"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/plugin.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/plugin.ts
 var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
   return `
 // TinaSDK generated code
@@ -204,12 +205,12 @@ var AddGeneratedClient = {
   plugin: AddGeneratedClientFunc
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
 var import_graphql3 = __toModule(require("graphql"));
 var import_graphql4 = __toModule(require("graphql"));
 var import_path = __toModule(require("path"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/visitor.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/visitor.ts
 var import_visitor_plugin_common = __toModule(require("@graphql-codegen/visitor-plugin-common"));
 var import_auto_bind = __toModule(require("auto-bind"));
 var import_graphql2 = __toModule(require("graphql"));
@@ -259,7 +260,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
 var plugin = (schema, documents, config) => {
   const allAst = (0, import_graphql4.concatAST)(documents.reduce((prev, v) => {
     return [...prev, v.document];
@@ -285,18 +286,20 @@ var plugin = (schema, documents, config) => {
   };
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/codegen/index.ts
 var import_load = __toModule(require("@graphql-tools/load"));
 var import_graphql_file_loader = __toModule(require("@graphql-tools/graphql-file-loader"));
-var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath = process.cwd()) => {
+var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath = process.cwd(), options = { noSDK: false }) => {
   logger.info("Generating types...");
   try {
     let docs = [];
     let fragDocs = [];
     try {
-      docs = await (0, import_load.loadDocuments)(queryPathGlob, {
-        loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
-      });
+      if (!options.noSDK) {
+        docs = await (0, import_load.loadDocuments)(queryPathGlob, {
+          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+        });
+      }
     } catch (e) {
       let showErrorMessage = true;
       const message = e.message || "";
@@ -308,9 +311,11 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
       }
     }
     try {
-      fragDocs = await (0, import_load.loadDocuments)(fragDocPath, {
-        loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
-      });
+      if (!options.noSDK) {
+        fragDocs = await (0, import_load.loadDocuments)(fragDocPath, {
+          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+        });
+      }
     } catch (error) {
       console.error(error);
     }
@@ -349,15 +354,16 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
 var import_graphql6 = __toModule(require("graphql"));
 var import_fs_extra = __toModule(require("fs-extra"));
 async function genTypes({ schema }, next, options) {
   const typesPath = process.cwd() + "/.tina/__generated__/types.ts";
   const fragPath = process.cwd() + "/.tina/__generated__/*.{graphql,gql}";
   const queryPathGlob = process.cwd() + "/.tina/queries/**/*.{graphql,gql}";
-  const typescriptTypes = await generateTypes(schema, queryPathGlob, fragPath);
-  await import_fs_extra.default.outputFile(typesPath, `// DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
+  const typescriptTypes = await generateTypes(schema, queryPathGlob, fragPath, options);
+  await import_fs_extra.default.outputFile(typesPath, `//@ts-nocheck
+// DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
 ${typescriptTypes}
 `);
   logger.info(`Typescript types => ${successText(typesPath)}`);
@@ -374,19 +380,19 @@ schema {
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_child_process = __toModule(require("child_process"));
-var import_path4 = __toModule(require("path"));
+var import_path3 = __toModule(require("path"));
 var import_graphql7 = __toModule(require("@tinacms/graphql"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
 var import_fast_glob = __toModule(require("fast-glob"));
 var import_normalize_path = __toModule(require("normalize-path"));
 var import_path2 = __toModule(require("path"));
 var import_fs_extra2 = __toModule(require("fs-extra"));
 var ts = __toModule(require("typescript"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
 var defaultSchema = `
 import { defineSchema } from "@tinacms/cli";
 
@@ -417,10 +423,22 @@ export default defineSchema({
 });
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
 var tinaPath = import_path2.default.join(process.cwd(), ".tina");
-var tinaTempPath = import_path2.default.join(process.cwd(), ".tina", "__generated__", "temp");
-var tinaConfigPath = import_path2.default.join(process.cwd(), ".tina", "__generated__", "config");
+var tinaGeneratedPath = import_path2.default.join(tinaPath, "__generated__");
+var tinaTempPath = import_path2.default.join(tinaGeneratedPath, "temp");
+var tinaConfigPath = import_path2.default.join(tinaGeneratedPath, "config");
+var resetGeneratedFolder = async () => {
+  try {
+    await import_fs_extra2.default.rmdir(tinaGeneratedPath, {
+      recursive: true
+    });
+  } catch (e) {
+    console.log(e);
+  }
+  await import_fs_extra2.default.mkdir(tinaGeneratedPath);
+  await import_fs_extra2.default.outputFile(import_path2.default.join(tinaGeneratedPath, ".gitignore"), "db");
+};
 var compile = async (_ctx, _next) => {
   logger.info(logText("Compiling..."));
   if (!import_fs_extra2.default.existsSync(tinaPath) || !import_fs_extra2.default.existsSync(import_path2.default.join(tinaPath, "schema.ts"))) {
@@ -432,8 +450,6 @@ var compile = async (_ctx, _next) => {
     await import_fs_extra2.default.ensureFile(file);
     await import_fs_extra2.default.writeFile(file, defaultSchema);
   }
-  await import_fs_extra2.default.remove(tinaTempPath);
-  await import_fs_extra2.default.remove(tinaConfigPath);
   await transpile2(tinaPath, tinaTempPath);
   Object.keys(require.cache).map((key) => {
     if (key.startsWith(tinaTempPath)) {
@@ -466,10 +482,18 @@ var defineSchema = (config) => {
   return config;
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_chokidar = __toModule(require("chokidar"));
 var gqlPackageFile = require.resolve("@tinacms/graphql");
-async function startServer(_ctx, _next, { port = 4001, command, experimental, noWatch }) {
+async function startServer(_ctx, _next, { port = 4001, command, noWatch, experimentalData, noSDK }) {
+  const rootPath = process.cwd();
+  if (!process.env.CI && !noWatch) {
+    await resetGeneratedFolder();
+  }
+  const bridge = new import_graphql7.FilesystemBridge(rootPath);
+  const store = experimentalData ? new import_graphql7.LevelStore(rootPath) : new import_graphql7.FilesystemStore({ rootPath });
+  const shouldBuild = bridge.supportsBuilding();
+  const database = await (0, import_graphql7.createDatabase)({ store, bridge });
   const startSubprocess = () => {
     if (typeof command === "string") {
       const commands = command.split(" ");
@@ -492,38 +516,42 @@ stack: ${code.stack || "No stack was provided"}`);
       });
     }
   };
-  const rootPath = process.cwd();
   let ready = false;
   if (!noWatch && !process.env.CI) {
-    import_chokidar.default.watch(`${rootPath}/**/*.{ts,gql,graphql}`, {
-      ignored: `${import_path4.default.resolve(rootPath)}/.tina/__generated__/**/*`
+    import_chokidar.default.watch([`${rootPath}/**/*.{ts,gql,graphql}`], {
+      ignored: `${import_path3.default.resolve(rootPath)}/.tina/__generated__/**/*`
     }).on("ready", async () => {
       console.log("Generating Tina config");
       try {
-        await build();
+        if (shouldBuild) {
+          await build(noSDK);
+        }
         ready = true;
         startSubprocess();
       } catch (e) {
         logger.info(dangerText(`${e.message}`));
+        console.log(e);
         process.exit(0);
       }
     }).on("all", async () => {
       if (ready) {
         logger.info("Tina change detected, regenerating config");
         try {
-          await build();
+          if (shouldBuild) {
+            await build(noSDK);
+          }
         } catch (e) {
-          logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + `see error below 
+          logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
  ${e.message}`);
         }
       }
     });
   }
-  const build = async () => {
+  const build = async (noSDK2) => {
     await compile(null, null);
-    const schema = await (0, import_graphql7.buildSchema)(rootPath);
+    const schema = await (0, import_graphql7.buildSchema)(rootPath, database);
     await genTypes({ schema }, () => {
-    }, {});
+    }, { noSDK: noSDK2 });
   };
   const state = {
     server: null,
@@ -532,7 +560,7 @@ stack: ${code.stack || "No stack was provided"}`);
   let isReady = false;
   const start = async () => {
     const s = (init_server(), server_exports);
-    state.server = await s.default(experimental);
+    state.server = await s.default(database);
     state.server.listen(port, () => {
       logger.info(`Started Filesystem GraphQL server on port: ${port}`);
       logger.info(`Visit the playground at http://localhost:${port}/altair/`);
@@ -580,44 +608,15 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
 var import_fs_extra3 = __toModule(require("fs-extra"));
-var import_path5 = __toModule(require("path"));
+var import_path4 = __toModule(require("path"));
 var import_progress = __toModule(require("progress"));
 var import_prompts = __toModule(require("prompts"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/index.ts
-var adminPage = `import { useEffect } from "react";
-import { useRouter } from "next/router";
-import { useEditState } from "tinacms/dist/edit-state";
-
-const GoToEditPage = () => {
-  const { setEdit } = useEditState();
-  const router = useRouter();
-  useEffect(() => {
-    setEdit(true);
-    router.back();
-  }, []);
-  return <div>Entering edit mode..</div>;
-};
-
-export default GoToEditPage;
-`;
-var exitAdminPage = `import { useEffect } from "react";
-import { useRouter } from "next/router";
-import { useEditState } from "tinacms/dist/edit-state";
-
-const GoToEditPage = () => {
-  const { setEdit } = useEditState();
-  const router = useRouter();
-  useEffect(() => {
-    setEdit(false);
-    router.back();
-  }, []);
-  return <div>Exiting edit mode..</div>;;
-};
-
-export default GoToEditPage;
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/index.ts
+var adminPage = `import { TinaAdmin } from 'tinacms';
+export default TinaAdmin;
 `;
 var blogPost = `---
 title: Vote For Pedro
@@ -922,7 +921,6 @@ const App = ({ Component, pageProps }) => {
           <TinaCMS
             clientId={process.env.NEXT_PUBLIC_TINA_CLIENT_ID}
             branch={process.env.NEXT_PUBLIC_EDIT_BRANCH}
-            organization={process.env.NEXT_PUBLIC_ORGANIZATION_NAME}
             isLocalClient={Boolean(
               Number(process.env.NEXT_PUBLIC_USE_LOCAL_CLIENT ?? true)
             )}
@@ -941,7 +939,7 @@ const App = ({ Component, pageProps }) => {
 export default App
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
 var import_chalk2 = __toModule(require("chalk"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
@@ -973,21 +971,21 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
-var TinaWrapperPathDir = import_path5.default.join(baseDir, "components");
-var TinaWrapperPath = import_path5.default.join(TinaWrapperPathDir, "tina-wrapper.tsx");
-var blogContentPath = import_path5.default.join(baseDir, "content", "posts");
-var blogPostPath = import_path5.default.join(blogContentPath, "HelloWorld.md");
+var TinaWrapperPathDir = import_path4.default.join(baseDir, "components");
+var TinaWrapperPath = import_path4.default.join(TinaWrapperPathDir, "tina-wrapper.tsx");
+var blogContentPath = import_path4.default.join(baseDir, "content", "posts");
+var blogPostPath = import_path4.default.join(blogContentPath, "HelloWorld.md");
 async function tinaSetup(ctx, next, options) {
-  const useingSrc = import_fs_extra3.default.pathExistsSync(import_path5.default.join(baseDir, "src"));
+  const useingSrc = import_fs_extra3.default.pathExistsSync(import_path4.default.join(baseDir, "src"));
   if (!import_fs_extra3.default.pathExistsSync(blogPostPath)) {
     logger.info(logText("Adding a content folder..."));
     import_fs_extra3.default.mkdirpSync(blogContentPath);
     import_fs_extra3.default.writeFileSync(blogPostPath, blogPost);
   }
   logger.level = "info";
-  const pagesPath = import_path5.default.join(baseDir, useingSrc ? "src" : "", "pages");
-  const appPath = import_path5.default.join(pagesPath, "_app.js");
-  const appPathTS = import_path5.default.join(pagesPath, "_app.tsx");
+  const pagesPath = import_path4.default.join(baseDir, useingSrc ? "src" : "", "pages");
+  const appPath = import_path4.default.join(pagesPath, "_app.js");
+  const appPathTS = import_path4.default.join(pagesPath, "_app.tsx");
   const appExtension = import_fs_extra3.default.existsSync(appPath) ? ".js" : ".tsx";
   let wrapper = false;
   if (!import_fs_extra3.default.pathExistsSync(appPath) && !import_fs_extra3.default.pathExistsSync(appPathTS)) {
@@ -1001,7 +999,7 @@ async function tinaSetup(ctx, next, options) {
     });
     if (override.res) {
       logger.info(logText(`Adding _app${appExtension} ... \u2705`));
-      const appPathWithExtension = import_path5.default.join(pagesPath, `_app${appExtension}`);
+      const appPathWithExtension = import_path4.default.join(pagesPath, `_app${appExtension}`);
       const fileContent = import_fs_extra3.default.pathExistsSync(appPath) ? (0, import_fs_extra3.readFileSync)(appPath) : (0, import_fs_extra3.readFileSync)(appPathTS);
       const matches = [
         ...fileContent.toString().matchAll(/^.*import.*\.css("|').*$/gm)
@@ -1014,14 +1012,14 @@ async function tinaSetup(ctx, next, options) {
 `, warnText(AppJsContent())));
     }
   }
-  const tinaBlogPagePath = import_path5.default.join(pagesPath, "demo", "blog");
-  const tinaBlogPagePathFile = import_path5.default.join(tinaBlogPagePath, "[filename].js");
+  const tinaBlogPagePath = import_path4.default.join(pagesPath, "demo", "blog");
+  const tinaBlogPagePathFile = import_path4.default.join(tinaBlogPagePath, "[filename].js");
   if (!import_fs_extra3.default.pathExistsSync(tinaBlogPagePathFile)) {
     import_fs_extra3.default.mkdirpSync(tinaBlogPagePath);
     import_fs_extra3.default.writeFileSync(tinaBlogPagePathFile, nextPostPage());
   }
   logger.info("Adding a content folder... \u2705");
-  const packagePath = import_path5.default.join(baseDir, "package.json");
+  const packagePath = import_path4.default.join(baseDir, "package.json");
   const pack = JSON.parse((0, import_fs_extra3.readFileSync)(packagePath).toString());
   const oldScripts = pack.scripts || {};
   const newPack = JSON.stringify({
@@ -1034,52 +1032,13 @@ async function tinaSetup(ctx, next, options) {
     }
   }, null, 2);
   (0, import_fs_extra3.writeFileSync)(packagePath, newPack);
-  const adminPath = import_path5.default.join(pagesPath, "admin.tsx");
-  const adminPathJS = import_path5.default.join(pagesPath, "admin.js");
-  if (!import_fs_extra3.default.existsSync(adminPath) && !import_fs_extra3.default.existsSync(adminPathJS)) {
-    import_fs_extra3.default.writeFileSync(adminPathJS, adminPage);
-  } else {
-    const extension = import_fs_extra3.default.existsSync(adminPath) ? ".tsx" : "js";
-    const override = await (0, import_prompts.default)({
-      name: "override",
-      type: "confirm",
-      message: `Whoops... looks like you already have an admin${extension} do you want to override it?`
-    });
-    if (override.override) {
-      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, "admin" + extension), adminPage);
-    } else {
-      const res = await (0, import_prompts.default)({
-        name: "name",
-        type: "text",
-        message: warnText("What would you like the route to be named that enters edit mode?: ")
-      });
-      const adminName = res.name || "admin";
-      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, adminName + extension), adminPage);
-    }
-  }
-  const exitAdminPath = import_path5.default.join(pagesPath, "exit-admin.tsx");
-  const exitAdminPathJS = import_path5.default.join(pagesPath, "exit-admin.js");
-  if (!import_fs_extra3.default.existsSync(exitAdminPath) && !import_fs_extra3.default.existsSync(exitAdminPathJS)) {
-    import_fs_extra3.default.writeFileSync(exitAdminPathJS, exitAdminPage);
-  } else {
-    const extension = import_fs_extra3.default.existsSync(exitAdminPath) ? ".tsx" : "js";
-    const override = await (0, import_prompts.default)({
-      name: "override",
-      type: "confirm",
-      message: `Whoops... looks like you already have an exit-admin${extension} do you want to override it?`
-    });
-    if (override.override) {
-      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, "exit-admin" + extension), exitAdminPage);
-    } else {
-      const res = await (0, import_prompts.default)({
-        name: "name",
-        type: "text",
-        message: warnText("What would you like the route to be named that exits edit mode?: ")
-      });
-      const adminName = res.name || "exit-admin";
-      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, adminName + extension), exitAdminPage);
-    }
+  const adminPath = import_path4.default.join(pagesPath, "admin", "[[...tina]].js");
+  if (import_fs_extra3.default.pathExistsSync(import_path4.default.join(pagesPath, "admin"))) {
+    logger.warn(`Unable to add /pages/admin/[[...tina]].js, this path already exists.
+	Learn more about toggling edit-mode at https://tina.io/docs/tinacms-context/#manually-toggling-edit-mode`);
+    return next();
   }
+  (0, import_fs_extra3.outputFileSync)(adminPath, adminPage);
   next();
 }
 async function successMessage(ctx, next, options) {
@@ -1091,7 +1050,7 @@ Enjoy Tina \u{1F999} !
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
 var CMD_GEN_TYPES = "schema:types";
 var CMD_START_SERVER = "server:start";
 var CMD_COMPILE_MODELS = "schema:compile";
@@ -1100,40 +1059,50 @@ var startServerPortOption = {
   name: "--port <port>",
   description: "Specify a port to run the server on. (default 4001)"
 };
+var experimentalDatalayer = {
+  name: "--experimentalData",
+  description: "Build the server with additional data querying capabilities"
+};
 var subCommand = {
   name: "-c, --command <command>",
   description: "The sub-command to run"
 };
-var experimentalCommand = {
-  name: "--experimental",
-  description: "Run the unstable version of this service"
-};
 var noWatchOption = {
   name: "--noWatch",
   description: "Don't regenerate config on file changes"
 };
+var noSDKCodegenOption = {
+  name: "--noSDK",
+  description: "Don't generate the generated client SDK"
+};
 var baseCmds = [
   {
     command: CMD_START_SERVER,
     description: "Start Filesystem Graphql Server",
-    options: [startServerPortOption, subCommand, experimentalCommand, noWatchOption],
+    options: [
+      startServerPortOption,
+      subCommand,
+      experimentalDatalayer,
+      noWatchOption,
+      noSDKCodegenOption
+    ],
     action: (options) => chain([startServer], options)
   },
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalCommand],
+    options: [experimentalDatalayer],
     action: (options) => chain([compile], options)
   },
   {
     command: CMD_GEN_TYPES,
     description: "Generate a GraphQL query for your site's schema, (and optionally Typescript types)",
-    options: [experimentalCommand],
+    options: [experimentalDatalayer, noSDKCodegenOption],
     action: (options) => chain([attachSchema, genTypes], options)
   },
   {
     command: INIT,
-    options: [experimentalCommand],
+    options: [experimentalDatalayer],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
       initTina,
@@ -1150,7 +1119,7 @@ var baseCmds = [
   }
 ];
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/index.ts
+// pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/index.ts
 var program = new commander.Command(name);
 var registerCommands = (commands, noHelp = false) => {
   commands.forEach((command, i) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.57.0",
+  "version": "0.58.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -56,7 +56,7 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/graphql": "0.57.0",
+    "@tinacms/graphql": "0.58.1",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",