@tinacms/cli 0.60.9 → 0.60.12

package/CHANGELOG.md

@@ -1,5 +1,75 @@
 # tinacms-cli
 
+## 0.60.12
+
+### Patch Changes
+
+- ef450a53a: - Update tinacms CLI to support schemaFileType option (default 'ts') to allow user to specify the schema file type
+  - Update telemetry module to optionally check NO_TELEMETRY environment variable for disabling telemetry
+- 81b729c24: Update formatting of cli init outputs
+- 558cc4368: Make schema init platform-aware and refactor database put requests
+- Updated dependencies [4da32454b]
+- Updated dependencies [921709a7e]
+- Updated dependencies [ef450a53a]
+- Updated dependencies [a2906d6fe]
+- Updated dependencies [558cc4368]
+- Updated dependencies [06666d39f]
+- Updated dependencies [3e2d9e43a]
+  - @tinacms/graphql@0.59.11
+  - @tinacms/schema-tools@0.0.3
+  - @tinacms/metrics@0.0.3
+  - @tinacms/datalayer@0.1.1
+
+## 0.60.11
+
+### Patch Changes
+
+- Updated dependencies [cf33bcec1]
+  - @tinacms/graphql@0.59.10
+
+## 0.60.10
+
+### Patch Changes
+
+- 6154d12b8: Check for appropriate versions of react and react-dom before initializing with tinacms init
+- 8c23d69a2: Adds an MDX example when you run @tinacms/cli init
+- abf25c673: The schema can now to used on the frontend (optional for now but will be the main path moving forward).
+
+  ### How to migrate.
+
+  If you gone though the `tinacms init` process there should be a file called `.tina/components/TinaProvider`. In that file you can import the schema from `schema.ts` and add it to the TinaCMS wrapper component.
+
+  ```tsx
+  import TinaCMS from 'tinacms'
+  import schema, { tinaConfig } from '../schema.ts'
+
+  // Importing the TinaProvider directly into your page will cause Tina to be added to the production bundle.
+  // Instead, import the tina/provider/index default export to have it dynamially imported in edit-moode
+  /**
+   *
+   * @private Do not import this directly, please import the dynamic provider instead
+   */
+  const TinaProvider = ({ children }) => {
+    return (
+      <TinaCMS {...tinaConfig} schema={schema}>
+        {children}
+      </TinaCMS>
+    )
+  }
+
+  export default TinaProvider
+  ```
+
+- Updated dependencies [8b3be903f]
+- Updated dependencies [82174ff50]
+- Updated dependencies [a87e1e6fa]
+- Updated dependencies [abf25c673]
+- Updated dependencies [591640db0]
+- Updated dependencies [e8b0de1f7]
+- Updated dependencies [b01f2e382]
+  - @tinacms/datalayer@0.1.0
+  - @tinacms/graphql@0.59.9
+
 ## 0.60.9
 
 ### Patch Changes

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

@@ -10,4 +10,4 @@ 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 defaultSchema = "\nimport { defineSchema, defineConfig } from \"tinacms\";\n\nexport default defineSchema({\n  collections: [\n    {\n      label: \"Blog Posts\",\n      name: \"posts\",\n      path: \"content/posts\",\n      fields: [\n        {\n          type: \"string\",\n          label: \"Title\",\n          name: \"title\",\n        },\n        {\n          type: \"string\",\n          label: \"Blog Post Body\",\n          name: \"body\",\n          isBody: true,\n          ui: {\n            component: \"textarea\"\n          },\n        },\n      ],\n    },\n  ],\n});\n\n\n\n\n// Your tina config\n// ==============\nconst branch = 'main'\n// When working locally, hit our local filesystem.\n// On a Vercel deployment, hit the Tina Cloud API\nconst apiURL =\n  process.env.NODE_ENV == 'development'\n    ? 'http://localhost:4001/graphql'\n    : `https://content.tinajs.io/content/${process.env.NEXT_PUBLIC_TINA_CLIENT_ID}/github/${branch}`\n\nexport const tinaConfig = defineConfig({\n  apiURL,\n  cmsCallback: (cms) => {\n    //  add your CMS callback code here (if you want)\n\n    // The Route Mapper\n    /**\n     * 1. Import `tinacms` and `RouteMappingPlugin`\n     **/\n    import(\"tinacms\").then(({ RouteMappingPlugin }) => {\n      /**\n       * 2. Define the `RouteMappingPlugin` see https://tina.io/docs/tinacms-context/#the-routemappingplugin for more details\n       **/\n      const RouteMapping = new RouteMappingPlugin((collection, document) => {\n        return undefined;\n      });\n      /**\n       * 3. Add the `RouteMappingPlugin` to the `cms`.\n       **/\n      cms.plugins.add(RouteMapping);\n    });\n\n    return cms;\n  },\n});\n";
+export declare const defaultSchema: (sep: string) => string;

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

@@ -12,5 +12,7 @@ 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 compile: (_ctx: any, _next: any, options?: {
+    schemaFileType: string;
+}) => Promise<void>;
 export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;

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

@@ -1,4 +1,7 @@
 export declare function initTina(ctx: any, next: () => void, options: any): Promise<void>;
+export declare const MIN_REACT_VERSION = ">=16.14.0";
+export declare function checkDeps(ctx: any, next: () => void, options: any): Promise<void>;
+export declare const checkPackage: (packageJSON: any, packageName: any) => boolean;
 export declare function installDeps(ctx: any, next: () => void, options: any): Promise<void>;
 export declare function tinaSetup(_ctx: any, next: () => void, _options: any): Promise<void>;
 export declare function successMessage(ctx: any, next: () => void, options: any): Promise<void>;

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

@@ -1,16 +1,4 @@
-/**
-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.
-*/
 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 [`/admin`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \uD83E\uDD99. \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 blogPost = "---\ntitle: Vote For Pedro\n---\n# Welcome to the blog.\n\n> To edit this site head over to the [`/admin`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \uD83E\uDD99. \n\n# Dixi gaude Arethusa\n\n<PageSection heading=\"Oscula mihi\" content=\"Lorem 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: (usingSrc: boolean, extraImports?: string) => string;

package/dist/index.js

@@ -114,7 +114,7 @@ var commander = __toModule(require("commander"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.60.9";
+var version = "0.60.12";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
@@ -401,7 +401,7 @@ var import_fs_extra3 = __toModule(require("fs-extra"));
 var import_esbuild = __toModule(require("esbuild"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
-var defaultSchema = `
+var defaultSchema = (sep) => `
 import { defineSchema, defineConfig } from "tinacms";
 
 export default defineSchema({
@@ -409,7 +409,7 @@ export default defineSchema({
     {
       label: "Blog Posts",
       name: "posts",
-      path: "content/posts",
+      path: "content${sep}posts",
       fields: [
         {
           type: "string",
@@ -417,13 +417,31 @@ export default defineSchema({
           name: "title",
         },
         {
-          type: "string",
+          type: "rich-text",
           label: "Blog Post Body",
           name: "body",
           isBody: true,
-          ui: {
-            component: "textarea"
-          },
+          templates: [
+            {
+              name: "PageSection",
+              label: "Page Section",
+              fields: [
+                {
+                  type: "string",
+                  name: "heading",
+                  label: "Heading",
+                },
+                {
+                  type: "string",
+                  name: "content",
+                  label: "Content",
+                  ui: {
+                    component: "textarea"
+                  }
+                }
+              ],
+            },
+          ]
         },
       ],
     },
@@ -512,14 +530,18 @@ var ExecuteSchemaError = class extends Error {
   }
 };
 var handleServerErrors = (e) => {
-  if (e instanceof BuildSchemaError) {
+  if (e.name === "BuildSchemaError") {
     logger.error(`${dangerText("ERROR: your schema was not successfully built: see https://tina.io/docs/errors/esbuild-error/ for more details")}
   Error Message Below
   ${e}`);
-  } else if (e instanceof ExecuteSchemaError) {
+  } else if (e.name === "ExecuteSchemaError") {
     logger.error(`${dangerText("ERROR: your schema was not successfully executed: see https://tina.io/docs/errors/esbuild-error/ for more details")}
   Error Message Below
   ${e}`);
+  } else if (e.name === "TinaSchemaValidationError") {
+    logger.error(`${dangerText("ERROR: your schema was not successfully validated: see https://tina.io/docs/schema/ for instructions on how to setup a schema")}
+  Error Message Below
+  ${e}`);
   } else {
     logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
  ${e.message}`);
@@ -546,8 +568,16 @@ var resetGeneratedFolder = async () => {
 var cleanup = async ({ tinaTempPath: tinaTempPath2 }) => {
   await import_fs_extra3.default.remove(tinaTempPath2);
 };
-var compile = async (_ctx, _next) => {
+var compile = async (_ctx, _next, options = { schemaFileType: "ts" }) => {
   logger.info(logText("Compiling..."));
+  const { schemaFileType: requestedSchemaFileType = "ts" } = options;
+  const schemaFileType2 = (requestedSchemaFileType === "ts" || requestedSchemaFileType === "tsx") && "ts" || (requestedSchemaFileType === "js" || requestedSchemaFileType === "jsx") && "js";
+  if (!schemaFileType2) {
+    throw new Error(`Requested schema file type '${requestedSchemaFileType}' is not valid. Supported schema file types: 'ts, js, tsx, jsx'`);
+  }
+  if (_ctx) {
+    _ctx.schemaFileType = schemaFileType2;
+  }
   let schemaExists = true;
   try {
     getSchemaPath({ projectDir: tinaPath });
@@ -556,12 +586,12 @@ var compile = async (_ctx, _next) => {
   }
   if (!schemaExists) {
     logger.info(dangerText(`
-      .tina/schema.ts not found, Creating one for you...
+      .tina/schema.${schemaFileType2} not found, Creating one for you...
       See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
       `));
-    const file = import_path3.default.join(tinaPath, "schema.ts");
+    const file = import_path3.default.join(tinaPath, `schema.${schemaFileType2}`);
     await import_fs_extra3.default.ensureFile(file);
-    await import_fs_extra3.default.writeFile(file, defaultSchema);
+    await import_fs_extra3.default.writeFile(file, defaultSchema(import_path3.default.sep));
   }
   try {
     await transpile(tinaPath, tinaTempPath);
@@ -581,6 +611,11 @@ var compile = async (_ctx, _next) => {
     await cleanup({ tinaTempPath });
   } catch (e) {
     await cleanup({ tinaTempPath });
+    if (e instanceof Error) {
+      if (e.name === "TinaSchemaValidationError") {
+        throw e;
+      }
+    }
     throw new ExecuteSchemaError(e);
   }
 };
@@ -820,14 +855,8 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
-var import_fs_extra4 = __toModule(require("fs-extra"));
-var import_path5 = __toModule(require("path"));
-var import_progress = __toModule(require("progress"));
-var import_prompts = __toModule(require("prompts"));
-var import_metrics2 = __toModule(require("@tinacms/metrics"));
-
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/index.ts
+var import_chalk2 = __toModule(require("chalk"));
 var adminPage = `import { TinaAdmin } from 'tinacms';
 export default TinaAdmin;
 `;
@@ -840,14 +869,12 @@ title: Vote For Pedro
 
 # Dixi gaude Arethusa
 
-## Oscula mihi
-
-Lorem markdownum numerabilis armentorum platanus, cultros coniunx sibi per
+<PageSection heading="Oscula mihi" content="Lorem markdownum numerabilis armentorum platanus, cultros coniunx sibi per
 silvas, nostris clausit sequemur diverso scopulosque. Fecit tum alta sed non
 falcato murmura, geminas donata Amyntore, quoque Nox. Invitam inquit, modo
 nocte; ut ignis faciemque manes in imagine sinistra ut mucrone non ramos
 sepulcro supplex. Crescentesque populos motura, fit cumque. Verumque est; retro
-sibi tristia bracchia Aetola telae caruerunt et.
+sibi tristia bracchia Aetola telae caruerunt et."/>
 
 
 ## Mutato fefellimus sit demisit aut alterius sollicito
@@ -868,6 +895,7 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   import Head from "next/head";
   import { createGlobalStyle } from "styled-components";
   import { useTina } from "tinacms/dist/edit-state";
+  import { TinaMarkdown } from 'tinacms/dist/rich-text'
 
   const query = gql\`
     query BlogPostQuery($relativePath: String!) {
@@ -913,8 +941,7 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
     text-decoration: underline;
   }
   \`;
-  const defaultMarked = (markdown) => markdown;
-  // Use the props returned by get static props (this can be deleted when the edit provider and tina-wrapper are moved to _app.js)
+  
   const BlogPage = (props) => {
     const { data } = useTina({
       query,
@@ -933,12 +960,6 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
             crossOrigin="anonymous"
             referrerPolicy="no-referrer"
           />
-          {/* Marked CDN */}
-          <script
-            type="text/javascript"
-            crossOrigin="anonymous"
-            src="https://cdnjs.cloudflare.com/ajax/libs/marked/4.0.0/marked.min.js"
-          />
         </Head>
         <div>
           <div
@@ -949,12 +970,9 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
             <h1 className="text-3xl m-8 text-center leading-8 font-extrabold tracking-tight text-gray-900 sm:text-4xl">
               {data.getPostsDocument.data.title}
             </h1>
-            {/* Convert markdown to html in the browser only */}
-            {typeof window !== "undefined" && (
-              <ContentSection
-                content={window.marked.parse(data.getPostsDocument.data.body)}
-              ></ContentSection>
-            )}
+            <ContentSection
+              content={data.getPostsDocument.data.body}
+            ></ContentSection>
           </div>
           <div className="bg-green-100 text-center">
             Lost and looking for a place to start?
@@ -1019,6 +1037,19 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   };
   
   export default BlogPage;
+
+  const PageSection = props => {
+    return (
+      <>
+        <h2>{ props.heading }</h2>
+        <p>{ props.content }</p>
+      </>
+    )
+  }
+
+  const components = {
+    PageSection: PageSection,
+  }
   
   const ContentSection = ({ content }) => {
     return (
@@ -1128,7 +1159,7 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
         </div>
         <div className="relative px-4 sm:px-6 lg:px-8">
           <div className="text-lg max-w-prose mx-auto">
-            <div dangerouslySetInnerHTML={{ __html: content }}></div>
+            <TinaMarkdown components={components} content={content}/>
             <GlobalStyle />
           </div>
         </div>
@@ -1137,23 +1168,22 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   };
   
 `;
-var AppJsContent = (usingSrc, extraImports) => `import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'
+var AppJsContent = (usingSrc, extraImports) => {
+  const importLine = import_chalk2.default.green(`+ import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`);
+  return `${importLine}
+  ${extraImports || ""}
 
-${extraImports || ""}
-const App = ({ Component, pageProps }) => {
+  const App = ({ Component, pageProps }) => {
   return (
-    <Tina>
-      <Component {...pageProps} />
-    </Tina>
+    ${import_chalk2.default.green("+ <Tina>")}
+        <Component {...pageProps} />
+    ${import_chalk2.default.green("+ </Tina>")}
   )
 }
-
+  
 export default App
-
 `;
-
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
-var import_chalk2 = __toModule(require("chalk"));
+};
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/tinaProvider.ts
 var TinaProvider = `import TinaCMS from 'tinacms'
@@ -1201,6 +1231,12 @@ function extendNextScripts(scripts) {
 }
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+var import_fs_extra4 = __toModule(require("fs-extra"));
+var import_progress = __toModule(require("progress"));
+var import_metrics2 = __toModule(require("@tinacms/metrics"));
+var import_chalk3 = __toModule(require("chalk"));
+var import_path5 = __toModule(require("path"));
+var import_prompts = __toModule(require("prompts"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
   return new Promise((resolve2, _reject) => {
@@ -1214,10 +1250,69 @@ function execShellCommand(cmd) {
 }
 async function initTina(ctx, next, options) {
   const telemetry = new import_metrics2.Telemetry({ disabled: options.noTelemetry });
-  await telemetry.submitRecord({ event: { name: "tinacms:cli:init:invoke" } });
+  await telemetry.submitRecord({
+    event: {
+      name: "tinacms:cli:init:invoke",
+      schemaFileType: options.schemaFileType || "ts"
+    }
+  });
   logger.info(successText("Setting up Tina..."));
   next();
 }
+var MIN_REACT_VERSION = ">=16.14.0";
+async function checkDeps(ctx, next, options) {
+  const bar = new import_progress.default("Checking dependencies. :prog", 1);
+  const packageJSON = JSON.parse((await import_fs_extra4.default.readFileSync(packageJSONPath)).toString());
+  if (!checkPackage(packageJSON, "react") || !checkPackage(packageJSON, "react-dom")) {
+    const message = `Unable to initialize Tina due to outdated dependencies, try upgrading the following packages:
+      "react@${MIN_REACT_VERSION}"
+      "react-dom@${MIN_REACT_VERSION}"
+
+  Then re-rerun "@tinacms/cli init"`;
+    throw new Error(message);
+  }
+  bar.tick({
+    prog: "\u2705"
+  });
+  logger.level = "fatal";
+  next();
+}
+var checkPackage = (packageJSON, packageName) => {
+  let strippedVersion;
+  Object.entries(packageJSON.dependencies).map(([depPackageName, version2]) => {
+    if (depPackageName === packageName) {
+      strippedVersion = version2.replace(/^[^a-zA-Z0-9]*|[^a-zA-Z0-9]*$/g, "");
+    }
+  });
+  return checkVersion(strippedVersion);
+};
+var checkVersion = (version2) => {
+  const majorMin = 16;
+  const minorMin = 14;
+  const parts = version2.split(".");
+  const major = Number(parts[0]);
+  const minor = Number(parts[1]);
+  if (parts.length === 1) {
+    if (isNaN(major)) {
+      return true;
+    } else if (major > majorMin) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+  if (major > majorMin) {
+    return true;
+  } else if (major === majorMin) {
+    if (minor >= minorMin) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+};
 async function installDeps(ctx, next, options) {
   const bar = new import_progress.default("Installing Tina packages. This might take a moment... :prog", 2);
   const deps = ["tinacms", "styled-components", "@tinacms/cli"];
@@ -1233,6 +1328,7 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
+var packageJSONPath = import_path5.default.join(baseDir, "package.json");
 var blogContentPath = import_path5.default.join(baseDir, "content", "posts");
 var blogPostPath = import_path5.default.join(blogContentPath, "HelloWorld.md");
 var TinaFolder = import_path5.default.join(baseDir, ".tina");
@@ -1240,7 +1336,7 @@ var componentFolder = import_path5.default.join(TinaFolder, "components");
 var TinaProviderPath = import_path5.default.join(componentFolder, "TinaProvider.js");
 var TinaDynamicProvider = import_path5.default.join(componentFolder, "TinaDynamicProvider.js");
 async function tinaSetup(_ctx, next, _options) {
-  const useingSrc = import_fs_extra4.default.pathExistsSync(import_path5.default.join(baseDir, "src"));
+  const usingSrc = import_fs_extra4.default.pathExistsSync(import_path5.default.join(baseDir, "src"));
   if (!import_fs_extra4.default.pathExistsSync(blogPostPath)) {
     logger.info(logText("Adding a content folder..."));
     import_fs_extra4.default.mkdirpSync(blogContentPath);
@@ -1248,23 +1344,24 @@ async function tinaSetup(_ctx, next, _options) {
   }
   if (!import_fs_extra4.default.existsSync(TinaProviderPath) && !import_fs_extra4.default.existsSync(TinaDynamicProvider)) {
     import_fs_extra4.default.mkdirpSync(componentFolder);
-    import_fs_extra4.default.writeFileSync(TinaProviderPath, TinaProvider);
+    import_fs_extra4.default.writeFileSync(TinaProviderPath, TinaProvider.replace(/'\.\.\/schema\.ts'/, `'../schema.${_ctx.schemaFileType || "ts"}'`));
     import_fs_extra4.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
   }
   logger.level = "info";
-  const pagesPath = import_path5.default.join(baseDir, useingSrc ? "src" : "", "pages");
+  const pagesPath = import_path5.default.join(baseDir, usingSrc ? "src" : "", "pages");
   const appPath = import_path5.default.join(pagesPath, "_app.js");
   const appPathTS = import_path5.default.join(pagesPath, "_app.tsx");
   const appExtension = import_fs_extra4.default.existsSync(appPath) ? ".js" : ".tsx";
   if (!import_fs_extra4.default.pathExistsSync(appPath) && !import_fs_extra4.default.pathExistsSync(appPathTS)) {
     logger.info(logText("Adding _app.js ... \u2705"));
-    import_fs_extra4.default.writeFileSync(appPath, AppJsContent(useingSrc));
+    import_fs_extra4.default.writeFileSync(appPath, AppJsContent(usingSrc));
   } else {
     const override = await (0, import_prompts.default)({
       name: "res",
       type: "confirm",
-      message: `do you want us to ${import_chalk2.default.bold(`override`)} your _app${appExtension}?`
+      message: `do you want us to ${import_chalk3.default.bold(`override`)} your _app${appExtension}?`
     });
+    _ctx.overrideApp = override.res;
     if (override.res) {
       logger.info(logText(`Adding _app${appExtension} ... \u2705`));
       const appPathWithExtension = import_path5.default.join(pagesPath, `_app${appExtension}`);
@@ -1273,10 +1370,7 @@ async function tinaSetup(_ctx, next, _options) {
         ...fileContent.toString().matchAll(/^.*import.*\.css("|').*$/gm)
       ];
       const primaryMatches = matches.map((x) => x[0]);
-      import_fs_extra4.default.writeFileSync(appPathWithExtension, AppJsContent(useingSrc, primaryMatches.join("\n")));
-    } else {
-      logger.info(dangerText(`Heads up, to enable live-editing you'll need to wrap your page or site in Tina:
-`, warnText(AppJsContent(useingSrc))));
+      import_fs_extra4.default.writeFileSync(appPathWithExtension, AppJsContent(usingSrc, primaryMatches.join("\n")));
     }
   }
   const tinaBlogPagePath = import_path5.default.join(pagesPath, "demo", "blog");
@@ -1303,10 +1397,26 @@ async function tinaSetup(_ctx, next, _options) {
   next();
 }
 async function successMessage(ctx, next, options) {
-  logger.info(`Tina setup ${import_chalk2.default.underline.green("done")}  \u2705
-	 Start your dev server with ${successText(`yarn dev`)} and go to http://localhost:3000/demo/blog/HelloWorld to ${successText("check it out the page that was created for you")}
-Enjoy Tina \u{1F999} !
+  const usingSrc = import_fs_extra4.default.pathExistsSync(import_path5.default.join(baseDir, "src"));
+  logger.info(`Tina setup ${import_chalk3.default.underline.green("done")} \u2705
+`);
+  logger.info("Next Steps: \n");
+  if (!ctx.overrideApp) {
+    logger.info(`${import_chalk3.default.bold("Add the Tina wrapper")}`);
+    logger.info(`\u26A0\uFE0F Before using Tina, you will NEED to add the Tina wrapper to your _app.jsx 
+`);
+    logger.info(`${AppJsContent(usingSrc)}`);
+  }
+  logger.info(`${import_chalk3.default.bold("Run your site with Tina")}`);
+  logger.info(`  yarn dev 
+`);
+  logger.info(`${import_chalk3.default.bold("Start Editing")}`);
+  logger.info(`  Go to 'http://localhost:3000/admin' 
 `);
+  logger.info(`${import_chalk3.default.bold("Read the docs")}`);
+  logger.info(`  Check out 'https://tina.io/docs/introduction/tina-init/#adding-tina' for help getting started with Tina 
+`);
+  logger.info(`Enjoy Tina! \u{1F999}`);
   next();
 }
 
@@ -1318,7 +1428,7 @@ var import_datalayer3 = __toModule(require("@tinacms/datalayer"));
 var import_graphql8 = __toModule(require("@tinacms/graphql"));
 var import_path6 = __toModule(require("path"));
 var import_graphql9 = __toModule(require("@tinacms/graphql"));
-var import_chalk3 = __toModule(require("chalk"));
+var import_chalk4 = __toModule(require("chalk"));
 var auditCollection = async (args) => {
   let warning = false;
   const { collection, database, rootPath: rootPath2 } = args;
@@ -1352,7 +1462,7 @@ var auditCollection = async (args) => {
     const node = x.node;
     if (node.sys.extension.replace(".", "") !== format) {
       warning = true;
-      logger.warn(import_chalk3.default.yellowBright(`WARNING: there is a file with extension \`${node.sys.extension}\` but in your schema it is defined to be \`.${format}\`
+      logger.warn(import_chalk4.default.yellowBright(`WARNING: there is a file with extension \`${node.sys.extension}\` but in your schema it is defined to be \`.${format}\`
 
 location: ${import_path6.default.join(rootPath2, node.sys.path)}`));
     }
@@ -1438,7 +1548,7 @@ var auditDocuments = async (args) => {
     if (mutationRes.errors) {
       mutationRes.errors.forEach((err) => {
         error = true;
-        logger.error(import_chalk3.default.red(err.message));
+        logger.error(import_chalk4.default.red(err.message));
       });
     }
   }
@@ -1489,7 +1599,7 @@ function filterObject(obj) {
 }
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/audit/index.ts
-var import_chalk4 = __toModule(require("chalk"));
+var import_chalk5 = __toModule(require("chalk"));
 var import_prompts2 = __toModule(require("prompts"));
 var import_metrics3 = __toModule(require("@tinacms/metrics"));
 var rootPath = process.cwd();
@@ -1503,7 +1613,7 @@ var audit = async (ctx, next, options) => {
     }
   });
   if (options.clean) {
-    logger.info(`You are using the \`--clean\` option. This will modify your content as if a user is submitting a form. Before running this you should have a ${import_chalk4.default.bold("clean git tree")} so unwanted changes can be undone.
+    logger.info(`You are using the \`--clean\` option. This will modify your content as if a user is submitting a form. Before running this you should have a ${import_chalk5.default.bold("clean git tree")} so unwanted changes can be undone.
 
 `);
     const res = await (0, import_prompts2.default)({
@@ -1512,12 +1622,12 @@ var audit = async (ctx, next, options) => {
       message: `Do you want to continue?`
     });
     if (!res.useClean) {
-      logger.warn(import_chalk4.default.yellowBright("\u26A0\uFE0F Audit not complete"));
+      logger.warn(import_chalk5.default.yellowBright("\u26A0\uFE0F Audit not complete"));
       process.exit(0);
     }
   }
   if (options.useDefaultValues && !options.clean) {
-    logger.warn(import_chalk4.default.yellowBright("WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"));
+    logger.warn(import_chalk5.default.yellowBright("WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"));
   }
   const bridge = options.clean ? new import_datalayer3.FilesystemBridge(rootPath) : new import_datalayer3.AuditFileSystemBridge(rootPath);
   const store = options.clean ? new import_datalayer3.FilesystemStore({ rootPath }) : new import_datalayer3.AuditFilesystemStore({ rootPath });
@@ -1549,17 +1659,17 @@ var audit = async (ctx, next, options) => {
 };
 var printFinalMessage = async (ctx, next, _options) => {
   if (ctx.error) {
-    logger.error(import_chalk4.default.redBright(`\u203C\uFE0F Audit ${import_chalk4.default.bold("failed")} with errors`));
+    logger.error(import_chalk5.default.redBright(`\u203C\uFE0F Audit ${import_chalk5.default.bold("failed")} with errors`));
   } else if (ctx.warning) {
-    logger.warn(import_chalk4.default.yellowBright("\u26A0\uFE0F Audit passed with warnings"));
+    logger.warn(import_chalk5.default.yellowBright("\u26A0\uFE0F Audit passed with warnings"));
   } else {
-    logger.info(import_chalk4.default.greenBright("\u2705 Audit passed"));
+    logger.info(import_chalk5.default.greenBright("\u2705 Audit passed"));
   }
   next();
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
-var import_chalk5 = __toModule(require("chalk"));
+var import_chalk6 = __toModule(require("chalk"));
 var CMD_GEN_TYPES = "schema:types";
 var CMD_START_SERVER = "server:start";
 var CMD_COMPILE_MODELS = "schema:compile";
@@ -1573,6 +1683,10 @@ var experimentalDatalayer = {
   name: "--experimentalData",
   description: "Build the server with additional data querying capabilities"
 };
+var schemaFileType = {
+  name: "--schemaFileType [fileType]",
+  description: "The file type to use for the Tina schema"
+};
 var subCommand = {
   name: "-c, --command <command>",
   description: "The sub-command to run"
@@ -1630,13 +1744,14 @@ var baseCmds = [
   },
   {
     command: INIT,
-    options: [experimentalDatalayer, noTelemetryOption],
+    options: [experimentalDatalayer, noTelemetryOption, schemaFileType],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
+      checkDeps,
       initTina,
       installDeps,
-      async (_ctx, next) => {
-        await compile(_ctx, next);
+      async (_ctx, next, options2) => {
+        await compile(_ctx, next, options2);
         next();
       },
       attachSchema,
@@ -1655,14 +1770,14 @@ var baseCmds = [
         next();
       },
       async (_ctx, next) => {
-        await compile(_ctx, next);
+        await compile(_ctx, next, options);
         next();
       },
       attachSchema,
       genTypes,
       async (_ctx, next) => {
         logger.level = "info";
-        logger.info(import_chalk5.default.hex("#eb6337").bgWhite("Welcome to tina audit \u{1F999}"));
+        logger.info(import_chalk6.default.hex("#eb6337").bgWhite("Welcome to tina audit \u{1F999}"));
         next();
       },
       audit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.9",
+  "version": "0.60.12",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -57,15 +57,16 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/datalayer": "0.0.2",
-    "@tinacms/graphql": "0.59.8",
-    "@tinacms/metrics": "0.0.2",
+    "@tinacms/datalayer": "0.1.1",
+    "@tinacms/graphql": "0.59.11",
+    "@tinacms/metrics": "0.0.3",
+    "@tinacms/schema-tools": "0.0.3",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
     "add": "^2.0.6",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",
-    "axios": "0.19.0",
+    "axios": "0.21.2",
     "body-parser": "^1.19.0",
     "chalk": "^2.4.2",
     "chokidar": "^3.5.1",