@tinacms/cli 0.60.5 → 0.60.8

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # tinacms-cli
 
+## 0.60.8
+
+### Patch Changes
+
+- 919f5cb6c: use standard next script names
+
+## 0.60.7
+
+### Patch Changes
+
+- 9e436f145: Update CLI to use defineConfig
+- 851e4be73: Update tina init to use the new way of laying out tina config
+- cc99e4309: update admin file path to /pages/admin.js to support the hash router
+  - @tinacms/datalayer@0.0.2
+  - @tinacms/graphql@0.59.7
+  - @tinacms/metrics@0.0.2
+
+## 0.60.6
+
+### Patch Changes
+
+- 98622111d: Use [esbuild](https://esbuild.github.io/) to build the schema instead of typescript.
+
+  This allows the user to
+
+  - use non typescript files like JS, JSX, TS
+  - Import from outside of the tina folder
+
+  The downside
+
+  - Now type errors will still pass (The schema will compile) and one will get an error at runtime instead of compile time
+
+- Updated dependencies [c730fa1dd]
+- Updated dependencies [cd0f6f022]
+  - @tinacms/graphql@0.59.7
+
 ## 0.60.5
 
 ### 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 = "\nimport { defineSchema } from \"@tinacms/cli\";\n\nexport default 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: \"string\",\n          label: \"Blog Post Body\",\n          name: \"body\",\n          isBody: true,\n          ui: {\n            component: \"textarea\"\n          },\n        },\n      ],\n    },\n  ],\n});\n";
+export declare const defaultSchema = "\nimport { defineSchema, defineConfig } from \"tinacms\";\n\nexport default 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: \"string\",\n          label: \"Blog Post Body\",\n          name: \"body\",\n          isBody: true,\n          ui: {\n            component: \"textarea\"\n          },\n        },\n      ],\n    },\n  ],\n});\n\n\n\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  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});\n";

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

@@ -1,4 +1,4 @@
 export declare function initTina(ctx: any, next: () => void, options: any): Promise<void>;
 export declare function installDeps(ctx: any, next: () => void, options: any): Promise<void>;
-export declare function tinaSetup(ctx: any, next: () => void, options: any): Promise<void>;
+export declare function tinaSetup(_ctx: any, next: () => void, _options: any): Promise<void>;
 export declare function successMessage(ctx: any, next: () => void, options: any): Promise<void>;

package/dist/cmds/init/setup-files/index.d.ts

@@ -13,4 +13,4 @@ limitations under the License.
 export declare const adminPage = "import { TinaAdmin } from 'tinacms';\nexport default TinaAdmin;\n";
 export declare const blogPost = "---\ntitle: Vote For Pedro\n---\n# Welcome to the blog.\n\n> To edit this site head over to the [`/admin`](/admin) route. Then click the pencil icon in the bottom lefthand corner to start editing \uD83E\uDD99. \n\n# Dixi gaude Arethusa\n\n## Oscula mihi\n\nLorem markdownum numerabilis armentorum platanus, cultros coniunx sibi per\nsilvas, nostris clausit sequemur diverso scopulosque. Fecit tum alta sed non\nfalcato murmura, geminas donata Amyntore, quoque Nox. Invitam inquit, modo\nnocte; ut ignis faciemque manes in imagine sinistra ut mucrone non ramos\nsepulcro supplex. Crescentesque populos motura, fit cumque. Verumque est; retro\nsibi tristia bracchia Aetola telae caruerunt et.\n\n\n## Mutato fefellimus sit demisit aut alterius sollicito\n\nPhaethonteos vestes quem involvite iuvenca; furiali anne: sati totumque,\n**corpora** cum rapacibus nunc! Nervis repetatne, miserabile doleas, deprensum\nhunc, fluctus Threicio, ad urbes, magicaeque, quid. Per credensque series adicis\npoteram [quidem](#)! Iam uni mensas victrix\nvittas ut flumina Satyri adulter; bellum iacet domitae repercusso truncis urnis\nmille rigidi sub taurum.\n\n\n";
 export declare const nextPostPage: () => string;
-export declare const AppJsContent: (extraImports?: string) => string;
+export declare const AppJsContent: (usingSrc: boolean, extraImports?: string) => string;

package/dist/cmds/init/setup-files/tinaProvider.d.ts

@@ -0,0 +1,14 @@
+/**
+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 TinaProvider = "import TinaCMS from 'tinacms'\nimport { tinaConfig } from '../schema.ts'\n\n// Importing the TinaProvider directly into your page will cause Tina to be added to the production bundle.\n// Instead, import the tina/provider/index default export to have it dynamially imported in edit-moode\n/**\n *\n * @private Do not import this directly, please import the dynamic provider instead\n */\nconst TinaProvider = ({ children }) => {\n  return <TinaCMS {...tinaConfig}>{children}</TinaCMS>\n}\n\nexport default TinaProvider\n";
+export declare const TinaProviderDynamic = "import dynamic from 'next/dynamic'\nconst TinaProvider = dynamic(() => import('./TinaProvider'), { ssr: false })\nimport { TinaEditProvider } from 'tinacms/dist/edit-state'\n\nconst DynamicTina = ({ children }) => {\n  return (\n    <>\n      <TinaEditProvider editMode={<TinaProvider>{children}</TinaProvider>}>\n        {children}\n      </TinaEditProvider>\n    </>\n  )\n}\n\nexport default DynamicTina\n";

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

@@ -0,0 +1,19 @@
+/**
+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 class BuildSchemaError extends Error {
+    constructor(message: any);
+}
+export declare class ExecuteSchemaError extends Error {
+    constructor(message: any);
+}
+export declare const handleServerErrors: (e: Error) => void;

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

@@ -13,10 +13,11 @@ limitations under the License.
 interface Options {
     port?: number;
     command?: string;
+    watchFolders?: string[];
     experimentalData?: boolean;
     noWatch?: boolean;
     noSDK: boolean;
     noTelemetry: boolean;
 }
-export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK, noTelemetry, }: Options): Promise<void>;
+export declare function startServer(_ctx: any, _next: any, { port, command, noWatch, experimentalData, noSDK, noTelemetry, watchFolders, }: Options): Promise<void>;
 export {};

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

@@ -0,0 +1,18 @@
+/**
+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 class AsyncLock {
+    disable: any;
+    promise: any;
+    constructor();
+    enable(): void;
+}

package/dist/index.js

@@ -114,7 +114,7 @@ var commander = __toModule(require("commander"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
 var name = "@tinacms/cli";
-var version = "0.60.5";
+var version = "0.60.8";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
@@ -391,20 +391,18 @@ schema {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_child_process = __toModule(require("child_process"));
-var import_path3 = __toModule(require("path"));
+var import_path4 = __toModule(require("path"));
 var import_graphql7 = __toModule(require("@tinacms/graphql"));
 var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
-var import_fast_glob = __toModule(require("fast-glob"));
-var import_normalize_path = __toModule(require("normalize-path"));
-var import_path2 = __toModule(require("path"));
-var import_fs_extra2 = __toModule(require("fs-extra"));
-var ts = __toModule(require("typescript"));
+var import_path3 = __toModule(require("path"));
+var import_fs_extra3 = __toModule(require("fs-extra"));
+var import_esbuild = __toModule(require("esbuild"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
 var defaultSchema = `
-import { defineSchema } from "@tinacms/cli";
+import { defineSchema, defineConfig } from "tinacms";
 
 export default defineSchema({
   collections: [
@@ -431,70 +429,227 @@ export default defineSchema({
     },
   ],
 });
+
+
+
+
+// Your tina config
+// ==============
+const branch = 'main'
+// When working locally, hit our local filesystem.
+// On a Vercel deployment, hit the Tina Cloud API
+const apiURL =
+  process.env.NODE_ENV == 'development'
+    ? 'http://localhost:4001/graphql'
+    : \`https://content.tinajs.io/content/\${process.env.NEXT_PUBLIC_TINA_CLIENT_ID}/github/\${branch}\`
+
+export const tinaConfig = defineConfig({
+  apiURL,
+  cmsCallback: (cms) => {
+    //  add your CMS callback code here (if you want)
+
+    // The Route Mapper
+    /**
+     * 1. Import \`tinacms\` and \`RouteMappingPlugin\`
+     **/
+    import("tinacms").then(({ RouteMappingPlugin }) => {
+      /**
+       * 2. Define the \`RouteMappingPlugin\` see https://tina.io/docs/tinacms-context/#the-routemappingplugin for more details
+       **/
+      const RouteMapping = new RouteMappingPlugin((collection, document) => {
+        return undefined;
+      });
+      /**
+       * 3. Add the \`RouteMappingPlugin\` to the \`cms\`.
+       **/
+      cms.plugins.add(RouteMapping);
+    });
+  },
+});
 `;
 
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/lib/getSchemaPath.ts
+var import_path2 = __toModule(require("path"));
+var import_fs_extra2 = __toModule(require("fs-extra"));
+var ErrorMessage = "Must provide a `.tina/schema.{ts,js,tsx,jsx}`";
+var getSchemaPath = ({ projectDir }) => {
+  if (!import_fs_extra2.default.existsSync(projectDir)) {
+    throw new Error(ErrorMessage);
+  }
+  const inputPathTS = import_path2.default.join(projectDir, "schema.ts");
+  const inputPathJS = import_path2.default.join(projectDir, "schema.js");
+  const inputPathTSX = import_path2.default.join(projectDir, "schema.tsx");
+  const inputPathJSX = import_path2.default.join(projectDir, "schema.jsx");
+  let inputFile;
+  if (import_fs_extra2.default.existsSync(inputPathTS)) {
+    inputFile = inputPathTS;
+  } else if (import_fs_extra2.default.existsSync(inputPathJS)) {
+    inputFile = inputPathJS;
+  } else if (import_fs_extra2.default.existsSync(inputPathTSX)) {
+    inputFile = inputPathTSX;
+  } else if (import_fs_extra2.default.existsSync(inputPathJSX)) {
+    inputFile = inputPathJSX;
+  }
+  if (!inputFile) {
+    throw new Error(ErrorMessage);
+  }
+  return inputFile;
+};
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/errors/index.ts
+var BuildSchemaError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "BuildSchemaError";
+  }
+};
+var ExecuteSchemaError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ExecuteSchemaError";
+  }
+};
+var handleServerErrors = (e) => {
+  if (e instanceof BuildSchemaError) {
+    logger.error(`${dangerText("ERROR: your schema was not successfully built: see https://tina.io/docs/errors/esbuild-error/ for more details")}
+  Error Message Below
+  ${e}`);
+  } else if (e instanceof ExecuteSchemaError) {
+    logger.error(`${dangerText("ERROR: your schema was not successfully executed: see https://tina.io/docs/errors/esbuild-error/ for more details")}
+  Error Message Below
+  ${e}`);
+  } else {
+    logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
+ ${e.message}`);
+  }
+};
+
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
-var tinaPath = import_path2.default.join(process.cwd(), ".tina");
-var tinaGeneratedPath = import_path2.default.join(tinaPath, "__generated__");
-var tinaTempPath = import_path2.default.join(tinaGeneratedPath, "temp");
-var tinaConfigPath = import_path2.default.join(tinaGeneratedPath, "config");
+var tinaPath = import_path3.default.join(process.cwd(), ".tina");
+var packageJSONFilePath = import_path3.default.join(process.cwd(), "package.json");
+var tinaGeneratedPath = import_path3.default.join(tinaPath, "__generated__");
+var tinaTempPath = import_path3.default.join(tinaGeneratedPath, "temp");
+var tinaConfigPath = import_path3.default.join(tinaGeneratedPath, "config");
 var resetGeneratedFolder = async () => {
   try {
-    await import_fs_extra2.default.rmdir(tinaGeneratedPath, {
+    await import_fs_extra3.default.rmdir(tinaGeneratedPath, {
       recursive: true
     });
   } catch (e) {
     console.log(e);
   }
-  await import_fs_extra2.default.mkdir(tinaGeneratedPath);
-  await import_fs_extra2.default.outputFile(import_path2.default.join(tinaGeneratedPath, ".gitignore"), "db");
+  await import_fs_extra3.default.mkdir(tinaGeneratedPath);
+  await import_fs_extra3.default.outputFile(import_path3.default.join(tinaGeneratedPath, ".gitignore"), "db");
+};
+var cleanup = async ({ tinaTempPath: tinaTempPath2 }) => {
+  await import_fs_extra3.default.remove(tinaTempPath2);
 };
 var compile = async (_ctx, _next) => {
   logger.info(logText("Compiling..."));
-  if (!import_fs_extra2.default.existsSync(tinaPath) || !import_fs_extra2.default.existsSync(import_path2.default.join(tinaPath, "schema.ts"))) {
+  let schemaExists = true;
+  try {
+    getSchemaPath({ projectDir: tinaPath });
+  } catch {
+    schemaExists = false;
+  }
+  if (!schemaExists) {
     logger.info(dangerText(`
       .tina/schema.ts not found, Creating one for you...
       See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
       `));
-    const file = import_path2.default.join(tinaPath, "schema.ts");
-    await import_fs_extra2.default.ensureFile(file);
-    await import_fs_extra2.default.writeFile(file, defaultSchema);
+    const file = import_path3.default.join(tinaPath, "schema.ts");
+    await import_fs_extra3.default.ensureFile(file);
+    await import_fs_extra3.default.writeFile(file, defaultSchema);
+  }
+  try {
+    await transpile(tinaPath, tinaTempPath);
+  } catch (e) {
+    await cleanup({ tinaTempPath });
+    throw new BuildSchemaError(e);
   }
-  await transpile2(tinaPath, tinaTempPath);
   Object.keys(require.cache).map((key) => {
     if (key.startsWith(tinaTempPath)) {
       delete require.cache[require.resolve(key)];
     }
   });
-  const schemaFunc = require(import_path2.default.join(tinaTempPath, "schema.js"));
-  const schemaObject = schemaFunc.default;
-  await import_fs_extra2.default.outputFile(import_path2.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
-  await import_fs_extra2.default.remove(tinaTempPath);
+  try {
+    const schemaFunc = require(import_path3.default.join(tinaTempPath, "schema.js"));
+    const schemaObject = schemaFunc.default;
+    await import_fs_extra3.default.outputFile(import_path3.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
+    await cleanup({ tinaTempPath });
+  } catch (e) {
+    await cleanup({ tinaTempPath });
+    throw new ExecuteSchemaError(e);
+  }
 };
-var transpile2 = async (projectDir, tempDir) => {
-  logger.info(logText("Transpiling..."));
-  const posixProjectDir = (0, import_normalize_path.default)(projectDir);
-  const posixTempDir = (0, import_normalize_path.default)(tempDir);
-  return Promise.all(import_fast_glob.default.sync(import_path2.default.join(projectDir, "**", "*.ts").replace(/\\/g, "/"), {
-    ignore: [
-      import_path2.default.join(projectDir, "__generated__", "**", "*.ts").replace(/\\/g, "/")
-    ]
-  }).map(async function(file) {
-    const fullPath = import_path2.default.resolve(file);
-    const contents = await import_fs_extra2.default.readFileSync(fullPath).toString();
-    const newContent = ts.transpile(contents);
-    const newPath = file.replace(posixProjectDir, posixTempDir).replace(".ts", ".js");
-    await import_fs_extra2.default.outputFile(newPath, newContent);
-    return true;
-  }));
+var transpile = async (projectDir, tempDir) => {
+  logger.info(logText("Building javascript..."));
+  const packageJSON = JSON.parse(import_fs_extra3.default.readFileSync(packageJSONFilePath).toString() || "{}");
+  const deps = (packageJSON == null ? void 0 : packageJSON.dependencies) || [];
+  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_path3.default.join(tempDir, "schema.js");
+  await (0, import_esbuild.build)({
+    bundle: true,
+    platform: "neutral",
+    target: ["node10.4"],
+    entryPoints: [inputFile],
+    treeShaking: true,
+    external: [...external, "./node_modules/*"],
+    loader: loaders,
+    outfile: outputPath
+  });
+  logger.info(logText(`Javascript built`));
 };
 var defineSchema = (config) => {
   return config;
 };
+var loaders = {
+  ".aac": "file",
+  ".css": "file",
+  ".eot": "file",
+  ".flac": "file",
+  ".gif": "file",
+  ".jpeg": "file",
+  ".jpg": "file",
+  ".json": "json",
+  ".mp3": "file",
+  ".mp4": "file",
+  ".ogg": "file",
+  ".otf": "file",
+  ".png": "file",
+  ".svg": "file",
+  ".ttf": "file",
+  ".wav": "file",
+  ".webm": "file",
+  ".webp": "file",
+  ".woff": "file",
+  ".woff2": "file",
+  ".js": "jsx",
+  ".jsx": "jsx",
+  ".tsx": "tsx"
+};
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
 var import_chokidar = __toModule(require("chokidar"));
 var import_metrics = __toModule(require("@tinacms/metrics"));
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/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);
+  }
+};
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+var lock = new AsyncLock();
 var gqlPackageFile = require.resolve("@tinacms/graphql");
 async function startServer(_ctx, _next, {
   port = 4001,
@@ -502,8 +657,10 @@ async function startServer(_ctx, _next, {
   noWatch,
   experimentalData,
   noSDK,
-  noTelemetry
+  noTelemetry,
+  watchFolders
 }) {
+  lock.disable();
   const rootPath2 = process.cwd();
   const t = new import_metrics.Telemetry({ disabled: Boolean(noTelemetry) });
   t.submitRecord({
@@ -541,29 +698,45 @@ stack: ${code.stack || "No stack was provided"}`);
     }
   };
   let ready = false;
-  const build = async (noSDK2) => {
-    if (!process.env.CI && !noWatch) {
-      await resetGeneratedFolder();
+  const build2 = async (noSDK2) => {
+    await lock.promise;
+    lock.enable();
+    try {
+      if (!process.env.CI && !noWatch) {
+        await resetGeneratedFolder();
+      }
+      const database2 = await (0, import_graphql7.createDatabase)({ store, bridge });
+      await compile(null, null);
+      const schema = await (0, import_graphql7.buildSchema)(rootPath2, database2);
+      await genTypes({ schema }, () => {
+      }, { noSDK: noSDK2 });
+    } catch (error) {
+      throw error;
+    } finally {
+      lock.disable();
     }
-    const database2 = await (0, import_graphql7.createDatabase)({ store, bridge });
-    await compile(null, null);
-    const schema = await (0, import_graphql7.buildSchema)(rootPath2, database2);
-    await genTypes({ schema }, () => {
-    }, { noSDK: noSDK2 });
   };
+  const foldersToWatch = (watchFolders || []).map((x) => import_path4.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
-    import_chokidar.default.watch([`${rootPath2}/**/*.{ts,gql,graphql}`], {
-      ignored: `${import_path3.default.resolve(rootPath2)}/.tina/__generated__/**/*`
+    import_chokidar.default.watch([
+      ...foldersToWatch,
+      `${rootPath2}/.tina/**/*.{ts,gql,graphql,js,tsx,jsx}`
+    ], {
+      ignored: [
+        "**/node_modules/**/*",
+        "**/.next/**/*",
+        `${import_path4.default.resolve(rootPath2)}/.tina/__generated__/**/*`
+      ]
     }).on("ready", async () => {
       console.log("Generating Tina config");
       try {
         if (shouldBuild) {
-          await build(noSDK);
+          await build2(noSDK);
         }
         ready = true;
         startSubprocess();
       } catch (e) {
-        logger.info(dangerText(`${e.message}`));
+        handleServerErrors(e);
         console.log(e);
         process.exit(0);
       }
@@ -572,11 +745,10 @@ stack: ${code.stack || "No stack was provided"}`);
         logger.info("Tina change detected, regenerating config");
         try {
           if (shouldBuild) {
-            await build(noSDK);
+            await build2(noSDK);
           }
         } catch (e) {
-          logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
- ${e.message}`);
+          handleServerErrors(e);
           t.submitRecord({
             event: {
               name: "tinacms:cli:server:error",
@@ -588,7 +760,7 @@ stack: ${code.stack || "No stack was provided"}`);
     });
   } else {
     if (shouldBuild) {
-      await build(noSDK);
+      await build2(noSDK);
     }
   }
   const state = {
@@ -647,8 +819,8 @@ stack: ${code.stack || "No stack was provided"}`);
 }
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
-var import_fs_extra3 = __toModule(require("fs-extra"));
-var import_path4 = __toModule(require("path"));
+var import_fs_extra4 = __toModule(require("fs-extra"));
+var import_path5 = __toModule(require("path"));
 var import_progress = __toModule(require("progress"));
 var import_prompts = __toModule(require("prompts"));
 var import_metrics2 = __toModule(require("@tinacms/metrics"));
@@ -963,41 +1135,70 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   };
   
 `;
-var AppJsContent = (extraImports) => `import dynamic from 'next/dynamic'
-import { TinaEditProvider } from 'tinacms/dist/edit-state'
-const TinaCMS = dynamic(() => import('tinacms'), { ssr: false })
+var AppJsContent = (usingSrc, extraImports) => `import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'
+
 ${extraImports || ""}
+const App = ({ Component, pageProps }) => {
+  return (
+    <Tina>
+      <Component {...pageProps} />
+    </Tina>
+  )
+}
 
-const branch = process.env.NEXT_PUBLIC_EDIT_BRANCH || "main";
-const apiURL =
-  process.env.NODE_ENV == "development"
-    ? "http://localhost:4001/graphql"
-    : \`https://content.tinajs.io/content/\${process.env.NEXT_PUBLIC_TINA_CLIENT_ID}/github/\${branch}\`;
+export default App
 
-const App = ({ Component, pageProps }) => {
+`;
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+var import_chalk2 = __toModule(require("chalk"));
+
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/tinaProvider.ts
+var TinaProvider = `import TinaCMS from 'tinacms'
+import { tinaConfig } from '../schema.ts'
+
+// Importing the TinaProvider directly into your page will cause Tina to be added to the production bundle.
+// Instead, import the tina/provider/index default export to have it dynamially imported in edit-moode
+/**
+ *
+ * @private Do not import this directly, please import the dynamic provider instead
+ */
+const TinaProvider = ({ children }) => {
+  return <TinaCMS {...tinaConfig}>{children}</TinaCMS>
+}
+
+export default TinaProvider
+`;
+var TinaProviderDynamic = `import dynamic from 'next/dynamic'
+const TinaProvider = dynamic(() => import('./TinaProvider'), { ssr: false })
+import { TinaEditProvider } from 'tinacms/dist/edit-state'
+
+const DynamicTina = ({ children }) => {
   return (
     <>
-      <TinaEditProvider
-        editMode={
-          <TinaCMS
-            apiURL={apiURL}
-
-          >
-            <Component {...pageProps} />
-          </TinaCMS>
-        }
-      >
-        <Component {...pageProps} />
+      <TinaEditProvider editMode={<TinaProvider>{children}</TinaProvider>}>
+        {children}
       </TinaEditProvider>
     </>
   )
 }
 
-export default App
+export default DynamicTina
 `;
 
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/script-helpers.ts
+function generateGqlScript(scriptValue) {
+  return `tinacms server:start -c "${scriptValue}"`;
+}
+function extendNextScripts(scripts) {
+  return __spreadProps(__spreadValues({}, scripts), {
+    dev: generateGqlScript(scripts.dev || "next dev"),
+    build: generateGqlScript(scripts.build || "next build"),
+    start: generateGqlScript(scripts.start || "next start")
+  });
+}
+
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
-var import_chalk2 = __toModule(require("chalk"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
   return new Promise((resolve2, _reject) => {
@@ -1030,26 +1231,32 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
-var TinaWrapperPathDir = import_path4.default.join(baseDir, "components");
-var TinaWrapperPath = import_path4.default.join(TinaWrapperPathDir, "tina-wrapper.tsx");
-var blogContentPath = import_path4.default.join(baseDir, "content", "posts");
-var blogPostPath = import_path4.default.join(blogContentPath, "HelloWorld.md");
-async function tinaSetup(ctx, next, options) {
-  const useingSrc = import_fs_extra3.default.pathExistsSync(import_path4.default.join(baseDir, "src"));
-  if (!import_fs_extra3.default.pathExistsSync(blogPostPath)) {
+var blogContentPath = import_path5.default.join(baseDir, "content", "posts");
+var blogPostPath = import_path5.default.join(blogContentPath, "HelloWorld.md");
+var TinaFolder = import_path5.default.join(baseDir, ".tina");
+var componentFolder = import_path5.default.join(TinaFolder, "components");
+var TinaProviderPath = import_path5.default.join(componentFolder, "TinaProvider.js");
+var TinaDynamicProvider = import_path5.default.join(componentFolder, "TinaDynamicProvider.js");
+async function tinaSetup(_ctx, next, _options) {
+  const useingSrc = import_fs_extra4.default.pathExistsSync(import_path5.default.join(baseDir, "src"));
+  if (!import_fs_extra4.default.pathExistsSync(blogPostPath)) {
     logger.info(logText("Adding a content folder..."));
-    import_fs_extra3.default.mkdirpSync(blogContentPath);
-    import_fs_extra3.default.writeFileSync(blogPostPath, blogPost);
+    import_fs_extra4.default.mkdirpSync(blogContentPath);
+    import_fs_extra4.default.writeFileSync(blogPostPath, blogPost);
+  }
+  if (!import_fs_extra4.default.existsSync(TinaProviderPath) && !import_fs_extra4.default.existsSync(TinaDynamicProvider)) {
+    import_fs_extra4.default.mkdirpSync(componentFolder);
+    import_fs_extra4.default.writeFileSync(TinaProviderPath, TinaProvider);
+    import_fs_extra4.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
   }
   logger.level = "info";
-  const pagesPath = import_path4.default.join(baseDir, useingSrc ? "src" : "", "pages");
-  const appPath = import_path4.default.join(pagesPath, "_app.js");
-  const appPathTS = import_path4.default.join(pagesPath, "_app.tsx");
-  const appExtension = import_fs_extra3.default.existsSync(appPath) ? ".js" : ".tsx";
-  let wrapper = false;
-  if (!import_fs_extra3.default.pathExistsSync(appPath) && !import_fs_extra3.default.pathExistsSync(appPathTS)) {
+  const pagesPath = import_path5.default.join(baseDir, useingSrc ? "src" : "", "pages");
+  const appPath = import_path5.default.join(pagesPath, "_app.js");
+  const appPathTS = import_path5.default.join(pagesPath, "_app.tsx");
+  const appExtension = import_fs_extra4.default.existsSync(appPath) ? ".js" : ".tsx";
+  if (!import_fs_extra4.default.pathExistsSync(appPath) && !import_fs_extra4.default.pathExistsSync(appPathTS)) {
     logger.info(logText("Adding _app.js ... \u2705"));
-    import_fs_extra3.default.writeFileSync(appPath, AppJsContent());
+    import_fs_extra4.default.writeFileSync(appPath, AppJsContent(useingSrc));
   } else {
     const override = await (0, import_prompts.default)({
       name: "res",
@@ -1058,49 +1265,44 @@ async function tinaSetup(ctx, next, options) {
     });
     if (override.res) {
       logger.info(logText(`Adding _app${appExtension} ... \u2705`));
-      const appPathWithExtension = import_path4.default.join(pagesPath, `_app${appExtension}`);
-      const fileContent = import_fs_extra3.default.pathExistsSync(appPath) ? (0, import_fs_extra3.readFileSync)(appPath) : (0, import_fs_extra3.readFileSync)(appPathTS);
+      const appPathWithExtension = import_path5.default.join(pagesPath, `_app${appExtension}`);
+      const fileContent = import_fs_extra4.default.pathExistsSync(appPath) ? (0, import_fs_extra4.readFileSync)(appPath) : (0, import_fs_extra4.readFileSync)(appPathTS);
       const matches = [
         ...fileContent.toString().matchAll(/^.*import.*\.css("|').*$/gm)
       ];
       const primaryMatches = matches.map((x) => x[0]);
-      import_fs_extra3.default.writeFileSync(appPathWithExtension, AppJsContent(primaryMatches.join("\n")));
+      import_fs_extra4.default.writeFileSync(appPathWithExtension, AppJsContent(useingSrc, primaryMatches.join("\n")));
     } else {
-      wrapper = true;
       logger.info(dangerText(`Heads up, to enable live-editing you'll need to wrap your page or site in Tina:
-`, warnText(AppJsContent())));
+`, warnText(AppJsContent(useingSrc))));
     }
   }
-  const tinaBlogPagePath = import_path4.default.join(pagesPath, "demo", "blog");
-  const tinaBlogPagePathFile = import_path4.default.join(tinaBlogPagePath, "[filename].js");
-  if (!import_fs_extra3.default.pathExistsSync(tinaBlogPagePathFile)) {
-    import_fs_extra3.default.mkdirpSync(tinaBlogPagePath);
-    import_fs_extra3.default.writeFileSync(tinaBlogPagePathFile, nextPostPage());
+  const tinaBlogPagePath = import_path5.default.join(pagesPath, "demo", "blog");
+  const tinaBlogPagePathFile = import_path5.default.join(tinaBlogPagePath, "[filename].js");
+  if (!import_fs_extra4.default.pathExistsSync(tinaBlogPagePathFile)) {
+    import_fs_extra4.default.mkdirpSync(tinaBlogPagePath);
+    import_fs_extra4.default.writeFileSync(tinaBlogPagePathFile, nextPostPage());
   }
   logger.info("Adding a content folder... \u2705");
-  const packagePath = import_path4.default.join(baseDir, "package.json");
-  const pack = JSON.parse((0, import_fs_extra3.readFileSync)(packagePath).toString());
+  const packagePath = import_path5.default.join(baseDir, "package.json");
+  const pack = JSON.parse((0, import_fs_extra4.readFileSync)(packagePath).toString());
   const oldScripts = pack.scripts || {};
   const newPack = JSON.stringify(__spreadProps(__spreadValues({}, pack), {
-    scripts: __spreadProps(__spreadValues({}, oldScripts), {
-      "tina-dev": 'yarn tinacms server:start -c "next dev"',
-      "tina-build": 'yarn tinacms server:start -c "next build"',
-      "tina-start": 'yarn tinacms server:start -c "next start"'
-    })
+    scripts: extendNextScripts(oldScripts)
   }), null, 2);
-  (0, import_fs_extra3.writeFileSync)(packagePath, newPack);
-  const adminPath = import_path4.default.join(pagesPath, "admin", "[[...tina]].js");
-  if (import_fs_extra3.default.pathExistsSync(import_path4.default.join(pagesPath, "admin"))) {
-    logger.warn(`Unable to add /pages/admin/[[...tina]].js, this path already exists.
+  (0, import_fs_extra4.writeFileSync)(packagePath, newPack);
+  const adminPath = import_path5.default.join(pagesPath, "admin.js");
+  if (import_fs_extra4.default.pathExistsSync(import_path5.default.join(pagesPath, "admin"))) {
+    logger.warn(`Unable to add /pages/admin.js, this path already exists.
 	Learn more about toggling edit-mode at https://tina.io/docs/tinacms-context/#manually-toggling-edit-mode`);
     return next();
   }
-  (0, import_fs_extra3.outputFileSync)(adminPath, adminPage);
+  (0, import_fs_extra4.outputFileSync)(adminPath, adminPage);
   next();
 }
 async function successMessage(ctx, next, options) {
   logger.info(`Tina setup ${import_chalk2.default.underline.green("done")}  \u2705
-	 Start your dev server with ${successText(`yarn tina-dev`)} and go to http://localhost:3000/demo/blog/HelloWorld to ${successText("check it out the page that was created for you")}
+	 Start your dev server with ${successText(`yarn dev`)} and go to http://localhost:3000/demo/blog/HelloWorld to ${successText("check it out the page that was created for you")}
 Enjoy Tina \u{1F999} !
 `);
   next();
@@ -1112,7 +1314,7 @@ var import_datalayer3 = __toModule(require("@tinacms/datalayer"));
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/audit/audit.ts
 var import_graphql8 = __toModule(require("@tinacms/graphql"));
-var import_path5 = __toModule(require("path"));
+var import_path6 = __toModule(require("path"));
 var import_graphql9 = __toModule(require("@tinacms/graphql"));
 var import_chalk3 = __toModule(require("chalk"));
 var auditCollection = async (args) => {
@@ -1150,7 +1352,7 @@ var auditCollection = async (args) => {
       warning = true;
       logger.warn(import_chalk3.default.yellowBright(`WARNING: there is a file with extension \`${node.sys.extension}\` but in your schema it is defined to be \`.${format}\`
 
-location: ${import_path5.default.join(rootPath2, node.sys.path)}`));
+location: ${import_path6.default.join(rootPath2, node.sys.path)}`));
     }
   });
   return warning;
@@ -1186,7 +1388,7 @@ var auditDocuments = async (args) => {
   const documents = result.data.getCollection.documents.edges;
   for (let i = 0; i < documents.length; i++) {
     const node = documents[i].node;
-    const fullPath = import_path5.default.join(rootPath2, node.sys.path);
+    const fullPath = import_path6.default.join(rootPath2, node.sys.path);
     logger.info(`Checking document: ${fullPath}`);
     const documentQuery = `query {
         getDocument(collection: "${collection.name}", relativePath: "${node.sys.relativePath}") {
@@ -1383,7 +1585,7 @@ var noSDKCodegenOption = {
 };
 var cleanOption = {
   name: "--clean",
-  description: "Submit gql mutation to all files to git rid of any data that is not defined in the `schema.ts`"
+  description: "Updates all content files to remove any data not explicitly permitted by the current schema definition"
 };
 var useDefaultValuesOption = {
   name: "--useDefaultValues",
@@ -1393,6 +1595,10 @@ var noTelemetryOption = {
   name: "--noTelemetry",
   description: "Disable anonymous telemetry that is collected"
 };
+var watchFileOption = {
+  name: "-w, --watchFolders [folders...]",
+  description: "a list of folders (relative to where this is being run) that the cli will watch for changes"
+};
 var baseCmds = [
   {
     command: CMD_START_SERVER,
@@ -1403,7 +1609,8 @@ var baseCmds = [
       experimentalDatalayer,
       noWatchOption,
       noSDKCodegenOption,
-      noTelemetryOption
+      noTelemetryOption,
+      watchFileOption
     ],
     action: (options) => chain([startServer], options)
   },

package/dist/lib/getSchemaPath.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 getSchemaPath: ({ projectDir }: {
+    projectDir: string;
+}) => any;

package/dist/lib/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 './getSchemaPath';

package/dist/utils/script-helpers.d.ts

@@ -0,0 +1,19 @@
+/**
+
+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 function generateGqlScript(scriptValue: any): string;
+export declare function extendNextScripts(scripts: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.5",
+  "version": "0.60.8",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.50.6",
+    "@tinacms/scripts": "0.50.7",
     "@types/clear": "0.1.0",
     "@types/cors": "2.8.5",
     "@types/express": "^4.17.7",
@@ -38,7 +38,8 @@
     "@types/progress": "^2.0.3",
     "@types/prompts": "^2.0.13",
     "@types/yup": "^0.29.11",
-    "jest": "^27.0.6"
+    "jest": "^27.0.6",
+    "typescript": "^4.3.5"
   },
   "scripts": {
     "build": "echo \"Run `yarn build` from the root of the repository instead\"",
@@ -57,8 +58,10 @@
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
     "@tinacms/datalayer": "0.0.2",
-    "@tinacms/graphql": "0.59.6",
+    "@tinacms/graphql": "0.59.7",
     "@tinacms/metrics": "0.0.2",
+    "@yarnpkg/esbuild-plugin-pnp": "^2.0.1-rc.3",
+    "add": "^2.0.6",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",
@@ -66,8 +69,9 @@
     "body-parser": "^1.19.0",
     "chalk": "^2.4.2",
     "chokidar": "^3.5.1",
-    "commander": "5.1.0",
+    "commander": "^9.0.0",
     "cors": "^2.8.5",
+    "esbuild": "^0.14.20",
     "esm": "3.2.25",
     "express": "^4.17.1",
     "fast-glob": "^3.2.4",
@@ -80,7 +84,7 @@
     "normalize-path": "^3.0.0",
     "progress": "^2.0.3",
     "prompts": "^2.4.1",
-    "typescript": "^4.3.5",
+    "yarn": "^1.22.17",
     "yup": "^0.32.9"
   },
   "publishConfig": {