@tinacms/cli 0.60.21 → 0.60.22

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # tinacms-cli
 
+## 0.60.22
+
+### Patch Changes
+
+- b1a4290e6: Use media config from the schema in the local media server
+- 1955b8842: Uses new `schema.config` when resolving media/asset urls
+- Updated dependencies [f6cb634c2]
+- Updated dependencies [b1a4290e6]
+- Updated dependencies [1955b8842]
+- Updated dependencies [8b81c3cf3]
+  - @tinacms/graphql@0.60.7
+  - @tinacms/schema-tools@0.0.5
+  - @tinacms/datalayer@0.1.1
+  - @tinacms/metrics@0.0.3
+
 ## 0.60.21
 
 ### Patch Changes

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

@@ -15,12 +15,11 @@ 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, noWatch, experimentalData, tinaCloudMediaStore, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
+export declare function startServer(_ctx: any, next: any, { port, noWatch, experimentalData, noSDK, noTelemetry, watchFolders, verbose, dev, }: Options): Promise<void>;
 export {};

package/dist/command.d.ts

@@ -23,5 +23,6 @@ export interface Command {
 interface Option {
     name: string;
     description: string;
+    defaultValue?: any;
 }
 export {};

package/dist/index.js

@@ -174,28 +174,52 @@ var require_cli_options = __commonJS({
   }
 });
 
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/index.ts
+var parseMediaFolder;
+var init_utils = __esm({
+  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/index.ts"() {
+    parseMediaFolder = (str) => {
+      let returnString = str;
+      if (returnString.startsWith("/"))
+        returnString = returnString.substr(1);
+      if (returnString.endsWith("/"))
+        returnString = returnString.substr(0, returnString.length - 1);
+      return returnString;
+    };
+  }
+});
+
 // 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"));
+    init_utils();
     MediaModel = class {
-      constructor({ basePath }) {
-        this.basePath = basePath;
+      constructor({ publicFolder, syncFolder }) {
+        this.syncFolder = syncFolder;
+        this.publicFolder = publicFolder;
       }
       async listMedia(args) {
         try {
-          const folderPath = (0, import_path6.join)(this.basePath, args.searchPath);
+          const folderPath = (0, import_path6.join)(this.publicFolder, this.syncFolder, args.searchPath);
+          const searchPath = parseMediaFolder(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 filesProm = filesStr.map(async (file) => {
+            const filePath = (0, import_path6.join)(folderPath, file);
             const stat = await import_fs_extra5.default.stat(filePath);
-            const src = (0, import_path6.join)(args.searchPath, x);
+            let src = `/${file}`;
+            if (searchPath) {
+              src = `/${searchPath}${src}`;
+            }
+            if (this.syncFolder) {
+              src = `/${this.syncFolder}${src}`;
+            }
             return {
               size: stat.size,
-              fileName: x,
-              src: "/" + src,
+              fileName: file,
+              src,
               isFile: stat.isFile()
             };
           });
@@ -215,7 +239,7 @@ var init_media = __esm({
       }
       async deleteMedia(args) {
         try {
-          const file = (0, import_path6.join)(this.basePath, args.searchPath);
+          const file = (0, import_path6.join)(this.publicFolder, this.syncFolder, args.searchPath);
           await import_fs_extra5.default.stat(file);
           await import_fs_extra5.default.remove(file);
           return { ok: true };
@@ -229,41 +253,44 @@ var init_media = __esm({
 });
 
 // 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 import_express, import_path7, import_multer, createMediaRouter;
 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) {
+    createMediaRouter = (config) => {
+      const mediaFolder = (0, import_path7.join)(process.cwd(), config.publicFolder, config.syncFolder);
+      const 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);
+        }
+      });
+      const upload = (0, import_multer.default)({ storage });
+      const mediaModel = new MediaModel(config);
+      const 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];
-        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
+        const didDelete = await mediaModel.deleteMedia({ searchPath: file });
+        res.json(didDelete);
       });
-      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 });
-    });
+      mediaRouter.post("/upload/*", upload.single("file"), function(req, res, next) {
+        res.json({ ok: true });
+      });
+      return mediaRouter;
+    };
   }
 });
 
@@ -277,7 +304,9 @@ var init_server = __esm({
     import_altair_express_middleware = __toModule(require("altair-express-middleware"));
     import_body_parser = __toModule(require("body-parser"));
     init_routes();
-    gqlServer = async (database) => {
+    init_utils();
+    gqlServer = async (database, verbose) => {
+      var _a, _b, _c;
       const gqlPackage = require("@tinacms/graphql");
       const app = (0, import_express2.default)();
       const server = import_http.default.createServer(app);
@@ -309,11 +338,18 @@ var init_server = __esm({
           config,
           database,
           query,
-          variables
+          variables,
+          verbose
         });
         return res.json(result);
       });
-      app.use("/media", mediaRouter);
+      const db = database;
+      const schema = await db.getSchema();
+      const mediaPaths = ((_c = (_b = (_a = schema == null ? void 0 : schema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.media) == null ? void 0 : _c.tina) || {};
+      app.use("/media", createMediaRouter({
+        publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
+        syncFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.syncFolder) || "")
+      }));
       return server;
     };
   }
@@ -348,7 +384,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.21";
+var version = "0.60.22";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -753,7 +789,8 @@ var auditDocuments = async (args) => {
         collection: collection.name,
         relativePath: node._sys.relativePath
       },
-      silenceErrors: true
+      silenceErrors: true,
+      verbose: true
     });
     if (mutationRes.errors) {
       mutationRes.errors.forEach((err) => {
@@ -1487,6 +1524,7 @@ var chain = async (cmds, options) => {
 var import_chalk7 = __toModule(require("chalk"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/errors/index.ts
+var import_graphql10 = __toModule(require("@tinacms/graphql"));
 var BuildSchemaError = class extends Error {
   constructor(message) {
     super(message);
@@ -1512,6 +1550,8 @@ var handleServerErrors = (e) => {
     logger.error(`${dangerText("ERROR: your schema was not successfully validated: see https://tina.io/docs/schema/ for instructions on how to setup a schema")}
   Error Message Below
   ${e}`);
+  } else if (e instanceof import_graphql10.TinaFetchError) {
+    (0, import_graphql10.handleFetchErrorError)(e, true);
   } else {
     logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
  ${e.message}`);
@@ -1846,7 +1886,7 @@ var loaders = {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_datalayer3 = __toModule(require("@tinacms/datalayer"));
-var import_graphql10 = __toModule(require("@tinacms/graphql"));
+var import_graphql11 = __toModule(require("@tinacms/graphql"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/lock.ts
 var AsyncLock = class {
@@ -1871,7 +1911,6 @@ async function startServer(_ctx, next, {
   port = 4001,
   noWatch,
   experimentalData,
-  tinaCloudMediaStore: tinaCloudMediaStore2,
   noSDK,
   noTelemetry,
   watchFolders,
@@ -1892,7 +1931,7 @@ async function startServer(_ctx, next, {
   const bridge = new import_datalayer3.FilesystemBridge(rootPath2);
   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 database = await (0, import_graphql11.createDatabase)({ store, bridge });
   let ready = false;
   const build2 = async (noSDK2) => {
     database.clearCache();
@@ -1905,12 +1944,9 @@ async function startServer(_ctx, next, {
         await store.open();
       }
       const cliFlags = [];
-      if (tinaCloudMediaStore2) {
-        cliFlags.push("tinaCloudMediaStore");
-      }
-      const database2 = await (0, import_graphql10.createDatabase)({ store, bridge });
+      const database2 = await (0, import_graphql11.createDatabase)({ store, bridge });
       await compileSchema(null, null, { verbose, dev });
-      const schema = await (0, import_graphql10.buildSchema)(rootPath2, database2, cliFlags);
+      const schema = await (0, import_graphql11.buildSchema)(rootPath2, database2, cliFlags);
       await genTypes({ schema }, () => {
       }, { noSDK: noSDK2, verbose });
     } catch (error) {
@@ -1919,6 +1955,50 @@ async function startServer(_ctx, next, {
       lock.disable();
     }
   };
+  const state = {
+    server: null,
+    sockets: []
+  };
+  let isReady = false;
+  const start = async () => {
+    await lock.promise;
+    const s = (init_server3(), server_exports);
+    state.server = await s.default(database);
+    state.server.listen(port, () => {
+      const altairUrl = `http://localhost:${port}/altair/`;
+      const cmsUrl = `[your-development-url]/admin`;
+      if (verbose)
+        logger.info(`Started Filesystem GraphQL server on port: ${port}`);
+      logger.info(`Visit the GraphQL playground at ${import_chalk6.default.underline.blueBright(altairUrl)}
+or`);
+      logger.info(`Enter the CMS at ${import_chalk6.default.underline.blueBright(cmsUrl)} 
+`);
+    });
+    state.server.on("error", function(e) {
+      if (e.code === "EADDRINUSE") {
+        logger.error(dangerText(`Port 4001 already in use`));
+        process.exit();
+      }
+      throw e;
+    });
+    state.server.on("connection", (socket) => {
+      state.sockets.push(socket);
+    });
+  };
+  const restart = async () => {
+    logger.info("restarting local server...");
+    delete require.cache[gqlPackageFile];
+    state.sockets.forEach((socket) => {
+      if (socket.destroyed === false) {
+        socket.destroy();
+      }
+    });
+    state.sockets = [];
+    state.server.close(() => {
+      logger.info("Server closed");
+      start();
+    });
+  };
   const foldersToWatch = (watchFolders || []).map((x) => import_path8.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
@@ -1950,6 +2030,9 @@ async function startServer(_ctx, next, {
         try {
           if (shouldBuild) {
             await build2(noSDK);
+            if (isReady) {
+              restart();
+            }
           }
         } catch (e) {
           handleServerErrors(e);
@@ -1967,49 +2050,6 @@ async function startServer(_ctx, next, {
       await build2(noSDK);
     }
   }
-  const state = {
-    server: null,
-    sockets: []
-  };
-  let isReady = false;
-  const start = async () => {
-    const s = (init_server3(), server_exports);
-    state.server = await s.default(database);
-    state.server.listen(port, () => {
-      const altairUrl = `http://localhost:${port}/altair/`;
-      const cmsUrl = `[your-development-url]/admin`;
-      if (verbose)
-        logger.info(`Started Filesystem GraphQL server on port: ${port}`);
-      logger.info(`Visit the GraphQL playground at ${import_chalk6.default.underline.blueBright(altairUrl)}
-or`);
-      logger.info(`Enter the CMS at ${import_chalk6.default.underline.blueBright(cmsUrl)} 
-`);
-    });
-    state.server.on("error", function(e) {
-      if (e.code === "EADDRINUSE") {
-        logger.error(dangerText(`Port 4001 already in use`));
-        process.exit();
-      }
-      throw e;
-    });
-    state.server.on("connection", (socket) => {
-      state.sockets.push(socket);
-    });
-  };
-  const restart = async () => {
-    logger.info("Detected change to gql package, restarting...");
-    delete require.cache[gqlPackageFile];
-    state.sockets.forEach((socket) => {
-      if (socket.destroyed === false) {
-        socket.destroy();
-      }
-    });
-    state.sockets = [];
-    state.server.close(() => {
-      logger.info("Server closed");
-      start();
-    });
-  };
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([gqlPackageFile]).on("ready", async () => {
       isReady = true;
@@ -2176,11 +2216,8 @@ var watchFileOption = {
 };
 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"
+  description: "increase verbosity of logged output",
+  defaultValue: false
 };
 var developmentOption = {
   name: "--dev",
@@ -2194,7 +2231,6 @@ var baseCmds = [
       startServerPortOption,
       subCommand,
       experimentalDatalayer,
-      tinaCloudMediaStore,
       noWatchOption,
       noSDKCodegenOption,
       noTelemetryOption,
@@ -2219,28 +2255,18 @@ var baseCmds = [
   {
     command: CMD_COMPILE_MODELS,
     description: "Compile schema into static files for the server",
-    options: [experimentalDatalayer, tinaCloudMediaStore, noTelemetryOption],
+    options: [experimentalDatalayer, 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,
-      tinaCloudMediaStore,
-      noSDKCodegenOption,
-      noTelemetryOption
-    ],
+    options: [experimentalDatalayer, noSDKCodegenOption, noTelemetryOption],
     action: (options) => chain([attachSchema, genTypes], options)
   },
   {
     command: INIT,
-    options: [
-      experimentalDatalayer,
-      tinaCloudMediaStore,
-      noTelemetryOption,
-      schemaFileType
-    ],
+    options: [experimentalDatalayer, noTelemetryOption, schemaFileType],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
       checkDeps,
@@ -2311,7 +2337,7 @@ Examples:
       logger.info("");
     });
     (command.options || []).forEach((option) => {
-      newCmd.option(option.name, option.description);
+      newCmd.option(option.name, option.description, option == null ? void 0 : option.defaultValue);
     });
     if (command.subCommands) {
       registerCommands(command.subCommands, true);

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

@@ -24,6 +24,10 @@ interface ListMediaRes {
     cursor?: string;
     error?: string;
 }
+export interface PathConfig {
+    publicFolder: string;
+    syncFolder: string;
+}
 declare type SuccessRecord = {
     ok: true;
 } | {
@@ -31,10 +35,9 @@ declare type SuccessRecord = {
     message: string;
 };
 export declare class MediaModel {
-    readonly basePath: string;
-    constructor({ basePath }: {
-        basePath: string;
-    });
+    readonly publicFolder: string;
+    readonly syncFolder: string;
+    constructor({ publicFolder, syncFolder }: PathConfig);
     listMedia(args: MediaArgs): Promise<ListMediaRes>;
     deleteMedia(args: MediaArgs): Promise<SuccessRecord>;
 }

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

@@ -10,4 +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.
 */
-export declare const mediaRouter: import("express-serve-static-core").Router;
+import { PathConfig } from '../models/media';
+export declare const createMediaRouter: (config: PathConfig) => import("express-serve-static-core").Router;

package/dist/server/server.d.ts

@@ -12,4 +12,4 @@ limitations under the License.
 */
 /// <reference types="node" />
 import http from 'http';
-export declare const gqlServer: (database: any) => Promise<http.Server>;
+export declare const gqlServer: (database: any, verbose: boolean) => Promise<http.Server>;

package/dist/utils/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 parseMediaFolder: (str: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.21",
+  "version": "0.60.22",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.7",
+    "@tinacms/scripts": "0.50.8",
     "@types/clear": "0.1.0",
     "@types/cors": "2.8.5",
     "@types/express": "^4.17.7",
@@ -59,9 +59,9 @@
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
     "@tinacms/datalayer": "0.1.1",
-    "@tinacms/graphql": "0.60.6",
+    "@tinacms/graphql": "0.60.7",
     "@tinacms/metrics": "0.0.3",
-    "@tinacms/schema-tools": "0.0.4",
+    "@tinacms/schema-tools": "0.0.5",
     "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
     "add": "^2.0.6",
     "ajv": "^6.12.3",