@tinacms/cli 0.60.17 → 0.60.20

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # tinacms-cli
 
+## 0.60.20
+
+### Patch Changes
+
+- f71f55ac3: Fixd issue where --dev caused a breaking change
+- Updated dependencies [57f09bdd7]
+  - @tinacms/graphql@0.60.5
+
+## 0.60.19
+
+### Patch Changes
+
+- d103b27ad: Fix issue where new collections would not be added when CLI restarts
+- e06dbb3ca: Adds `waitForDB` cmd to cli
+- Updated dependencies [d103b27ad]
+  - @tinacms/graphql@0.60.4
+
+## 0.60.18
+
+### Patch Changes
+
+- 79d112d79: Update cli to accept tinaCloudMediaStore flag and add to metadata during schema compilation
+- 91d6e6758: revert platform aware paths in schema introduced in https://github.com/tinacms/tinacms/commit/558cc4368cd2a4b6e87dfb82bbfbb6f569f8a6f8
+- b1240328d: Adds local server routes for handling media
+- 91d6e6758: Fix issues with experimentalData on windows related to path separator inconsistency and interference with the .tina/**generated** folder
+- Updated dependencies [79d112d79]
+- Updated dependencies [3f46c6706]
+- Updated dependencies [db9168578]
+- Updated dependencies [91d6e6758]
+  - @tinacms/graphql@0.60.3
+
 ## 0.60.17
 
 ### Patch Changes

package/dist/cmds/baseCmds.d.ts

@@ -10,10 +10,12 @@ 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.
 */
+import 'dotenv/config';
 import { Command } from '../command';
 export declare const CMD_GEN_TYPES = "schema:types";
 export declare const CMD_START_SERVER = "server:start";
 export declare const CMD_COMPILE_MODELS = "schema:compile";
+export declare const CMD_WAIT_FOR_DB = "server:waitForDB";
 export declare const INIT = "init";
 export declare const AUDIT = "audit";
 export declare const baseCmds: Command[];

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: (sep: string) => string;
+export declare const defaultSchema = "\nimport { defineSchema, defineConfig } from \"tinacms\";\n\nconst schema = 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: \"rich-text\",\n          label: \"Blog Post Body\",\n          name: \"body\",\n          isBody: true,\n          templates: [\n            {\n              name: \"PageSection\",\n              label: \"Page Section\",\n              fields: [\n                {\n                  type: \"string\",\n                  name: \"heading\",\n                  label: \"Heading\",\n                },\n                {\n                  type: \"string\",\n                  name: \"content\",\n                  label: \"Content\",\n                  ui: {\n                    component: \"textarea\"\n                  }\n                }\n              ],\n            },\n          ]\n        },\n      ],\n    },\n  ],\n});\n\nexport default schema\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  schema,\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";

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

@@ -12,8 +12,14 @@ limitations under the License.
 */
 import type { TinaCloudSchema } from '@tinacms/graphql';
 export declare const resetGeneratedFolder: () => Promise<void>;
-export declare const compile: (_ctx: any, _next: any, options: {
+export declare const compileClient: (ctx: any, next: any, options: {
+    clientFileType?: string;
+    verbose?: boolean;
+    dev?: boolean;
+}) => Promise<any>;
+export declare const compileSchema: (_ctx: any, _next: any, options: {
     schemaFileType?: string;
     verbose?: boolean;
+    dev?: boolean;
 }) => Promise<void>;
 export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;

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

@@ -15,10 +15,12 @@ interface Options {
     command?: string;
     watchFolders?: string[];
     experimentalData?: boolean;
+    tinaCloudMediaStore?: boolean;
     noWatch?: boolean;
     noSDK: boolean;
     noTelemetry: boolean;
     verbose?: boolean;
+    dev?: boolean;
 }
-export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK, noTelemetry, watchFolders, verbose, }: Options): Promise<void>;
+export declare function startServer(_ctx: any, next: any, { port, noWatch, experimentalData, tinaCloudMediaStore, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
 export {};

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

@@ -10,7 +10,5 @@ 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.
 */
-/// <reference types="node" />
-import http from 'http';
-declare const gqlServer: (database: any) => Promise<http.Server>;
+import { gqlServer } from '../../server';
 export default gqlServer;

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

@@ -0,0 +1,17 @@
+/**
+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.
+*/
+interface Options {
+    command?: string;
+}
+export declare const startSubprocess: (_ctx: any, next: any, { command }: Options) => Promise<void>;
+export {};

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

@@ -0,0 +1,15 @@
+/**
+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 waitForDB: (ctx: any, next: any, options: {
+    verbose?: boolean;
+}) => Promise<any>;

package/dist/index.js

@@ -37,6 +37,9 @@ var __objRest = (source, exclude) => {
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
 };
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name2 in all)
@@ -54,22 +57,229 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
-var server_exports = {};
-__export(server_exports, {
-  default: () => server_default
+// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/main.js
+var require_main = __commonJS({
+  "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/main.js"(exports, module2) {
+    var fs6 = require("fs");
+    var path4 = require("path");
+    var os = require("os");
+    var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
+    function parse2(src) {
+      const obj = {};
+      let lines = src.toString();
+      lines = lines.replace(/\r\n?/mg, "\n");
+      let match;
+      while ((match = LINE.exec(lines)) != null) {
+        const key = match[1];
+        let value = match[2] || "";
+        value = value.trim();
+        const maybeQuote = value[0];
+        value = value.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
+        if (maybeQuote === '"') {
+          value = value.replace(/\\n/g, "\n");
+          value = value.replace(/\\r/g, "\r");
+        }
+        obj[key] = value;
+      }
+      return obj;
+    }
+    function _log(message) {
+      console.log(`[dotenv][DEBUG] ${message}`);
+    }
+    function _resolveHome(envPath) {
+      return envPath[0] === "~" ? path4.join(os.homedir(), envPath.slice(1)) : envPath;
+    }
+    function config(options) {
+      let dotenvPath = path4.resolve(process.cwd(), ".env");
+      let encoding = "utf8";
+      const debug = Boolean(options && options.debug);
+      const override = Boolean(options && options.override);
+      if (options) {
+        if (options.path != null) {
+          dotenvPath = _resolveHome(options.path);
+        }
+        if (options.encoding != null) {
+          encoding = options.encoding;
+        }
+      }
+      try {
+        const parsed = DotenvModule.parse(fs6.readFileSync(dotenvPath, { encoding }));
+        Object.keys(parsed).forEach(function(key) {
+          if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
+            process.env[key] = parsed[key];
+          } else {
+            if (override === true) {
+              process.env[key] = parsed[key];
+            }
+            if (debug) {
+              if (override === true) {
+                _log(`"${key}" is already defined in \`process.env\` and WAS overwritten`);
+              } else {
+                _log(`"${key}" is already defined in \`process.env\` and was NOT overwritten`);
+              }
+            }
+          }
+        });
+        return { parsed };
+      } catch (e) {
+        if (debug) {
+          _log(`Failed to load ${dotenvPath} ${e.message}`);
+        }
+        return { error: e };
+      }
+    }
+    var DotenvModule = {
+      config,
+      parse: parse2
+    };
+    module2.exports.config = DotenvModule.config;
+    module2.exports.parse = DotenvModule.parse;
+    module2.exports = DotenvModule;
+  }
+});
+
+// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/env-options.js
+var require_env_options = __commonJS({
+  "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/env-options.js"(exports, module2) {
+    var options = {};
+    if (process.env.DOTENV_CONFIG_ENCODING != null) {
+      options.encoding = process.env.DOTENV_CONFIG_ENCODING;
+    }
+    if (process.env.DOTENV_CONFIG_PATH != null) {
+      options.path = process.env.DOTENV_CONFIG_PATH;
+    }
+    if (process.env.DOTENV_CONFIG_DEBUG != null) {
+      options.debug = process.env.DOTENV_CONFIG_DEBUG;
+    }
+    if (process.env.DOTENV_CONFIG_OVERRIDE != null) {
+      options.override = process.env.DOTENV_CONFIG_OVERRIDE;
+    }
+    module2.exports = options;
+  }
+});
+
+// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/cli-options.js
+var require_cli_options = __commonJS({
+  "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/cli-options.js"(exports, module2) {
+    var re = /^dotenv_config_(encoding|path|debug|override)=(.+)$/;
+    module2.exports = function optionMatcher(args) {
+      return args.reduce(function(acc, cur) {
+        const matches = cur.match(re);
+        if (matches) {
+          acc[matches[1]] = matches[2];
+        }
+        return acc;
+      }, {});
+    };
+  }
+});
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/models/media.ts
+var import_fs_extra5, import_path6, MediaModel;
+var init_media = __esm({
+  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/models/media.ts"() {
+    import_fs_extra5 = __toModule(require("fs-extra"));
+    import_path6 = __toModule(require("path"));
+    MediaModel = class {
+      constructor({ basePath }) {
+        this.basePath = basePath;
+      }
+      async listMedia(args) {
+        try {
+          const folderPath = (0, import_path6.join)(this.basePath, args.searchPath);
+          const filesStr = await import_fs_extra5.default.readdir(folderPath);
+          const filesProm = filesStr.map(async (x) => {
+            const filePath = (0, import_path6.join)(folderPath, x);
+            const stat = await import_fs_extra5.default.stat(filePath);
+            const src = (0, import_path6.join)(args.searchPath, x);
+            return {
+              size: stat.size,
+              fileName: x,
+              src: "/" + src,
+              isFile: stat.isFile()
+            };
+          });
+          const files = await Promise.all(filesProm);
+          return {
+            files: files.filter((x) => x.isFile),
+            directories: files.filter((x) => !x.isFile).map((x) => x.src)
+          };
+        } catch (error) {
+          console.error(error);
+          return {
+            files: [],
+            directories: [],
+            error: error == null ? void 0 : error.toString()
+          };
+        }
+      }
+      async deleteMedia(args) {
+        try {
+          const file = (0, import_path6.join)(this.basePath, args.searchPath);
+          await import_fs_extra5.default.stat(file);
+          await import_fs_extra5.default.remove(file);
+          return { ok: true };
+        } catch (error) {
+          console.error(error);
+          return { ok: false, message: error == null ? void 0 : error.toString() };
+        }
+      }
+    };
+  }
 });
-var import_cors, import_http, import_express, import_altair_express_middleware, import_body_parser, gqlServer, server_default;
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/routes/index.ts
+var import_express, import_path7, import_multer, mediaFolder, storage, upload, mediaModel, mediaRouter;
+var init_routes = __esm({
+  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/routes/index.ts"() {
+    import_express = __toModule(require("express"));
+    import_path7 = __toModule(require("path"));
+    import_multer = __toModule(require("multer"));
+    init_media();
+    mediaFolder = (0, import_path7.join)(process.cwd(), "public");
+    storage = import_multer.default.diskStorage({
+      destination: function(req, file, cb) {
+        cb(null, mediaFolder);
+      },
+      filename: function(req, _file, cb) {
+        const file = req.params[0];
+        cb(null, file);
+      }
+    });
+    upload = (0, import_multer.default)({ storage });
+    mediaModel = new MediaModel({ basePath: mediaFolder });
+    mediaRouter = (0, import_express.Router)();
+    mediaRouter.get("/list/*", async (req, res) => {
+      const folder = req.params[0];
+      const media = await mediaModel.listMedia({
+        searchPath: folder
+      });
+      res.json(media);
+    });
+    mediaRouter.delete("/delete/*", async (req, res) => {
+      const file = req.params[0];
+      const didDelete = await mediaModel.deleteMedia({ searchPath: file });
+      res.json(didDelete);
+    });
+    mediaRouter.post("/upload/*", upload.single("file"), function(req, res, next) {
+      res.json({ ok: true });
+    });
+  }
+});
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/server.ts
+var import_cors, import_http, import_express2, import_altair_express_middleware, import_body_parser, gqlServer;
 var init_server = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
+  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/server.ts"() {
     import_cors = __toModule(require("cors"));
     import_http = __toModule(require("http"));
-    import_express = __toModule(require("express"));
+    import_express2 = __toModule(require("express"));
     import_altair_express_middleware = __toModule(require("altair-express-middleware"));
     import_body_parser = __toModule(require("body-parser"));
+    init_routes();
     gqlServer = async (database) => {
       const gqlPackage = require("@tinacms/graphql");
-      const app = (0, import_express.default)();
+      const app = (0, import_express2.default)();
       const server = import_http.default.createServer(app);
       app.use((0, import_cors.default)());
       app.use(import_body_parser.default.json());
@@ -103,8 +313,28 @@ var init_server = __esm({
         });
         return res.json(result);
       });
+      app.use("/media", mediaRouter);
       return server;
     };
+  }
+});
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/index.ts
+var init_server2 = __esm({
+  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/index.ts"() {
+    init_server();
+  }
+});
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
+var server_exports = {};
+__export(server_exports, {
+  default: () => server_default
+});
+var server_default;
+var init_server3 = __esm({
+  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
+    init_server2();
     server_default = gqlServer;
   }
 });
@@ -118,7 +348,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.17";
+var version = "0.60.20";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -1229,6 +1459,11 @@ async function successMessage(ctx, next, options) {
   next();
 }
 
+// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/config.js
+(function() {
+  require_main().config(Object.assign({}, require_env_options(), require_cli_options()(process.argv)));
+})();
+
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/middleware.ts
 var chain = async (cmds, options) => {
   const ctx = {};
@@ -1289,7 +1524,7 @@ var import_path5 = __toModule(require("path"));
 var import_esbuild = __toModule(require("esbuild"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
-var defaultSchema = (sep) => `
+var defaultSchema = `
 import { defineSchema, defineConfig } from "tinacms";
 
 const schema = defineSchema({
@@ -1297,7 +1532,7 @@ const schema = defineSchema({
     {
       label: "Blog Posts",
       name: "posts",
-      path: "content${sep}posts",
+      path: "content/posts",
       fields: [
         {
           type: "string",
@@ -1376,39 +1611,49 @@ export const tinaConfig = defineConfig({
 });
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/lib/getSchemaPath.ts
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/lib/getPath.ts
 var import_path4 = __toModule(require("path"));
 var import_fs_extra3 = __toModule(require("fs-extra"));
-var ErrorMessage = "Must provide a `.tina/schema.{ts,js,tsx,jsx}`";
-var getSchemaPath = ({ projectDir }) => {
+var getPath = ({
+  projectDir,
+  filename,
+  allowedTypes,
+  errorMessage
+}) => {
   if (!import_fs_extra3.default.existsSync(projectDir)) {
-    throw new Error(ErrorMessage);
-  }
-  const inputPathTS = import_path4.default.join(projectDir, "schema.ts");
-  const inputPathJS = import_path4.default.join(projectDir, "schema.js");
-  const inputPathTSX = import_path4.default.join(projectDir, "schema.tsx");
-  const inputPathJSX = import_path4.default.join(projectDir, "schema.jsx");
-  let inputFile;
-  if (import_fs_extra3.default.existsSync(inputPathTS)) {
-    inputFile = inputPathTS;
-  } else if (import_fs_extra3.default.existsSync(inputPathJS)) {
-    inputFile = inputPathJS;
-  } else if (import_fs_extra3.default.existsSync(inputPathTSX)) {
-    inputFile = inputPathTSX;
-  } else if (import_fs_extra3.default.existsSync(inputPathJSX)) {
-    inputFile = inputPathJSX;
+    throw new Error(errorMessage);
   }
+  const filePaths = allowedTypes.map((ext) => import_path4.default.join(projectDir, `${filename}.${ext}`));
+  let inputFile = void 0;
+  filePaths.every((path4) => {
+    if (import_fs_extra3.default.existsSync(path4)) {
+      inputFile = path4;
+      return false;
+    }
+    return true;
+  });
   if (!inputFile) {
-    throw new Error(ErrorMessage);
+    throw new Error(errorMessage);
   }
   return inputFile;
 };
+var getSchemaPath = ({ projectDir }) => {
+  const filename = "schema";
+  const allowedTypes = ["js", "jsx", "ts", "tsx"];
+  const errorMessage = "Must provide a `.tina/schema.{ts,js,tsx,jsx}`";
+  return getPath({ projectDir, filename, allowedTypes, errorMessage });
+};
+var getClientPath = ({ projectDir }) => {
+  const filename = "client";
+  const allowedTypes = ["js", "ts"];
+  const errorMessage = "Must provide a `.tina/client.{ts,js}`";
+  return getPath({ projectDir, filename, allowedTypes, errorMessage });
+};
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
 var tinaPath = import_path5.default.join(process.cwd(), ".tina");
 var packageJSONFilePath = import_path5.default.join(process.cwd(), "package.json");
 var tinaGeneratedPath = import_path5.default.join(tinaPath, "__generated__");
-var tinaTempPath = import_path5.default.join(tinaGeneratedPath, "temp");
 var tinaConfigPath = import_path5.default.join(tinaGeneratedPath, "config");
 var resetGeneratedFolder = async () => {
   try {
@@ -1424,14 +1669,74 @@ export const queries = (client)=>({})
 `);
   await import_fs_extra4.default.outputFile(import_path5.default.join(tinaGeneratedPath, ".gitignore"), "db");
 };
-var cleanup = async ({ tinaTempPath: tinaTempPath2 }) => {
-  await import_fs_extra4.default.remove(tinaTempPath2);
+var cleanup = async ({ tinaTempPath }) => {
+  await import_fs_extra4.default.remove(tinaTempPath);
+};
+var compileClient = async (ctx, next, options) => {
+  const tinaTempPath = import_path5.default.join(tinaGeneratedPath, "temp_client");
+  if (!options.clientFileType)
+    options = __spreadProps(__spreadValues({}, options), { clientFileType: "ts" });
+  if (options.verbose) {
+    logger.info(logText("Compiling Client..."));
+  }
+  const { clientFileType: requestedClientFileType = "ts" } = options;
+  const allowedFileTypes = ["ts", "js"];
+  if (allowedFileTypes.includes(requestedClientFileType) === false) {
+    throw new Error(`Requested schema file type '${requestedClientFileType}' is not valid. Supported schema file types: 'ts, js'`);
+  }
+  if (ctx) {
+    ctx.clientFileType = requestedClientFileType;
+  }
+  let clientExists = true;
+  try {
+    getClientPath({ projectDir: tinaPath });
+  } catch {
+    clientExists = false;
+  }
+  if (!clientExists) {
+    if (options.verbose) {
+      logger.info(logText(`.tina/client.${requestedClientFileType} not found, skipping compile client...`));
+    }
+    return next();
+  }
+  try {
+    const define = {};
+    if (!process.env.NODE_ENV) {
+      define["process.env.NODE_ENV"] = options.dev ? '"development"' : '"production"';
+    }
+    const inputFile = getClientPath({ projectDir: tinaPath });
+    await transpile(inputFile, "client.js", tinaTempPath, options.verbose, define);
+  } catch (e) {
+    await cleanup({ tinaTempPath });
+    throw new BuildSchemaError(e);
+  }
+  Object.keys(require.cache).map((key) => {
+    if (key.startsWith(tinaTempPath)) {
+      delete require.cache[require.resolve(key)];
+    }
+  });
+  try {
+    const clientFunc = require(import_path5.default.join(tinaTempPath, "client.js"));
+    const client = clientFunc.default;
+    ctx.client = client;
+    await cleanup({ tinaTempPath });
+  } catch (e) {
+    await cleanup({ tinaTempPath });
+    if (e instanceof Error) {
+      if (e.name === "TinaSchemaValidationError") {
+        throw e;
+      }
+    }
+    throw new ExecuteSchemaError(e);
+  }
+  return next();
 };
-var compile = async (_ctx, _next, options) => {
+var compileSchema = async (_ctx, _next, options) => {
+  const tinaTempPath = import_path5.default.join(tinaGeneratedPath, "temp_schema");
   if (!options.schemaFileType)
     options = __spreadProps(__spreadValues({}, options), { schemaFileType: "ts" });
   if (options.verbose) {
-    logger.info(logText("Compiling..."));
+    logger.info(logText("Compiling Schema..."));
   }
   const { schemaFileType: requestedSchemaFileType = "ts" } = options;
   const schemaFileType2 = (requestedSchemaFileType === "ts" || requestedSchemaFileType === "tsx") && "ts" || (requestedSchemaFileType === "js" || requestedSchemaFileType === "jsx") && "js";
@@ -1454,10 +1759,15 @@ var compile = async (_ctx, _next, options) => {
       `));
     const file = import_path5.default.join(tinaPath, `schema.${schemaFileType2}`);
     await import_fs_extra4.default.ensureFile(file);
-    await import_fs_extra4.default.writeFile(file, defaultSchema(import_path5.default.sep));
+    await import_fs_extra4.default.writeFile(file, defaultSchema);
   }
   try {
-    await transpile(tinaPath, tinaTempPath, options.verbose);
+    const define = {};
+    if (!process.env.NODE_ENV) {
+      define["process.env.NODE_ENV"] = options.dev ? '"development"' : '"production"';
+    }
+    const inputFile = getSchemaPath({ projectDir: tinaPath });
+    await transpile(inputFile, "schema.js", tinaTempPath, options.verbose, define);
   } catch (e) {
     await cleanup({ tinaTempPath });
     throw new BuildSchemaError(e);
@@ -1482,7 +1792,7 @@ var compile = async (_ctx, _next, options) => {
     throw new ExecuteSchemaError(e);
   }
 };
-var transpile = async (projectDir, tempDir, verbose) => {
+var transpile = async (inputFile, outputFile, tempDir, verbose, define) => {
   if (verbose)
     logger.info(logText("Building javascript..."));
   const packageJSON = JSON.parse(import_fs_extra4.default.readFileSync(packageJSONFilePath).toString() || "{}");
@@ -1490,8 +1800,7 @@ var transpile = async (projectDir, tempDir, verbose) => {
   const peerDeps = (packageJSON == null ? void 0 : packageJSON.peerDependencies) || [];
   const devDeps = (packageJSON == null ? void 0 : packageJSON.devDependencies) || [];
   const external = Object.keys(__spreadValues(__spreadValues(__spreadValues({}, deps), peerDeps), devDeps));
-  const inputFile = getSchemaPath({ projectDir });
-  const outputPath = import_path5.default.join(tempDir, "schema.js");
+  const outputPath = import_path5.default.join(tempDir, outputFile);
   await (0, import_esbuild.build)({
     bundle: true,
     platform: "neutral",
@@ -1500,7 +1809,8 @@ var transpile = async (projectDir, tempDir, verbose) => {
     treeShaking: true,
     external: [...external, "./node_modules/*"],
     loader: loaders,
-    outfile: outputPath
+    outfile: outputPath,
+    define
   });
   if (verbose)
     logger.info(logText(`Javascript built`));
@@ -1553,20 +1863,20 @@ var AsyncLock = class {
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_metrics3 = __toModule(require("@tinacms/metrics"));
 var import_chalk6 = __toModule(require("chalk"));
-var import_child_process = __toModule(require("child_process"));
 var import_chokidar = __toModule(require("chokidar"));
-var import_path6 = __toModule(require("path"));
+var import_path8 = __toModule(require("path"));
 var lock = new AsyncLock();
 var gqlPackageFile = require.resolve("@tinacms/graphql");
-async function startServer(_ctx, _next, {
+async function startServer(_ctx, next, {
   port = 4001,
-  command,
   noWatch,
   experimentalData,
+  tinaCloudMediaStore: tinaCloudMediaStore2,
   noSDK,
   noTelemetry,
   watchFolders,
-  verbose
+  verbose,
+  dev
 }) {
   lock.disable();
   const rootPath2 = process.cwd();
@@ -1583,39 +1893,24 @@ async function startServer(_ctx, _next, {
   const store = experimentalData ? new import_datalayer3.LevelStore(rootPath2) : new import_datalayer3.FilesystemStore({ rootPath: rootPath2 });
   const shouldBuild = bridge.supportsBuilding();
   const database = await (0, import_graphql10.createDatabase)({ store, bridge });
-  const startSubprocess = () => {
-    if (typeof command === "string") {
-      const commands = command.split(" ");
-      const firstCommand = commands[0];
-      const args = commands.slice(1) || [];
-      const ps = import_child_process.default.spawn(firstCommand, args, {
-        stdio: "inherit",
-        shell: true
-      });
-      ps.on("error", (code) => {
-        logger.error(dangerText(`An error has occurred in the Next.js child process. Error message below`));
-        logger.error(`name: ${code.name}
-message: ${code.message}
-
-stack: ${code.stack || "No stack was provided"}`);
-      });
-      ps.on("close", (code) => {
-        logger.info(`child process exited with code ${code}`);
-        process.exit(code);
-      });
-    }
-  };
   let ready = false;
   const build2 = async (noSDK2) => {
+    database.clearCache();
     await lock.promise;
     lock.enable();
     try {
       if (!process.env.CI && !noWatch) {
+        await store.close();
         await resetGeneratedFolder();
+        await store.open();
+      }
+      const cliFlags = [];
+      if (tinaCloudMediaStore2) {
+        cliFlags.push("tinaCloudMediaStore");
       }
       const database2 = await (0, import_graphql10.createDatabase)({ store, bridge });
-      await compile(null, null, { verbose });
-      const schema = await (0, import_graphql10.buildSchema)(rootPath2, database2);
+      await compileSchema(null, null, { verbose, dev });
+      const schema = await (0, import_graphql10.buildSchema)(rootPath2, database2, cliFlags);
       await genTypes({ schema }, () => {
       }, { noSDK: noSDK2, verbose });
     } catch (error) {
@@ -1624,7 +1919,7 @@ stack: ${code.stack || "No stack was provided"}`);
       lock.disable();
     }
   };
-  const foldersToWatch = (watchFolders || []).map((x) => import_path6.default.join(rootPath2, x));
+  const foldersToWatch = (watchFolders || []).map((x) => import_path8.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
       ...foldersToWatch,
@@ -1633,7 +1928,7 @@ stack: ${code.stack || "No stack was provided"}`);
       ignored: [
         "**/node_modules/**/*",
         "**/.next/**/*",
-        `${import_path6.default.resolve(rootPath2)}/.tina/__generated__/**/*`
+        `${import_path8.default.resolve(rootPath2)}/.tina/__generated__/**/*`
       ]
     }).on("ready", async () => {
       if (verbose)
@@ -1643,7 +1938,7 @@ stack: ${code.stack || "No stack was provided"}`);
           await build2(noSDK);
         }
         ready = true;
-        startSubprocess();
+        next();
       } catch (e) {
         handleServerErrors(e);
         console.log(e);
@@ -1678,7 +1973,7 @@ stack: ${code.stack || "No stack was provided"}`);
   };
   let isReady = false;
   const start = async () => {
-    const s = (init_server(), server_exports);
+    const s = (init_server3(), server_exports);
     state.server = await s.default(database);
     state.server.listen(port, () => {
       const altairUrl = `http://localhost:${port}/altair/`;
@@ -1729,14 +2024,114 @@ or`);
       logger.info("Detected CI environment, omitting watch commands...");
     }
     start();
-    startSubprocess();
+    next();
   }
 }
 
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/waitForDB/index.ts
+var POLLING_INTERVAL = 5e3;
+var STATUS_INPROGRESS = "inprogress";
+var STATUS_COMPLETE = "complete";
+var STATUS_FAILED = "failed";
+var IndexFailedError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "IndexFailedError";
+  }
+};
+var waitForDB = async (ctx, next, options) => {
+  if (options.verbose) {
+    logger.info(logText("Waiting for DB..."));
+  }
+  if (!ctx.client) {
+    if (options.verbose) {
+      logger.info(logText("client is unavailable, skipping..."));
+    }
+    return next();
+  }
+  const client = ctx.client;
+  const { host, clientId, branch, isLocalClient } = client.parseURL();
+  if (isLocalClient) {
+    if (options.verbose) {
+      logger.info(logText("client is local, skipping..."));
+    }
+    return next();
+  }
+  const pollForStatus = async () => {
+    try {
+      if (options.verbose) {
+        logger.info(logText("Polling for status..."));
+      }
+      const headers = new Headers();
+      headers.append("Content-Type", "application/json");
+      if (client.readonlyToken) {
+        headers.append("X-API-KEY", client.readonlyToken);
+      }
+      const response = await fetch(`https://${host}/db/${clientId}/status/${branch}`, {
+        method: "GET",
+        headers
+      });
+      const { status, error } = await response.json();
+      const statusMessage = `DB responded with: '${status}'`;
+      if (status === STATUS_COMPLETE) {
+        if (options.verbose) {
+          logger.info(logText(`${statusMessage}`));
+        }
+        return next();
+      } else if (status === STATUS_INPROGRESS) {
+        if (options.verbose) {
+          logger.info(logText(`${statusMessage}, trying again in 5 seconds`));
+        }
+        setTimeout(pollForStatus, POLLING_INTERVAL);
+      } else if (status === STATUS_FAILED) {
+        throw new IndexFailedError(`Attempting to index DB responded with status 'failed', ${error}`);
+      } else {
+        if (options.verbose) {
+          logger.info(logText(`${statusMessage}`));
+        }
+        return next();
+      }
+    } catch (e) {
+      if (e instanceof IndexFailedError) {
+        throw e;
+      } else {
+        throw new Error(`Unable to query DB for indexing status, encountered error: ${e.message}`);
+      }
+    }
+  };
+  pollForStatus();
+};
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/startSubprocess/index.ts
+var import_child_process = __toModule(require("child_process"));
+var startSubprocess = async (_ctx, next, { command }) => {
+  if (typeof command === "string") {
+    const commands = command.split(" ");
+    const firstCommand = commands[0];
+    const args = commands.slice(1) || [];
+    const ps = import_child_process.default.spawn(firstCommand, args, {
+      stdio: "inherit",
+      shell: true
+    });
+    ps.on("error", (code) => {
+      logger.error(dangerText(`An error has occurred in the Next.js child process. Error message below`));
+      logger.error(`name: ${code.name}
+message: ${code.message}
+
+stack: ${code.stack || "No stack was provided"}`);
+    });
+    ps.on("close", (code) => {
+      logger.info(`child process exited with code ${code}`);
+      process.exit(code);
+    });
+  }
+};
+
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
 var CMD_GEN_TYPES = "schema:types";
 var CMD_START_SERVER = "server:start";
 var CMD_COMPILE_MODELS = "schema:compile";
+var CMD_WAIT_FOR_DB = "server:waitForDB";
 var INIT = "init";
 var AUDIT = "audit";
 var startServerPortOption = {
@@ -1783,6 +2178,14 @@ var verboseOption = {
   name: "-v, --verbose",
   description: "increase verbosity of logged output"
 };
+var tinaCloudMediaStore = {
+  name: "--tinaCloudMediaStore",
+  description: "Automatically pushes updates from GitHub to the Tina Cloud Media Store"
+};
+var developmentOption = {
+  name: "--dev",
+  description: "Uses NODE_ENV=development when compiling client and schema"
+};
 var baseCmds = [
   {
     command: CMD_START_SERVER,
@@ -1791,36 +2194,60 @@ var baseCmds = [
       startServerPortOption,
       subCommand,
       experimentalDatalayer,
+      tinaCloudMediaStore,
       noWatchOption,
       noSDKCodegenOption,
       noTelemetryOption,
       watchFileOption,
-      verboseOption
+      verboseOption,
+      developmentOption
     ],
-    action: (options) => chain([startServer], options)
+    action: (options) => chain([startServer, startSubprocess], options)
+  },
+  {
+    command: CMD_WAIT_FOR_DB,
+    description: "Wait for DB to finish indexing, start subprocess",
+    options: [
+      subCommand,
+      experimentalDatalayer,
+      noTelemetryOption,
+      verboseOption,
+      developmentOption
+    ],
+    action: (options) => chain([compileClient, waitForDB, startSubprocess], options)
   },
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalDatalayer, noTelemetryOption],
-    action: (options) => chain([compile], options)
+    options: [experimentalDatalayer, tinaCloudMediaStore, noTelemetryOption],
+    action: (options) => chain([compileSchema], options)
   },
   {
     command: CMD_GEN_TYPES,
     description: "Generate a GraphQL query for your site's schema, (and optionally Typescript types)",
-    options: [experimentalDatalayer, noSDKCodegenOption, noTelemetryOption],
+    options: [
+      experimentalDatalayer,
+      tinaCloudMediaStore,
+      noSDKCodegenOption,
+      noTelemetryOption
+    ],
     action: (options) => chain([attachSchema, genTypes], options)
   },
   {
     command: INIT,
-    options: [experimentalDatalayer, noTelemetryOption, schemaFileType],
+    options: [
+      experimentalDatalayer,
+      tinaCloudMediaStore,
+      noTelemetryOption,
+      schemaFileType
+    ],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
       checkDeps,
       initTina,
       installDeps,
       async (_ctx, next, options2) => {
-        await compile(_ctx, next, options2);
+        await compileSchema(_ctx, next, options2);
         next();
       },
       attachSchema,
@@ -1839,7 +2266,7 @@ var baseCmds = [
         next();
       },
       async (_ctx, next) => {
-        await compile(_ctx, next, options);
+        await compileSchema(_ctx, next, options);
         next();
       },
       attachSchema,

package/dist/lib/{getSchemaPath.d.ts → getPath.d.ts}

@@ -13,3 +13,6 @@ limitations under the License.
 export declare const getSchemaPath: ({ projectDir }: {
     projectDir: string;
 }) => any;
+export declare const getClientPath: ({ projectDir }: {
+    projectDir: string;
+}) => any;

package/dist/lib/index.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 * from './getSchemaPath';
+export * from './getPath';

package/dist/server/index.d.ts

@@ -0,0 +1,13 @@
+/**
+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 * from './server';

package/dist/server/models/media.d.ts

@@ -0,0 +1,41 @@
+/**
+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.
+*/
+interface MediaArgs {
+    searchPath: string;
+}
+interface File {
+    src: string;
+    fileName: string;
+    size: number;
+}
+interface ListMediaRes {
+    directories: string[];
+    files: File[];
+    cursor?: string;
+    error?: string;
+}
+declare type SuccessRecord = {
+    ok: true;
+} | {
+    ok: false;
+    message: string;
+};
+export declare class MediaModel {
+    readonly basePath: string;
+    constructor({ basePath }: {
+        basePath: string;
+    });
+    listMedia(args: MediaArgs): Promise<ListMediaRes>;
+    deleteMedia(args: MediaArgs): Promise<SuccessRecord>;
+}
+export {};

package/dist/server/routes/index.d.ts

@@ -0,0 +1,13 @@
+/**
+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 mediaRouter: import("express-serve-static-core").Router;

package/dist/server/server.d.ts

@@ -0,0 +1,15 @@
+/**
+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.
+*/
+/// <reference types="node" />
+import http from 'http';
+export declare const gqlServer: (database: any) => Promise<http.Server>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.17",
+  "version": "0.60.20",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -35,6 +35,7 @@
     "@types/lodash": "^4.14.157",
     "@types/lodash.get": "^4.4.6",
     "@types/log4js": "^2.3.5",
+    "@types/multer": "^1.4.7",
     "@types/progress": "^2.0.3",
     "@types/prompts": "^2.0.13",
     "@types/yup": "^0.29.11",
@@ -58,7 +59,7 @@
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
     "@tinacms/datalayer": "0.1.1",
-    "@tinacms/graphql": "0.60.2",
+    "@tinacms/graphql": "0.60.5",
     "@tinacms/metrics": "0.0.3",
     "@tinacms/schema-tools": "0.0.4",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
@@ -72,6 +73,7 @@
     "chokidar": "^3.5.1",
     "commander": "^9.0.0",
     "cors": "^2.8.5",
+    "dotenv": "^16.0.1",
     "esbuild": "^0.14.20",
     "esm": "3.2.25",
     "express": "^4.17.1",
@@ -82,6 +84,7 @@
     "lodash": "^4.17.19",
     "lodash.get": "^4.4.2",
     "log4js": "^6.4.0",
+    "multer": "^1.4.4",
     "normalize-path": "^3.0.0",
     "progress": "^2.0.3",
     "prompts": "^2.4.1",