@tinacms/cli 0.60.1 → 0.60.5

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # tinacms-cli
 
+## 0.60.5
+
+### Patch Changes
+
+- 399fbf4fa: Fix an issue where builds weren't happening during CI, this is only an issue for the experimental data layer
+
+## 0.60.4
+
+### Patch Changes
+
+- a05546eb4: Added basic open source telemetry
+
+  See [this discussion](https://github.com/tinacms/tinacms/discussions/2451) for more information and how to opt out.
+
+- Updated dependencies [8bf0ac832]
+- Updated dependencies [a05546eb4]
+  - @tinacms/metrics@0.0.2
+  - @tinacms/datalayer@0.0.2
+  - @tinacms/graphql@0.59.6
+
+## 0.60.3
+
+### Patch Changes
+
+- 43b40cc8b: Implement useTina in CLI init
+- b399c734c: Fixes support for collection.templates in graphql
+- Updated dependencies [b399c734c]
+  - @tinacms/datalayer@0.0.2
+  - @tinacms/graphql@0.59.6
+
+## 0.60.2
+
+### Patch Changes
+
+- d17de356a: Update CLI to use apiUrl
+- a67b0c1d7: Dont reinstantiate bridge and store
+
 ## 0.60.1
 
 ### Patch Changes

package/dist/cmds/start-server/index.d.ts

@@ -16,6 +16,7 @@ interface Options {
     experimentalData?: boolean;
     noWatch?: boolean;
     noSDK: boolean;
+    noTelemetry: boolean;
 }
-export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK }: Options): Promise<void>;
+export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK, noTelemetry, }: Options): Promise<void>;
 export {};

package/dist/index.js

@@ -1,10 +1,39 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
 };
@@ -85,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.1";
+var version = "0.60.5";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
@@ -465,9 +494,23 @@ var defineSchema = (config) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_chokidar = __toModule(require("chokidar"));
+var import_metrics = __toModule(require("@tinacms/metrics"));
 var gqlPackageFile = require.resolve("@tinacms/graphql");
-async function startServer(_ctx, _next, { port = 4001, command, noWatch, experimentalData, noSDK }) {
+async function startServer(_ctx, _next, {
+  port = 4001,
+  command,
+  noWatch,
+  experimentalData,
+  noSDK,
+  noTelemetry
+}) {
   const rootPath2 = process.cwd();
+  const t = new import_metrics.Telemetry({ disabled: Boolean(noTelemetry) });
+  t.submitRecord({
+    event: {
+      name: "tinacms:cli:server:start:invoke"
+    }
+  });
   if (!process.env.CI && !noWatch) {
     await resetGeneratedFolder();
   }
@@ -498,6 +541,16 @@ stack: ${code.stack || "No stack was provided"}`);
     }
   };
   let ready = false;
+  const build = async (noSDK2) => {
+    if (!process.env.CI && !noWatch) {
+      await resetGeneratedFolder();
+    }
+    const database2 = await (0, import_graphql7.createDatabase)({ store, bridge });
+    await compile(null, null);
+    const schema = await (0, import_graphql7.buildSchema)(rootPath2, database2);
+    await genTypes({ schema }, () => {
+    }, { noSDK: noSDK2 });
+  };
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([`${rootPath2}/**/*.{ts,gql,graphql}`], {
       ignored: `${import_path3.default.resolve(rootPath2)}/.tina/__generated__/**/*`
@@ -524,22 +577,20 @@ stack: ${code.stack || "No stack was provided"}`);
         } catch (e) {
           logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
  ${e.message}`);
+          t.submitRecord({
+            event: {
+              name: "tinacms:cli:server:error",
+              errorMessage: e.message
+            }
+          });
         }
       }
     });
-  }
-  const build = async (noSDK2) => {
-    if (!process.env.CI && !noWatch) {
-      await resetGeneratedFolder();
+  } else {
+    if (shouldBuild) {
+      await build(noSDK);
     }
-    const bridge2 = new import_datalayer2.FilesystemBridge(rootPath2);
-    const store2 = experimentalData ? new import_datalayer2.LevelStore(rootPath2) : new import_datalayer2.FilesystemStore({ rootPath: rootPath2 });
-    const database2 = await (0, import_graphql7.createDatabase)({ store: store2, bridge: bridge2 });
-    await compile(null, null);
-    const schema = await (0, import_graphql7.buildSchema)(rootPath2, database2);
-    await genTypes({ schema }, () => {
-    }, { noSDK: noSDK2 });
-  };
+  }
   const state = {
     server: null,
     sockets: []
@@ -600,6 +651,7 @@ var import_fs_extra3 = __toModule(require("fs-extra"));
 var import_path4 = __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 adminPage = `import { TinaAdmin } from 'tinacms';
@@ -641,7 +693,19 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   import { staticRequest, gql } from "tinacms";
   import Head from "next/head";
   import { createGlobalStyle } from "styled-components";
-  
+  import { useTina } from "tinacms/dist/edit-state";
+
+  const query = gql\`
+    query BlogPostQuery($relativePath: String!) {
+      getPostsDocument(relativePath: $relativePath) {
+        data {
+        title
+          body
+        }
+      }
+    }
+  \`
+
   // Styles for markdown
   const GlobalStyle = createGlobalStyle\`
   h1,h2,h3,h4,h5 {
@@ -678,6 +742,12 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   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,
+      variables: props.variables,
+      data: props.data,
+    });
+
     return (
       <>
         <Head>
@@ -703,12 +773,12 @@ 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">
-              {props.data.getPostsDocument.data.title}
+              {data.getPostsDocument.data.title}
             </h1>
             {/* Convert markdown to html in the browser only */}
             {typeof window !== "undefined" && (
               <ContentSection
-                content={window.marked.parse(props.data.getPostsDocument.data.body)}
+                content={window.marked.parse(data.getPostsDocument.data.body)}
               ></ContentSection>
             )}
           </div>
@@ -729,16 +799,6 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   };
   
   export const getStaticProps = async ({ params }) => {
-    const query = gql\`
-      query BlogPostQuery($relativePath: String!) {
-        getPostsDocument(relativePath: $relativePath) {
-          data {
-           title
-            body
-          }
-        }
-      }
-    \`
     const variables = { relativePath: \`\${params.filename}.md\` }
     let data = {}
     try {
@@ -752,7 +812,6 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
 
     return {
       props: {
-        query,
         variables,
         data,
         //myOtherProp: 'some-other-data',
@@ -909,20 +968,22 @@ import { TinaEditProvider } from 'tinacms/dist/edit-state'
 const TinaCMS = dynamic(() => import('tinacms'), { ssr: false })
 ${extraImports || ""}
 
+const branch = process.env.NEXT_PUBLIC_EDIT_BRANCH || "main";
+const apiURL =
+  process.env.NODE_ENV == "development"
+    ? "http://localhost:4001/graphql"
+    : \`https://content.tinajs.io/content/\${process.env.NEXT_PUBLIC_TINA_CLIENT_ID}/github/\${branch}\`;
+
 const App = ({ Component, pageProps }) => {
   return (
     <>
       <TinaEditProvider
         editMode={
           <TinaCMS
-            clientId={process.env.NEXT_PUBLIC_TINA_CLIENT_ID}
-            branch={process.env.NEXT_PUBLIC_EDIT_BRANCH}
-            isLocalClient={Boolean(
-              Number(process.env.NEXT_PUBLIC_USE_LOCAL_CLIENT ?? true)
-            )}
-            {...pageProps}
+            apiURL={apiURL}
+
           >
-            {(livePageProps) => <Component {...livePageProps} />}
+            <Component {...pageProps} />
           </TinaCMS>
         }
       >
@@ -939,7 +1000,7 @@ export default App
 var import_chalk2 = __toModule(require("chalk"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve2, _reject) => {
     exec(cmd, (error, stdout, stderr) => {
       if (error) {
         console.warn(error);
@@ -949,6 +1010,8 @@ 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" } });
   logger.info(successText("Setting up Tina..."));
   next();
 }
@@ -1018,15 +1081,13 @@ async function tinaSetup(ctx, next, options) {
   const packagePath = import_path4.default.join(baseDir, "package.json");
   const pack = JSON.parse((0, import_fs_extra3.readFileSync)(packagePath).toString());
   const oldScripts = pack.scripts || {};
-  const newPack = JSON.stringify({
-    ...pack,
-    scripts: {
-      ...oldScripts,
+  const newPack = JSON.stringify(__spreadProps(__spreadValues({}, pack), {
+    scripts: __spreadProps(__spreadValues({}, oldScripts), {
       "tina-dev": 'yarn tinacms server:start -c "next dev"',
       "tina-build": 'yarn tinacms server:start -c "next build"',
       "tina-start": 'yarn tinacms server:start -c "next start"'
-    }
-  }, null, 2);
+    })
+  }), null, 2);
   (0, import_fs_extra3.writeFileSync)(packagePath, newPack);
   const adminPath = import_path4.default.join(pagesPath, "admin", "[[...tina]].js");
   if (import_fs_extra3.default.pathExistsSync(import_path4.default.join(pagesPath, "admin"))) {
@@ -1038,7 +1099,6 @@ async function tinaSetup(ctx, next, options) {
   next();
 }
 async function successMessage(ctx, next, options) {
-  const baseDir2 = process.cwd();
   logger.info(`Tina setup ${import_chalk2.default.underline.green("done")}  \u2705
 	 Start your dev server with ${successText(`yarn tina-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} !
@@ -1181,10 +1241,10 @@ var auditDocuments = async (args) => {
   return error;
 };
 var transformDocumentIntoMutationRequestPayload = (document, instructions, defaults) => {
-  const { _collection, __typename, _template, ...rest } = document;
+  const _a = document, { _collection, __typename, _template } = _a, rest = __objRest(_a, ["_collection", "__typename", "_template"]);
   const params = transformParams(rest);
   const paramsWithTemplate = instructions.includeTemplate ? { [_template]: params } : params;
-  return instructions.includeCollection ? { [_collection]: { ...defaults, ...filterObject(paramsWithTemplate) } } : { ...defaults, ...filterObject(paramsWithTemplate) };
+  return instructions.includeCollection ? { [_collection]: __spreadValues(__spreadValues({}, defaults), filterObject(paramsWithTemplate)) } : __spreadValues(__spreadValues({}, defaults), filterObject(paramsWithTemplate));
 };
 var transformParams = (data) => {
   if (["string", "number", "boolean"].includes(typeof data)) {
@@ -1195,7 +1255,7 @@ var transformParams = (data) => {
   }
   try {
     (0, import_graphql9.assertShape)(data, (yup) => yup.object({ _template: yup.string().required() }));
-    const { _template, __typename, ...rest } = data;
+    const _a = data, { _template, __typename } = _a, rest = __objRest(_a, ["_template", "__typename"]);
     const nested = transformParams(rest);
     return { [_template]: nested };
   } catch (e) {
@@ -1227,8 +1287,17 @@ 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_prompts2 = __toModule(require("prompts"));
+var import_metrics3 = __toModule(require("@tinacms/metrics"));
 var rootPath = process.cwd();
 var audit = async (ctx, next, options) => {
+  const telemetry = new import_metrics3.Telemetry({ disabled: options.noTelemetry });
+  await telemetry.submitRecord({
+    event: {
+      name: "tinacms:cli:audit:invoke",
+      clean: Boolean(options.clean),
+      useDefaults: Boolean(options.useDefaultValues)
+    }
+  });
   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.
 
@@ -1320,6 +1389,10 @@ var useDefaultValuesOption = {
   name: "--useDefaultValues",
   description: "Adds default values to the graphQL mutation so that default values can be filled into existing documents (useful for adding a field with `required: true`)"
 };
+var noTelemetryOption = {
+  name: "--noTelemetry",
+  description: "Disable anonymous telemetry that is collected"
+};
 var baseCmds = [
   {
     command: CMD_START_SERVER,
@@ -1329,25 +1402,26 @@ var baseCmds = [
       subCommand,
       experimentalDatalayer,
       noWatchOption,
-      noSDKCodegenOption
+      noSDKCodegenOption,
+      noTelemetryOption
     ],
     action: (options) => chain([startServer], options)
   },
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalDatalayer],
+    options: [experimentalDatalayer, noTelemetryOption],
     action: (options) => chain([compile], options)
   },
   {
     command: CMD_GEN_TYPES,
     description: "Generate a GraphQL query for your site's schema, (and optionally Typescript types)",
-    options: [experimentalDatalayer, noSDKCodegenOption],
+    options: [experimentalDatalayer, noSDKCodegenOption, noTelemetryOption],
     action: (options) => chain([attachSchema, genTypes], options)
   },
   {
     command: INIT,
-    options: [experimentalDatalayer],
+    options: [experimentalDatalayer, noTelemetryOption],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
       initTina,
@@ -1363,7 +1437,7 @@ var baseCmds = [
     ], options)
   },
   {
-    options: [cleanOption, useDefaultValuesOption],
+    options: [cleanOption, useDefaultValuesOption, noTelemetryOption],
     command: AUDIT,
     description: "Audit your schema and the files to check for errors",
     action: (options) => chain([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.1",
+  "version": "0.60.5",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.5",
+    "@tinacms/scripts": "0.50.6",
     "@types/clear": "0.1.0",
     "@types/cors": "2.8.5",
     "@types/express": "^4.17.7",
@@ -56,8 +56,9 @@
     "@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.1",
-    "@tinacms/graphql": "0.59.5",
+    "@tinacms/datalayer": "0.0.2",
+    "@tinacms/graphql": "0.59.6",
+    "@tinacms/metrics": "0.0.2",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",
@@ -75,7 +76,7 @@
     "js-yaml": "^4.0.0",
     "lodash": "^4.17.19",
     "lodash.get": "^4.4.2",
-    "log4js": "^6.3.0",
+    "log4js": "^6.4.0",
     "normalize-path": "^3.0.0",
     "progress": "^2.0.3",
     "prompts": "^2.4.1",