@tinacms/cli 0.62.0 → 0.62.2

package/bin/tinacms

@@ -1,3 +1,11 @@
 #!/usr/bin/env node
 
-require('../dist/index.js').init(process.argv)
+const version = process.version.slice(1)
+const [major, minor] = version.split('.')
+if (major < 14 || (major == 14 && minor < 18)) {
+  console.error(
+    'ERROR: Node.js version lower than 14.18 is not supported in tinacms, please update to the latest LTS version. See https://nodejs.org/en/download/ for more details'
+  )
+} else {
+  require('../dist/index.js').init(process.argv)
+}

package/dist/buildTina/index.d.ts

@@ -38,6 +38,7 @@ export declare const buildCmdBuild: (ctx: {
     rootPath: string;
     usingTs: boolean;
     schema: unknown;
+    apiUrl: string;
 }, next: () => void, options: Omit<BuildOptions & BuildSetupOptions & ClientGenOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
 export declare const auditCmdBuild: (ctx: {
     builder: ConfigBuilder;

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

@@ -16,11 +16,6 @@ export declare const resetGeneratedFolder: ({ tinaGeneratedPath, usingTs, isBuil
     usingTs: boolean;
     isBuild: boolean;
 }) => Promise<void>;
-export declare const compileClient: (ctx: any, next: any, options: {
-    clientFileType?: string;
-    verbose?: boolean;
-    dev?: boolean;
-}) => Promise<any>;
 export declare const compileFile: (options: {
     schemaFileType?: string;
     verbose?: boolean;

package/dist/cmds/statusChecks/checkClientInformation.d.ts

@@ -20,7 +20,7 @@ export declare const checkClientInfo: (ctx: {
     bridge: Bridge;
     usingTs: boolean;
     schema?: TinaCloudSchema<false>;
-    client: any;
+    apiUrl: string;
 }, next: any, _options: {
     verbose?: boolean;
 }) => Promise<void>;

package/dist/cmds/statusChecks/waitForIndexing.d.ts

@@ -10,6 +10,23 @@ 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: {
+import { TinaCloudSchema } from '@tinacms/schema-tools';
+import { Database, Bridge } from '@tinacms/graphql';
+import { ConfigBuilder } from '../../buildTina';
+export declare const waitForDB: (ctx: {
+    builder: ConfigBuilder;
+    rootPath: string;
+    database: Database;
+    bridge: Bridge;
+    usingTs: boolean;
+    schema?: TinaCloudSchema<true>;
+    apiUrl: string;
+}, next: any, options: {
     verbose?: boolean;
 }) => Promise<any>;
+export declare const parseURL: (url: string) => {
+    branch: string;
+    isLocalClient: boolean;
+    clientId: string;
+    host: string;
+};

package/dist/index.js

@@ -302,7 +302,7 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "0.62.0";
+var version = "0.62.2";
 
 // src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -543,8 +543,23 @@ var chain = async (cmds, options) => {
 // src/cmds/baseCmds.ts
 var import_chalk5 = __toModule(require("chalk"));
 
-// src/cmds/compile/index.ts
-var _ = __toModule(require("lodash"));
+// src/cmds/start-server/index.ts
+var import_path11 = __toModule(require("path"));
+var import_chalk4 = __toModule(require("chalk"));
+var import_chokidar = __toModule(require("chokidar"));
+var import_metrics2 = __toModule(require("@tinacms/metrics"));
+
+// src/cmds/start-server/lock.ts
+var AsyncLock = class {
+  constructor() {
+    this.disable = () => {
+    };
+    this.promise = Promise.resolve();
+  }
+  enable() {
+    this.promise = new Promise((resolve2) => this.disable = resolve2);
+  }
+};
 
 // src/cmds/start-server/errors/index.ts
 var import_graphql3 = __toModule(require("@tinacms/graphql"));
@@ -581,7 +596,14 @@ var handleServerErrors = (e) => {
   }
 };
 
+// src/buildTina/index.ts
+var import_fs_extra6 = __toModule(require("fs-extra"));
+var import_graphql9 = __toModule(require("@tinacms/graphql"));
+var import_datalayer = __toModule(require("@tinacms/datalayer"));
+var import_path8 = __toModule(require("path"));
+
 // src/cmds/compile/index.ts
+var _ = __toModule(require("lodash"));
 var import_fs_extra2 = __toModule(require("fs-extra"));
 var import_path3 = __toModule(require("path"));
 var import_esbuild = __toModule(require("esbuild"));
@@ -631,12 +653,6 @@ var getPath = ({
   }
   return inputFile;
 };
-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 });
-};
 
 // src/cmds/compile/index.ts
 var generatedFilesToRemove = [
@@ -674,12 +690,12 @@ var resetGeneratedFolder = async ({
   }
   await import_fs_extra2.default.mkdirp(tinaGeneratedPath);
   const ext = usingTs ? "ts" : "js";
-  if (await !import_fs_extra2.default.pathExists(import_path3.default.join(tinaGeneratedPath, `types.${ext}`))) {
+  if (!await import_fs_extra2.default.pathExists(import_path3.default.join(tinaGeneratedPath, `types.${ext}`))) {
     await import_fs_extra2.default.writeFile(import_path3.default.join(tinaGeneratedPath, `types.${ext}`), `
       export const queries = (client)=>({})
       `);
   }
-  if (await !import_fs_extra2.default.pathExists(import_path3.default.join(tinaGeneratedPath, `client.${ext}`))) {
+  if (!await import_fs_extra2.default.pathExists(import_path3.default.join(tinaGeneratedPath, `client.${ext}`))) {
     await import_fs_extra2.default.writeFile(import_path3.default.join(tinaGeneratedPath, `client.${ext}`), `
 export const client = ()=>{}
 export default client
@@ -702,75 +718,6 @@ out.jsx
 var cleanup = async ({ tinaTempPath }) => {
   await import_fs_extra2.default.remove(tinaTempPath);
 };
-var compileClient = async (ctx, next, options) => {
-  const root2 = ctx.rootPath;
-  if (!root2) {
-    throw new Error("ctx.rootPath has not been attached");
-  }
-  const tinaPath = import_path3.default.join(root2, ".tina");
-  const tinaGeneratedPath = import_path3.default.join(tinaPath, "__generated__");
-  const packageJSONFilePath = import_path3.default.join(root2, "package.json");
-  const tinaTempPath = import_path3.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;
-  const projectDir = import_path3.default.join(tinaPath, "__generated__");
-  try {
-    getClientPath({ projectDir });
-  } 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
-    });
-    await transpile(inputFile, "client.js", tinaTempPath, options.verbose, define, packageJSONFilePath);
-  } 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_path3.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 compileFile = async (options, fileName) => {
   const root2 = options.rootPath;
   if (!root2) {
@@ -933,30 +880,6 @@ var loaders = {
   ".tsx": "tsx"
 };
 
-// src/cmds/start-server/index.ts
-var import_path11 = __toModule(require("path"));
-var import_chalk4 = __toModule(require("chalk"));
-var import_chokidar = __toModule(require("chokidar"));
-var import_metrics2 = __toModule(require("@tinacms/metrics"));
-
-// src/cmds/start-server/lock.ts
-var AsyncLock = class {
-  constructor() {
-    this.disable = () => {
-    };
-    this.promise = Promise.resolve();
-  }
-  enable() {
-    this.promise = new Promise((resolve2) => this.disable = resolve2);
-  }
-};
-
-// src/buildTina/index.ts
-var import_fs_extra6 = __toModule(require("fs-extra"));
-var import_graphql9 = __toModule(require("@tinacms/graphql"));
-var import_datalayer = __toModule(require("@tinacms/datalayer"));
-var import_path8 = __toModule(require("path"));
-
 // src/cmds/query-gen/genTypes.ts
 var import_graphql8 = __toModule(require("graphql"));
 var import_fs_extra3 = __toModule(require("fs-extra"));
@@ -1387,6 +1310,7 @@ var buildCmdBuild = async (ctx, next, options) => {
     usingTs: ctx.usingTs,
     port: options.port
   });
+  ctx.apiUrl = apiUrl;
   await buildAdmin({
     local: options.local,
     rootPath: ctx.rootPath,
@@ -1677,6 +1601,7 @@ or`);
 
 // src/cmds/statusChecks/waitForIndexing.ts
 var import_progress = __toModule(require("progress"));
+var import_url_pattern = __toModule(require("url-pattern"));
 var POLLING_INTERVAL = 5e3;
 var STATUS_INPROGRESS = "inprogress";
 var STATUS_COMPLETE = "complete";
@@ -1688,11 +1613,8 @@ var IndexFailedError = class extends Error {
   }
 };
 var waitForDB = async (ctx, next, options) => {
-  if (!ctx.client) {
-    throw new Error("No Tina Cloud found. For more information on how to setup the Tina Cloud see https://tina.io/docs/features/data-fetching/#making-requests-with-the-tina-client");
-  }
-  const client = ctx.client;
-  const { host, clientId, branch, isLocalClient } = client.parseURL();
+  const token = ctx.schema.config.token;
+  const { clientId, branch, isLocalClient, host } = parseURL(ctx.apiUrl);
   if (isLocalClient) {
     return next();
   }
@@ -1704,8 +1626,8 @@ var waitForDB = async (ctx, next, options) => {
       }
       const headers = new Headers();
       headers.append("Content-Type", "application/json");
-      if (client.readonlyToken) {
-        headers.append("X-API-KEY", client.readonlyToken);
+      if (token) {
+        headers.append("X-API-KEY", token);
       }
       const response = await fetch(`https://${host}/db/${clientId}/status/${branch}`, {
         method: "GET",
@@ -1744,6 +1666,32 @@ var waitForDB = async (ctx, next, options) => {
     waitFor: pollForStatus
   });
 };
+var parseURL = (url) => {
+  if (url.includes("localhost")) {
+    return {
+      host: "localhost",
+      branch: null,
+      isLocalClient: true,
+      clientId: null
+    };
+  }
+  const params = new URL(url);
+  const pattern = new import_url_pattern.default("/content/:clientId/github/*", {
+    escapeChar: " "
+  });
+  const result = pattern.match(params.pathname);
+  const branch = result == null ? void 0 : result._;
+  const clientId = result == null ? void 0 : result.clientId;
+  if (!branch || !clientId) {
+    throw new Error(`Invalid URL format provided. Expected: https://content.tinajs.io/content/<ClientID>/github/<Branch> but but received ${url}`);
+  }
+  return {
+    host: params.host,
+    clientId,
+    branch,
+    isLocalClient: false
+  };
+};
 
 // src/cmds/startSubprocess/index.ts
 var import_child_process = __toModule(require("child_process"));
@@ -2371,13 +2319,53 @@ function execShellCommand(cmd) {
 
 // src/cmds/statusChecks/checkClientInformation.ts
 var import_progress2 = __toModule(require("progress"));
+async function request(args) {
+  let data = {};
+  const headers = new Headers();
+  if (args.token) {
+    headers.append("X-API-KEY", args.token);
+  }
+  headers.append("Content-Type", "application/json");
+  const bodyString = JSON.stringify({
+    query: args.query,
+    variables: (args == null ? void 0 : args.variables) || {}
+  });
+  const url = args == null ? void 0 : args.url;
+  const res = await fetch(url, {
+    method: "POST",
+    headers,
+    body: bodyString,
+    redirect: "follow"
+  });
+  if (!res.ok) {
+    let additionalInfo = "";
+    if (res.status === 401) {
+      additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+    }
+    throw new Error(`Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`);
+  }
+  const json = await res.json();
+  if (json.errors) {
+    throw new Error(`Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`);
+  }
+  return {
+    data: json == null ? void 0 : json.data,
+    query: args.query
+  };
+}
 var checkClientInfo = async (ctx, next, _options) => {
   var _a;
-  const client = ctx.client;
   const config2 = (_a = ctx.schema) == null ? void 0 : _a.config;
+  const token = config2.token;
+  const url = ctx.apiUrl;
   const bar = new import_progress2.default("Checking clientId, token and branch. :prog", 1);
   try {
-    await client.request({
+    await request({
+      token,
+      url,
       query: `query {
         collections {
           name
@@ -2542,7 +2530,6 @@ var baseCmds = [
       checkOptions,
       buildSetupCmdBuild,
       buildCmdBuild,
-      compileClient,
       checkClientInfo,
       waitForDB
     ], options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.62.0",
+  "version": "0.62.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -52,11 +52,11 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/app": "0.0.26",
+    "@tinacms/app": "0.0.27",
     "@tinacms/datalayer": "0.2.4",
-    "@tinacms/graphql": "0.63.18",
+    "@tinacms/graphql": "0.63.19",
     "@tinacms/metrics": "0.0.3",
-    "@tinacms/schema-tools": "0.2.0",
+    "@tinacms/schema-tools": "0.2.1",
     "add": "^2.0.6",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
@@ -81,6 +81,7 @@
     "log4js": "^6.4.0",
     "multer": "1.4.5-lts.1",
     "normalize-path": "^3.0.0",
+    "url-pattern": "^1.0.3",
     "progress": "^2.0.3",
     "prompts": "^2.4.1",
     "yarn": "^1.22.17",