@tinacms/cli 0.56.5 → 0.57.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # tinacms-cli
 
+## 0.57.0
+
+### Minor Changes
+
+- d1ed404ba: Add support for auto-generated SDK for type-safe data fetching
+
+### Patch Changes
+
+- 138ceb8c4: Clean up dependencies
+- Updated dependencies [138ceb8c4]
+- Updated dependencies [577d6a5ad]
+- Updated dependencies [ed277e3bd]
+- Updated dependencies [d1ed404ba]
+  - @tinacms/graphql@0.57.0
+
 ## 0.56.5
 
 ### Patch Changes

package/dist/codegen/index.d.ts

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

package/dist/codegen/plugin.d.ts

@@ -0,0 +1,17 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+import type { PluginFunction } from '@graphql-codegen/plugin-helpers';
+export declare const AddGeneratedClientFunc: PluginFunction;
+export declare const AddGeneratedClient: {
+    plugin: PluginFunction<any, import("@graphql-codegen/plugin-helpers").Types.PluginOutput>;
+};

package/dist/codegen/sdkPlugin/config.d.ts

@@ -0,0 +1,24 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+import { RawClientSideBasePluginConfig } from '@graphql-codegen/visitor-plugin-common';
+/**
+ * This plugin generate a generic SDK (without any Requester implemented), allow you to easily customize the way you fetch your data, without loosing the strongly-typed integration.
+ */
+export interface RawGenericSdkPluginConfig extends RawClientSideBasePluginConfig {
+    /**
+     * usingObservableFrom: "import Observable from 'zen-observable';"
+     * OR
+     * usingObservableFrom: "import { Observable } from 'rxjs';"
+     */
+    usingObservableFrom?: string;
+}

package/dist/codegen/sdkPlugin/index.d.ts

@@ -0,0 +1,27 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+/**
+ * PLEASE READ THIS:
+ *
+ * This plugin is directly copied from https://github.com/dotansimha/graphql-code-generator/tree/master/packages/plugins/typescript/generic-sdk
+ *
+ * The reason this was needed is because we had to modified the return type of the SDK client. We need to return {data, variables, query}. While the other one just returned the data.
+ *
+ * This is the same as the above link and may need to be updated time to time. (for example if we want to support GQL v16). There is only one line that differs from the original. (This is shown)
+ */
+import { PluginFunction, PluginValidateFn } from '@graphql-codegen/plugin-helpers';
+import { RawGenericSdkPluginConfig } from './config';
+import { GenericSdkVisitor } from './visitor';
+export declare const plugin: PluginFunction<RawGenericSdkPluginConfig>;
+export declare const validate: PluginValidateFn<any>;
+export { GenericSdkVisitor };

package/dist/codegen/sdkPlugin/visitor.d.ts

@@ -0,0 +1,24 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
+import { GraphQLSchema, OperationDefinitionNode } from 'graphql';
+import { RawGenericSdkPluginConfig } from './config';
+export interface GenericSdkPluginConfig extends ClientSideBasePluginConfig {
+    usingObservableFrom: string;
+}
+export declare class GenericSdkVisitor extends ClientSideBaseVisitor<RawGenericSdkPluginConfig, GenericSdkPluginConfig> {
+    private _operationsToInclude;
+    constructor(schema: GraphQLSchema, fragments: LoadedFragment[], rawConfig: RawGenericSdkPluginConfig);
+    protected buildOperation(node: OperationDefinitionNode, documentVariableName: string, operationType: string, operationResultType: string, operationVariablesTypes: string): string;
+    get sdkContent(): string;
+}

package/dist/index.js

@@ -30,10 +30,10 @@ var server_exports = {};
 __export(server_exports, {
   default: () => server_default
 });
-var import_path2, import_cors, import_http, import_express, import_altair_express_middleware, import_body_parser, GITHUB_ACCESS_TOKEN, gqlServer, 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 init_server = __esm({
   "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
-    import_path2 = __toModule(require("path"));
+    import_path3 = __toModule(require("path"));
     import_cors = __toModule(require("cors"));
     import_http = __toModule(require("http"));
     import_express = __toModule(require("express"));
@@ -63,7 +63,7 @@ var init_server = __esm({
         }
       }`
       }));
-      const rootPath = import_path2.default.join(process.cwd());
+      const rootPath = import_path3.default.join(process.cwd());
       app.post("/graphql", async (req, res) => {
         const { query, variables } = req.body;
         const result = await gqlPackage.gql({
@@ -118,7 +118,7 @@ var commander = __toModule(require("commander"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.56.5";
+var version = "0.57.0";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
@@ -174,26 +174,173 @@ async function attachSchema(ctx, next, options) {
 }
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
-var import_graphql2 = __toModule(require("graphql"));
+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"));
-var generateTypes = async (schema) => {
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/plugin.ts
+var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
+  return `
+// TinaSDK generated code
+import { getStaticPropsForTina } from 'tinacms'
+const requester: (doc: any, vars?: any, options?: any) => Promise<any> = async (
+  doc,
+  vars,
+  _options
+) => {
+  // const data = await tinaClient.request(doc, { variables: vars }); 
+  const res = await await getStaticPropsForTina({query: doc, variables: vars})
+  return res
+};
+
+/**
+ * @experimental this class can be used but may change in the future
+ **/
+export const ExperimentalGetTinaClient = ()=>getSdk(requester)
+`;
+};
+var AddGeneratedClient = {
+  plugin: AddGeneratedClientFunc
+};
+
+// pnp:/home/runner/work/tinacms/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
+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"));
+var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBaseVisitor {
+  constructor(schema, fragments, rawConfig) {
+    super(schema, fragments, rawConfig, {
+      usingObservableFrom: rawConfig.usingObservableFrom
+    });
+    this._operationsToInclude = [];
+    (0, import_auto_bind.default)(this);
+    if (this.config.usingObservableFrom) {
+      this._additionalImports.push(this.config.usingObservableFrom);
+    }
+    if (this.config.documentMode !== import_visitor_plugin_common.DocumentMode.string) {
+    }
+  }
+  buildOperation(node, documentVariableName, operationType, operationResultType, operationVariablesTypes) {
+    if (node.name == null) {
+      throw new Error("Plugin 'generic-sdk' cannot generate SDK for unnamed operation.\n\n" + (0, import_graphql2.print)(node));
+    } else {
+      this._operationsToInclude.push({
+        node,
+        documentVariableName,
+        operationType,
+        operationResultType: `{data: ${operationResultType}, variables: ${operationVariablesTypes}, query: string}`,
+        operationVariablesTypes
+      });
+    }
+    return null;
+  }
+  get sdkContent() {
+    const usingObservable = !!this.config.usingObservableFrom;
+    const allPossibleActions = this._operationsToInclude.map((o) => {
+      const optionalVariables = !o.node.variableDefinitions || o.node.variableDefinitions.length === 0 || o.node.variableDefinitions.every((v) => v.type.kind !== import_graphql2.Kind.NON_NULL_TYPE || v.defaultValue);
+      const returnType = usingObservable && o.operationType === "Subscription" ? "Observable" : "Promise";
+      return `${o.node.name.value}(variables${optionalVariables ? "?" : ""}: ${o.operationVariablesTypes}, options?: C): ${returnType}<${o.operationResultType}> {
+    return requester<${o.operationResultType}, ${o.operationVariablesTypes}>(${o.documentVariableName}, variables, options);
+  }`;
+    }).map((s) => (0, import_visitor_plugin_common.indentMultiline)(s, 2));
+    return `export type Requester<C= {}> = <R, V>(doc: ${this.config.documentMode === import_visitor_plugin_common.DocumentMode.string ? "string" : "DocumentNode"}, vars?: V, options?: C) => ${usingObservable ? "Promise<R> & Observable<R>" : "Promise<R>"}
+  export function getSdk<C>(requester: Requester<C>) {
+    return {
+  ${allPossibleActions.join(",\n")}
+    };
+  }
+  export type Sdk = ReturnType<typeof getSdk>;`;
+  }
+};
+
+// pnp:/home/runner/work/tinacms/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];
+  }, []));
+  const allFragments = [
+    ...allAst.definitions.filter((d) => d.kind === import_graphql4.Kind.FRAGMENT_DEFINITION).map((fragmentDef) => ({
+      node: fragmentDef,
+      name: fragmentDef.name.value,
+      onType: fragmentDef.typeCondition.name.value,
+      isExternal: false
+    })),
+    ...config.externalFragments || []
+  ];
+  const visitor = new GenericSdkVisitor(schema, allFragments, config);
+  const visitorResult = (0, import_graphql3.visit)(allAst, { leave: visitor });
+  return {
+    prepend: visitor.getImports(),
+    content: [
+      visitor.fragments,
+      ...visitorResult.definitions.filter((t) => typeof t === "string"),
+      visitor.sdkContent
+    ].join("\n")
+  };
+};
+
+// pnp:/home/runner/work/tinacms/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()) => {
   logger.info("Generating types...");
   try {
+    let docs = [];
+    let fragDocs = [];
+    try {
+      docs = await (0, import_load.loadDocuments)(queryPathGlob, {
+        loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+      });
+    } catch (e) {
+      let showErrorMessage = true;
+      const message = e.message || "";
+      if (message.includes("Unable to find any GraphQL type definitions for the following pointers:")) {
+        showErrorMessage = false;
+      }
+      if (showErrorMessage) {
+        console.error(e);
+      }
+    }
+    try {
+      fragDocs = await (0, import_load.loadDocuments)(fragDocPath, {
+        loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+      });
+    } catch (error) {
+      console.error(error);
+    }
     const res = await (0, import_core.codegen)({
-      filename: process.cwd() + "/.forestry/autoschema.gql",
-      schema: (0, import_graphql2.parse)((0, import_graphql2.printSchema)(schema)),
-      documents: [],
+      filename: process.cwd(),
+      schema: (0, import_graphql5.parse)((0, import_graphql5.printSchema)(schema)),
+      documents: [...docs, ...fragDocs],
       config: {},
-      plugins: [{ typescript: {} }, { typescriptOperations: {} }],
+      plugins: [
+        { typescript: {} },
+        { typescriptOperations: {} },
+        {
+          typescriptSdk: {
+            gqlImport: "tinacms#gql",
+            documentNodeImport: "tinacms#DocumentNode"
+          }
+        },
+        { AddGeneratedClient: {} }
+      ],
       pluginMap: {
         typescript: {
           plugin: import_typescript.plugin
         },
         typescriptOperations: {
           plugin: import_typescript_operations.plugin
-        }
+        },
+        typescriptSdk: {
+          plugin
+        },
+        AddGeneratedClient
       }
     });
     return res;
@@ -203,16 +350,18 @@ var generateTypes = async (schema) => {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
-var import_graphql3 = __toModule(require("graphql"));
+var import_graphql6 = __toModule(require("graphql"));
 var import_fs_extra = __toModule(require("fs-extra"));
 async function genTypes({ schema }, next, options) {
-  const typescriptTypes = await generateTypes(schema);
   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
 ${typescriptTypes}
 `);
   logger.info(`Typescript types => ${successText(typesPath)}`);
-  const schemaString = await (0, import_graphql3.printSchema)(schema);
+  const schemaString = await (0, import_graphql6.printSchema)(schema);
   const schemaPath = process.cwd() + "/.tina/__generated__/schema.gql";
   await import_fs_extra.default.outputFile(schemaPath, `# DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
 ${schemaString}
@@ -227,13 +376,13 @@ schema {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_child_process = __toModule(require("child_process"));
-var import_path3 = __toModule(require("path"));
-var import_graphql4 = __toModule(require("@tinacms/graphql"));
+var import_path4 = __toModule(require("path"));
+var import_graphql7 = __toModule(require("@tinacms/graphql"));
 
 // pnp:/home/runner/work/tinacms/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_path = __toModule(require("path"));
+var import_path2 = __toModule(require("path"));
 var import_fs_extra2 = __toModule(require("fs-extra"));
 var ts = __toModule(require("typescript"));
 
@@ -269,17 +418,17 @@ export default defineSchema({
 `;
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
-var tinaPath = import_path.default.join(process.cwd(), ".tina");
-var tinaTempPath = import_path.default.join(process.cwd(), ".tina", "__generated__", "temp");
-var tinaConfigPath = import_path.default.join(process.cwd(), ".tina", "__generated__", "config");
+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 compile = async (_ctx, _next) => {
   logger.info(logText("Compiling..."));
-  if (!import_fs_extra2.default.existsSync(tinaPath) || !import_fs_extra2.default.existsSync(import_path.default.join(tinaPath, "schema.ts"))) {
+  if (!import_fs_extra2.default.existsSync(tinaPath) || !import_fs_extra2.default.existsSync(import_path2.default.join(tinaPath, "schema.ts"))) {
     logger.info(dangerText(`
       .tina/schema.ts not found, Creating one for you...
       See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
       `));
-    const file = import_path.default.join(tinaPath, "schema.ts");
+    const file = import_path2.default.join(tinaPath, "schema.ts");
     await import_fs_extra2.default.ensureFile(file);
     await import_fs_extra2.default.writeFile(file, defaultSchema);
   }
@@ -291,21 +440,21 @@ var compile = async (_ctx, _next) => {
       delete require.cache[require.resolve(key)];
     }
   });
-  const schemaFunc = require(import_path.default.join(tinaTempPath, "schema.js"));
+  const schemaFunc = require(import_path2.default.join(tinaTempPath, "schema.js"));
   const schemaObject = schemaFunc.default;
-  await import_fs_extra2.default.outputFile(import_path.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
+  await import_fs_extra2.default.outputFile(import_path2.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
   await import_fs_extra2.default.remove(tinaTempPath);
 };
 var transpile2 = async (projectDir, tempDir) => {
   logger.info(logText("Transpiling..."));
   const posixProjectDir = (0, import_normalize_path.default)(projectDir);
   const posixTempDir = (0, import_normalize_path.default)(tempDir);
-  return Promise.all(import_fast_glob.default.sync(import_path.default.join(projectDir, "**", "*.ts").replace(/\\/g, "/"), {
+  return Promise.all(import_fast_glob.default.sync(import_path2.default.join(projectDir, "**", "*.ts").replace(/\\/g, "/"), {
     ignore: [
-      import_path.default.join(projectDir, "__generated__", "**", "*.ts").replace(/\\/g, "/")
+      import_path2.default.join(projectDir, "__generated__", "**", "*.ts").replace(/\\/g, "/")
     ]
   }).map(async function(file) {
-    const fullPath = import_path.default.resolve(file);
+    const fullPath = import_path2.default.resolve(file);
     const contents = await import_fs_extra2.default.readFileSync(fullPath).toString();
     const newContent = ts.transpile(contents);
     const newPath = file.replace(posixProjectDir, posixTempDir).replace(".ts", ".js");
@@ -346,8 +495,8 @@ 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`, {
-      ignored: `${import_path3.default.resolve(rootPath)}/.tina/__generated__/**/*`
+    import_chokidar.default.watch(`${rootPath}/**/*.{ts,gql,graphql}`, {
+      ignored: `${import_path4.default.resolve(rootPath)}/.tina/__generated__/**/*`
     }).on("ready", async () => {
       console.log("Generating Tina config");
       try {
@@ -372,7 +521,7 @@ stack: ${code.stack || "No stack was provided"}`);
   }
   const build = async () => {
     await compile(null, null);
-    const schema = await (0, import_graphql4.buildSchema)(rootPath);
+    const schema = await (0, import_graphql7.buildSchema)(rootPath);
     await genTypes({ schema }, () => {
     }, {});
   };
@@ -433,7 +582,7 @@ stack: ${code.stack || "No stack was provided"}`);
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
 var import_fs_extra3 = __toModule(require("fs-extra"));
-var import_path4 = __toModule(require("path"));
+var import_path5 = __toModule(require("path"));
 var import_progress = __toModule(require("progress"));
 var import_prompts = __toModule(require("prompts"));
 
@@ -824,21 +973,21 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
-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");
+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");
 async function tinaSetup(ctx, next, options) {
-  const useingSrc = import_fs_extra3.default.pathExistsSync(import_path4.default.join(baseDir, "src"));
+  const useingSrc = import_fs_extra3.default.pathExistsSync(import_path5.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_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 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 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)) {
@@ -852,7 +1001,7 @@ async function tinaSetup(ctx, next, options) {
     });
     if (override.res) {
       logger.info(logText(`Adding _app${appExtension} ... \u2705`));
-      const appPathWithExtension = import_path4.default.join(pagesPath, `_app${appExtension}`);
+      const appPathWithExtension = import_path5.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)
@@ -865,14 +1014,14 @@ async function tinaSetup(ctx, next, options) {
 `, warnText(AppJsContent())));
     }
   }
-  const tinaBlogPagePath = import_path4.default.join(pagesPath, "demo", "blog");
-  const tinaBlogPagePathFile = import_path4.default.join(tinaBlogPagePath, "[filename].js");
+  const tinaBlogPagePath = import_path5.default.join(pagesPath, "demo", "blog");
+  const tinaBlogPagePathFile = import_path5.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_path4.default.join(baseDir, "package.json");
+  const packagePath = import_path5.default.join(baseDir, "package.json");
   const pack = JSON.parse((0, import_fs_extra3.readFileSync)(packagePath).toString());
   const oldScripts = pack.scripts || {};
   const newPack = JSON.stringify({
@@ -885,8 +1034,8 @@ async function tinaSetup(ctx, next, options) {
     }
   }, null, 2);
   (0, import_fs_extra3.writeFileSync)(packagePath, newPack);
-  const adminPath = import_path4.default.join(pagesPath, "admin.tsx");
-  const adminPathJS = import_path4.default.join(pagesPath, "admin.js");
+  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 {
@@ -897,7 +1046,7 @@ async function tinaSetup(ctx, next, options) {
       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_path4.default.join(pagesPath, "admin" + extension), adminPage);
+      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, "admin" + extension), adminPage);
     } else {
       const res = await (0, import_prompts.default)({
         name: "name",
@@ -905,11 +1054,11 @@ async function tinaSetup(ctx, next, options) {
         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_path4.default.join(pagesPath, adminName + extension), adminPage);
+      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, adminName + extension), adminPage);
     }
   }
-  const exitAdminPath = import_path4.default.join(pagesPath, "exit-admin.tsx");
-  const exitAdminPathJS = import_path4.default.join(pagesPath, "exit-admin.js");
+  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 {
@@ -920,7 +1069,7 @@ async function tinaSetup(ctx, next, options) {
       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_path4.default.join(pagesPath, "exit-admin" + extension), exitAdminPage);
+      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, "exit-admin" + extension), exitAdminPage);
     } else {
       const res = await (0, import_prompts.default)({
         name: "name",
@@ -928,7 +1077,7 @@ async function tinaSetup(ctx, next, options) {
         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_path4.default.join(pagesPath, adminName + extension), exitAdminPage);
+      import_fs_extra3.default.writeFileSync(import_path5.default.join(pagesPath, adminName + extension), exitAdminPage);
     }
   }
   next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.56.5",
+  "version": "0.57.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.3",
+    "@tinacms/scripts": "0.50.4",
     "@types/clear": "0.1.0",
     "@types/cors": "2.8.5",
     "@types/express": "^4.17.7",
@@ -38,24 +38,28 @@
     "@types/progress": "^2.0.3",
     "@types/prompts": "^2.0.13",
     "@types/yup": "^0.29.11",
-    "jest": "^27.0.6",
-    "ts-jest": "^26.5.3"
+    "jest": "^27.0.6"
   },
   "scripts": {
-    "build": "yarn tsup src/index.ts --format cjs --dts",
-    "watch": "yarn tsup src/index.ts --watch --format cjs --dts",
+    "build": "echo \"Run `yarn build` from the root of the repository instead\"",
     "test": "jest --passWithNoTests",
     "types": "yarn tsc",
     "test-watch": "jest  --passWithNoTests --watch",
     "generate:schema": "yarn node scripts/generateSchema.js"
   },
   "dependencies": {
-    "@graphql-codegen/core": "^1.17.0",
-    "@graphql-codegen/typescript": "^1.17.0",
-    "@graphql-codegen/typescript-operations": "^1.17.0",
-    "@tinacms/graphql": "0.56.1",
+    "@graphql-codegen/core": "^2.1.0",
+    "@graphql-codegen/plugin-helpers": "latest",
+    "@graphql-codegen/typescript": "^2.2.2",
+    "@graphql-codegen/typescript-generic-sdk": "^2.1.4",
+    "@graphql-codegen/typescript-operations": "^2.1.4",
+    "@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",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
+    "auto-bind": "^4.0.0",
     "axios": "0.19.0",
     "body-parser": "^1.19.0",
     "chalk": "^2.4.2",
@@ -74,7 +78,6 @@
     "normalize-path": "^3.0.0",
     "progress": "^2.0.3",
     "prompts": "^2.4.1",
-    "tsup": "4.6.1",
     "typescript": "^4.3.5",
     "yup": "^0.32.9"
   },