@tinacms/cli 0.60.14 → 0.60.17

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # tinacms-cli
 
+## 0.60.17
+
+### Patch Changes
+
+- 08cdb672a: Adds `useRelativeMedia` support to local graphql client
+- 646cad8da: Adds support for using the generated client on the frontend
+- f857616f6: Rename sdk to queries
+- Updated dependencies [08cdb672a]
+- Updated dependencies [fdbfe9a16]
+- Updated dependencies [6e2ed31a2]
+  - @tinacms/graphql@0.60.2
+  - @tinacms/schema-tools@0.0.4
+
+## 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

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

@@ -2,3 +2,4 @@ export declare const adminPage = "import { TinaAdmin } from 'tinacms';\nexport d
 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

@@ -92,7 +92,11 @@ var init_server = __esm({
       }));
       app.post("/graphql", async (req, res) => {
         const { query, variables } = req.body;
+        const config = {
+          useRelativeMedia: true
+        };
         const result = await gqlPackage.resolve({
+          config,
           database,
           query,
           variables
@@ -114,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.60.14";
+var version = "0.60.17";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -165,31 +169,45 @@ var import_graphql5 = __toModule(require("graphql"));
 var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
   return `
 // TinaSDK generated code
-import { staticRequest } from 'tinacms'
-const requester: (doc: any, vars?: any, options?: any) => Promise<any> = async (
-  doc,
-  vars,
-  _options
-) => {
-  let data = {}
-  try {
-    data = await staticRequest({
-      query: doc,
-      variables: vars,
-    })
-  } catch (e) {
-    // swallow errors related to document creation
-    console.warn('Warning: There was an error when fetching data')
-    console.warn(e)
-  }
+import { createClient, TinaClient } from "tinacms/dist/client";
+
+const generateRequester = (client: TinaClient) => {
+  const requester: (
+    doc: any,
+    vars?: any,
+    options?: any,
+    client
+  ) => Promise<any> = async (doc, vars, _options) => {
+    let data = {};
+    try {
+      data = await client.request({
+        query: doc,
+        variables: vars,
+      });
+    } catch (e) {
+      // swallow errors related to document creation
+      console.warn("Warning: There was an error when fetching data");
+      console.warn(e);
+    }
 
-  return { data, query: doc, variables: vars || {} }
-}
+    return { data: data?.data, query: doc, variables: vars || {} };
+  };
+
+  return requester;
+};
 
 /**
  * @experimental this class can be used but may change in the future
  **/
-export const ExperimentalGetTinaClient = ()=>getSdk(requester)
+export const ExperimentalGetTinaClient = () =>
+  getSdk(
+    generateRequester(createClient({ url: "http://localhost:4001/graphql" }))
+  );
+
+export const queries = (client: TinaClient) => {
+  const requester = generateRequester(client);
+  return getSdk(requester);
+};
 `;
 };
 var AddGeneratedClient = {
@@ -275,7 +293,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 +345,7 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
         { typescript: {} },
         { typescriptOperations: {} },
         {
-          typescriptSdk: {
-            gqlImport: "tinacms#gql",
-            documentNodeImport: "tinacms#DocumentNode"
-          }
+          typescriptSdk: {}
         },
         { AddGeneratedClient: {} }
       ],
@@ -362,6 +376,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)}`);
@@ -941,6 +962,22 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
 
 `;
 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 +989,7 @@ var AppJsContent = (usingSrc, extraImports) => {
     ${import_chalk4.default.green("+ </Tina>")}
   )
 }
-  
+
 export default App
 `;
 };
@@ -1177,7 +1214,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 
@@ -1382,6 +1419,9 @@ var resetGeneratedFolder = async () => {
     console.log(e);
   }
   await import_fs_extra4.default.mkdir(tinaGeneratedPath);
+  await import_fs_extra4.default.writeFile(import_path5.default.join(tinaGeneratedPath, "types.ts"), `
+export const queries = (client)=>({})
+`);
   await import_fs_extra4.default.outputFile(import_path5.default.join(tinaGeneratedPath, ".gitignore"), "db");
 };
 var cleanup = async ({ tinaTempPath: tinaTempPath2 }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.14",
+  "version": "0.60.17",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,9 +58,9 @@
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
     "@tinacms/datalayer": "0.1.1",
-    "@tinacms/graphql": "0.60.0",
+    "@tinacms/graphql": "0.60.2",
     "@tinacms/metrics": "0.0.3",
-    "@tinacms/schema-tools": "0.0.3",
+    "@tinacms/schema-tools": "0.0.4",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
     "add": "^2.0.6",
     "ajv": "^6.12.3",