@tinacms/cli 0.60.17 → 0.60.18

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # tinacms-cli
 
+## 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/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/start-server/index.d.ts

@@ -15,10 +15,11 @@ interface Options {
     command?: string;
     watchFolders?: string[];
     experimentalData?: boolean;
+    tinaCloudMediaStore?: boolean;
     noWatch?: boolean;
     noSDK: boolean;
     noTelemetry: boolean;
     verbose?: 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, command, noWatch, experimentalData, tinaCloudMediaStore, noSDK, noTelemetry, watchFolders, verbose, }: 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/index.js

@@ -54,22 +54,112 @@ 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/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() };
+        }
+      }
+    };
+  }
+});
+
+// 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 });
+    });
+  }
 });
-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/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 +193,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 +228,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.18";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -1289,7 +1399,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 +1407,7 @@ const schema = defineSchema({
     {
       label: "Blog Posts",
       name: "posts",
-      path: "content${sep}posts",
+      path: "content/posts",
       fields: [
         {
           type: "string",
@@ -1454,7 +1564,7 @@ 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);
@@ -1555,7 +1665,7 @@ 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, {
@@ -1563,6 +1673,7 @@ async function startServer(_ctx, _next, {
   command,
   noWatch,
   experimentalData,
+  tinaCloudMediaStore: tinaCloudMediaStore2,
   noSDK,
   noTelemetry,
   watchFolders,
@@ -1611,11 +1722,17 @@ stack: ${code.stack || "No stack was provided"}`);
     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);
+      const schema = await (0, import_graphql10.buildSchema)(rootPath2, database2, cliFlags);
       await genTypes({ schema }, () => {
       }, { noSDK: noSDK2, verbose });
     } catch (error) {
@@ -1624,7 +1741,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 +1750,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)
@@ -1678,7 +1795,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/`;
@@ -1783,6 +1900,10 @@ 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 baseCmds = [
   {
     command: CMD_START_SERVER,
@@ -1791,6 +1912,7 @@ var baseCmds = [
       startServerPortOption,
       subCommand,
       experimentalDatalayer,
+      tinaCloudMediaStore,
       noWatchOption,
       noSDKCodegenOption,
       noTelemetryOption,
@@ -1802,18 +1924,28 @@ var baseCmds = [
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalDatalayer, noTelemetryOption],
+    options: [experimentalDatalayer, tinaCloudMediaStore, 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, 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,

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.18",
   "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.3",
     "@tinacms/metrics": "0.0.3",
     "@tinacms/schema-tools": "0.0.4",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
@@ -82,6 +83,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",