@tinacms/cli 0.58.5 → 0.59.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # tinacms-cli
 
+## 0.59.0
+
+### Minor Changes
+
+- 70da62fe8: deprecated the use of `getStaticPropsForTina`
+
+### Patch Changes
+
+- 80732bd97: Create a @tinacms/datalayer package which houses the logic for data management for the GraphQL API. This simplifies the @tinacms/graphql package and allows for a clearer separation.
+- Updated dependencies [34cd3a44a]
+- Updated dependencies [b006a5ab9]
+- Updated dependencies [a324b9c37]
+- Updated dependencies [80732bd97]
+- Updated dependencies [0bec208e2]
+- Updated dependencies [5c070a83f]
+  - @tinacms/graphql@0.59.3
+  - @tinacms/datalayer@0.0.1
+
 ## 0.58.5
 
 ### Patch Changes

package/dist/index.js

@@ -30,7 +30,7 @@ var server_exports = {};
 __export(server_exports, {
   default: () => server_default
 });
-var 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, gqlServer, server_default;
 var init_server = __esm({
   "pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
     import_cors = __toModule(require("cors"));
@@ -38,7 +38,6 @@ var init_server = __esm({
     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 (database) => {
       const gqlPackage = require("@tinacms/graphql");
       const app = (0, import_express.default)();
@@ -71,36 +70,6 @@ var init_server = __esm({
         });
         return res.json(result);
       });
-      app.get("/list-branches", async (req, res) => {
-        try {
-          const { query } = req;
-          const { owner, repo } = query;
-          const result = await gqlPackage.listBranches({
-            auth: GITHUB_ACCESS_TOKEN,
-            owner,
-            repo
-          });
-          return res.json(result.data);
-        } catch (error) {
-          console.error("There was a problem fetching the branches.", error);
-        }
-      });
-      app.post("/create-branch", async (req, res) => {
-        try {
-          const { owner, repo, name: name2, baseBranch } = req.body;
-          const result = await gqlPackage.createBranch({
-            auth: GITHUB_ACCESS_TOKEN,
-            owner,
-            repo,
-            baseBranch,
-            name: name2
-          });
-          return res.json(result);
-        } catch (error) {
-          res.end();
-          console.error("There was a problem creating a new branch.", error);
-        }
-      });
       return server;
     };
     server_default = gqlServer;
@@ -116,7 +85,7 @@ var commander = __toModule(require("commander"));
 
 // pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.58.5";
+var version = "0.59.0";
 
 // pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
@@ -150,6 +119,7 @@ var chain = async (cmds, options) => {
 
 // pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
+var import_datalayer = __toModule(require("@tinacms/datalayer"));
 
 // pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/logger/index.ts
 var import_log4js = __toModule(require("log4js"));
@@ -166,8 +136,8 @@ logger.level = "info";
 async function attachSchema(ctx, next, options) {
   logger.info(logText("Building schema..."));
   const rootPath = process.cwd();
-  const bridge = new import_graphql.FilesystemBridge(rootPath);
-  const store = new import_graphql.FilesystemStore({ rootPath });
+  const bridge = new import_datalayer.FilesystemBridge(rootPath);
+  const store = new import_datalayer.FilesystemStore({ rootPath });
   const database = await (0, import_graphql.createDatabase)({ store, bridge });
   const schema = await (0, import_graphql.buildSchema)(rootPath, database);
   ctx.schema = schema;
@@ -184,16 +154,26 @@ var import_typescript_operations = __toModule(require("@graphql-codegen/typescri
 var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
   return `
 // TinaSDK generated code
-import { getStaticPropsForTina } from 'tinacms'
+import { staticRequest } 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
-};
+  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)
+  }
+
+  return { data, query: doc, variables: vars || {} }
+}
 
 /**
  * @experimental this class can be used but may change in the future
@@ -384,6 +364,7 @@ schema {
 var import_child_process = __toModule(require("child_process"));
 var import_path3 = __toModule(require("path"));
 var import_graphql7 = __toModule(require("@tinacms/graphql"));
+var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
 
 // pnp:/Users/jeffsee/code/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
 var import_fast_glob = __toModule(require("fast-glob"));
@@ -490,8 +471,8 @@ async function startServer(_ctx, _next, { port = 4001, command, noWatch, experim
   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 bridge = new import_datalayer2.FilesystemBridge(rootPath);
+  const store = experimentalData ? new import_datalayer2.LevelStore(rootPath) : new import_datalayer2.FilesystemStore({ rootPath });
   const shouldBuild = bridge.supportsBuilding();
   const database = await (0, import_graphql7.createDatabase)({ store, bridge });
   const startSubprocess = () => {
@@ -651,7 +632,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, getStaticPropsForTina } from "tinacms";
+  import { staticRequest, gql } from "tinacms";
   import Head from "next/head";
   import { createGlobalStyle } from "styled-components";
   
@@ -742,24 +723,35 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   };
   
   export const getStaticProps = async ({ params }) => {
-    const tinaProps = await getStaticPropsForTina({
-      query: gql\`
-        query BlogPostQuery($relativePath: String!) {
-          getPostsDocument(relativePath: $relativePath) {
-            data {
-              title
-              body
-            }
+    const query = gql\`
+      query BlogPostQuery($relativePath: String!) {
+        getPostsDocument(relativePath: $relativePath) {
+          data {
+           title
+            body
           }
         }
-      \`,
-      variables: { relativePath: \`\${params.filename}.md\` },
-    });
+      }
+    \`
+    const variables = { relativePath: \`\${params.filename}.md\` }
+    let data = {}
+    try {
+      data = await staticRequest({
+        query,
+        variables,
+      })
+    } catch {
+      // swallow errors related to document creation
+    }
+
     return {
       props: {
-        ...tinaProps,
+        query,
+        variables,
+        data,
+        //myOtherProp: 'some-other-data',
       },
-    };
+    }
   };
   
   export const getStaticPaths = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.58.5",
+  "version": "0.59.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -56,7 +56,8 @@
     "@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.59.2",
+    "@tinacms/datalayer": "0.0.1",
+    "@tinacms/graphql": "0.59.3",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",