@tinacms/cli 0.60.13 → 0.60.16

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # tinacms-cli
 
+## 0.60.16
+
+### Patch Changes
+
+- 7372f90ca: Adds a new client that can be used on the backend and frontend.
+- Updated dependencies [3b11ff6ad]
+  - @tinacms/graphql@0.60.1
+
+## 0.60.15
+
+### Patch Changes
+
+- ceb826916: Fix issue where \_app override from tina init was improperly formatted
+
+## 0.60.14
+
+### Patch Changes
+
+- Updated dependencies [6a6f137ae]
+  - @tinacms/graphql@0.60.0
+
 ## 0.60.13
 
 ### Patch Changes

package/bin/tinacms

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require = require("esm")(module);
-require("../dist").init(process.argv);
+require = require('esm')(module)
+require('../dist').init(process.argv)

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

@@ -1,4 +1,5 @@
 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<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 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;
+export declare const AppJsContentPrintout: (usingSrc: boolean, extraImports?: string) => string;

package/dist/index.js

@@ -79,7 +79,7 @@ var init_server = __esm({
       # We've got a simple query set up for you to get started
       # but there's plenty more for you to explore on your own!
       query MyQuery {
-        getCollections {
+        collections {
           documents {
             id
             sys {
@@ -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.13";
+var version = "0.60.16";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -165,7 +165,9 @@ var import_graphql5 = __toModule(require("graphql"));
 var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
   return `
 // TinaSDK generated code
-import { staticRequest } from 'tinacms'
+import { createClient } from 'tinacms/dist/client'
+const client = createClient({url: 'http://localhost:4001/graphql'})
+
 const requester: (doc: any, vars?: any, options?: any) => Promise<any> = async (
   doc,
   vars,
@@ -173,7 +175,7 @@ const requester: (doc: any, vars?: any, options?: any) => Promise<any> = async (
 ) => {
   let data = {}
   try {
-    data = await staticRequest({
+    data = await client.request({
       query: doc,
       variables: vars,
     })
@@ -183,7 +185,7 @@ const requester: (doc: any, vars?: any, options?: any) => Promise<any> = async (
     console.warn(e)
   }
 
-  return { data, query: doc, variables: vars || {} }
+  return { data: data?.data, query: doc, variables: vars || {} }
 }
 
 /**
@@ -275,7 +277,6 @@ var plugin = (schema, documents, config) => {
   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"),
@@ -328,10 +329,7 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
         { typescript: {} },
         { typescriptOperations: {} },
         {
-          typescriptSdk: {
-            gqlImport: "tinacms#gql",
-            documentNodeImport: "tinacms#DocumentNode"
-          }
+          typescriptSdk: {}
         },
         { AddGeneratedClient: {} }
       ],
@@ -362,6 +360,13 @@ async function genTypes({ schema }, next, options) {
   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
+export function gql(strings: TemplateStringsArray, ...args: string[]): string {
+  let str = ''
+  strings.forEach((string, i) => {
+    str += string + (args[i] || '')
+  })
+  return str
+}
 ${typescriptTypes}
 `);
   logger.info(`	Typescript types => ${logText(typesPath)}`);
@@ -393,13 +398,13 @@ var auditCollection = async (args) => {
   const { collection, database, rootPath: rootPath2 } = args;
   logger.info(`Checking collection ${collection.name}`);
   const query = `query {
-        getCollection(collection: "${collection.name}") {
+        collection(collection: "${collection.name}") {
           format
           documents {
             edges {
               node {
                 ...on Document {
-                  sys {
+                  _sys {
                     extension
                     path
                   }
@@ -415,15 +420,15 @@ var auditCollection = async (args) => {
     query,
     variables: {}
   });
-  const format = result.data.getCollection.format;
-  const docs = result.data.getCollection.documents.edges;
+  const format = result.data.collection.format;
+  const docs = result.data.collection.documents.edges;
   docs.forEach((x) => {
     const node = x.node;
-    if (node.sys.extension.replace(".", "") !== format) {
+    if (node._sys.extension.replace(".", "") !== format) {
       warning = true;
-      logger.warn(import_chalk2.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_chalk2.default.yellowBright(`WARNING: there is a file with extension \`${node._sys.extension}\` but in your schema it is defined to be \`.${format}\`
 
-location: ${import_path2.default.join(rootPath2, node.sys.path)}`));
+location: ${import_path2.default.join(rootPath2, node._sys.path)}`));
     }
   });
   return warning;
@@ -431,14 +436,14 @@ location: ${import_path2.default.join(rootPath2, node.sys.path)}`));
 var auditDocuments = async (args) => {
   const { collection, database, rootPath: rootPath2, useDefaultValues } = args;
   const query = `query {
-        getCollection(collection: "${collection.name}") {
+        collection(collection: "${collection.name}") {
           format
           slug
           documents {
             edges {
               node {
                 ...on Document {
-                  sys {
+                  _sys {
                     extension
                     path
                     relativePath
@@ -456,16 +461,16 @@ var auditDocuments = async (args) => {
     variables: {}
   });
   let error = false;
-  const documents = result.data.getCollection.documents.edges;
+  const documents = result.data.collection.documents.edges;
   for (let i = 0; i < documents.length; i++) {
     const node = documents[i].node;
-    const fullPath = import_path2.default.join(rootPath2, node.sys.path);
+    const fullPath = import_path2.default.join(rootPath2, node._sys.path);
     logger.info(`Checking document: ${fullPath}`);
     const documentQuery = `query {
-        getDocument(collection: "${collection.name}", relativePath: "${node.sys.relativePath}") {
+        document(collection: "${collection.name}", relativePath: "${node._sys.relativePath}") {
           __typename
           ...on Document {
-            values
+            _values
           }
         }
       }`;
@@ -483,7 +488,7 @@ var auditDocuments = async (args) => {
         }
       });
     }
-    const params = transformDocumentIntoMutationRequestPayload(docResult.data.getDocument.values, {
+    const params = transformDocumentIntoMutationRequestPayload(docResult.data.document._values, {
       includeCollection: true,
       includeTemplate: typeof collection.templates !== "undefined"
     }, topLevelDefaults);
@@ -500,7 +505,7 @@ var auditDocuments = async (args) => {
       variables: {
         params,
         collection: collection.name,
-        relativePath: node.sys.relativePath
+        relativePath: node._sys.relativePath
       },
       silenceErrors: true
     });
@@ -637,7 +642,7 @@ title: Vote For Pedro
 ---
 # Welcome to the blog.
 
-> To edit this site head over to the [\`/admin\`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \u{1F999}. 
+> To edit this site head over to the [\`/admin\`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \u{1F999}.
 
 # Dixi gaude Arethusa
 
@@ -662,7 +667,7 @@ mille rigidi sub taurum.
 `;
 var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   // This is a demo file once you have tina setup feel free to delete this file
-  
+
   import { staticRequest, gql } from "tinacms";
   import Head from "next/head";
   import { createGlobalStyle } from "styled-components";
@@ -671,11 +676,9 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
 
   const query = gql\`
     query BlogPostQuery($relativePath: String!) {
-      getPostsDocument(relativePath: $relativePath) {
-        data {
+      posts(relativePath: $relativePath) {
         title
-          body
-        }
+        body
       }
     }
   \`
@@ -713,7 +716,7 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
     text-decoration: underline;
   }
   \`;
-  
+
   const BlogPage = (props) => {
     const { data } = useTina({
       query,
@@ -740,10 +743,10 @@ 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}
+              {data.posts.title}
             </h1>
             <ContentSection
-              content={data.getPostsDocument.data.body}
+              content={data.posts.body}
             ></ContentSection>
           </div>
           <div className="bg-green-100 text-center">
@@ -761,7 +764,7 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
       </>
     );
   };
-  
+
   export const getStaticProps = async ({ params }) => {
     const variables = { relativePath: \`\${params.filename}.md\` }
     let data = {}
@@ -782,16 +785,18 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
       },
     }
   };
-  
+
   export const getStaticPaths = async () => {
     const postsListData = (await staticRequest({
       query: gql\`
         query GetPostsList {
-          getPostsList {
+          postsConnection {
             edges {
               node {
-                sys {
-                  filename
+                ...on Document {
+                  _sys {
+                    filename
+                  }
                 }
               }
             }
@@ -799,15 +804,15 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
         }
       \`,
     }));
-  
+
     return {
-      paths: postsListData.getPostsList.edges.map((post) => ({
-        params: { filename: post.node.sys.filename },
+      paths: postsListData.postsConnection.edges.map((post) => ({
+        params: { filename: post.node._sys.filename },
       })),
       fallback: false,
     };
   };
-  
+
   export default BlogPage;
 
   const PageSection = props => {
@@ -822,7 +827,7 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   const components = {
     PageSection: PageSection,
   }
-  
+
   const ContentSection = ({ content }) => {
     return (
       <div className="relative py-16 bg-white overflow-hidden">
@@ -938,9 +943,25 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
       </div>
     );
   };
-  
+
 `;
 var AppJsContent = (usingSrc, extraImports) => {
+  const importLine = `import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`;
+  return `${importLine}
+${extraImports || ""}
+
+const App = ({ Component, pageProps }) => {
+  return (
+    <Tina>
+      <Component {...pageProps} />
+    </Tina>
+  )
+}
+
+export default App
+`;
+};
+var AppJsContentPrintout = (usingSrc, extraImports) => {
   const importLine = import_chalk4.default.green(`+ import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`);
   return `${importLine}
   ${extraImports || ""}
@@ -952,7 +973,7 @@ var AppJsContent = (usingSrc, extraImports) => {
     ${import_chalk4.default.green("+ </Tina>")}
   )
 }
-  
+
 export default App
 `;
 };
@@ -1177,7 +1198,7 @@ async function successMessage(ctx, next, options) {
     logger.info(`${import_chalk5.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(`${AppJsContentPrintout(usingSrc)}`);
   }
   logger.info(`${import_chalk5.default.bold("Run your site with Tina")}`);
   logger.info(`  yarn dev 
@@ -1255,7 +1276,7 @@ var import_esbuild = __toModule(require("esbuild"));
 var defaultSchema = (sep) => `
 import { defineSchema, defineConfig } from "tinacms";
 
-export default defineSchema({
+const schema = defineSchema({
   collections: [
     {
       label: "Blog Posts",
@@ -1299,8 +1320,7 @@ export default defineSchema({
   ],
 });
 
-
-
+export default schema
 
 // Your tina config
 // ==============
@@ -1314,6 +1334,7 @@ const apiURL =
 
 export const tinaConfig = defineConfig({
   apiURL,
+  schema,
   cmsCallback: (cms) => {
     //  add your CMS callback code here (if you want)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.13",
+  "version": "0.60.16",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,7 +58,7 @@
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
     "@tinacms/datalayer": "0.1.1",
-    "@tinacms/graphql": "0.59.11",
+    "@tinacms/graphql": "0.60.1",
     "@tinacms/metrics": "0.0.3",
     "@tinacms/schema-tools": "0.0.3",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",