@tinacms/cli 0.60.6 → 0.60.7

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # tinacms-cli
 
+## 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

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/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.6";
+var version = "0.60.7";
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
@@ -402,7 +402,7 @@ 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: [
@@ -429,6 +429,43 @@ 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
@@ -1098,41 +1135,58 @@ 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/cmds/init/index.ts
-var import_chalk2 = __toModule(require("chalk"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
   return new Promise((resolve2, _reject) => {
@@ -1165,26 +1219,32 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
-var TinaWrapperPathDir = import_path5.default.join(baseDir, "components");
-var TinaWrapperPath = import_path5.default.join(TinaWrapperPathDir, "tina-wrapper.tsx");
 var blogContentPath = import_path5.default.join(baseDir, "content", "posts");
 var blogPostPath = import_path5.default.join(blogContentPath, "HelloWorld.md");
-async function tinaSetup(ctx, next, options) {
+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_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_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";
-  let wrapper = false;
   if (!import_fs_extra4.default.pathExistsSync(appPath) && !import_fs_extra4.default.pathExistsSync(appPathTS)) {
     logger.info(logText("Adding _app.js ... \u2705"));
-    import_fs_extra4.default.writeFileSync(appPath, AppJsContent());
+    import_fs_extra4.default.writeFileSync(appPath, AppJsContent(useingSrc));
   } else {
     const override = await (0, import_prompts.default)({
       name: "res",
@@ -1199,11 +1259,10 @@ async function tinaSetup(ctx, next, options) {
         ...fileContent.toString().matchAll(/^.*import.*\.css("|').*$/gm)
       ];
       const primaryMatches = matches.map((x) => x[0]);
-      import_fs_extra4.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_path5.default.join(pagesPath, "demo", "blog");
@@ -1224,9 +1283,9 @@ async function tinaSetup(ctx, next, options) {
     })
   }), null, 2);
   (0, import_fs_extra4.writeFileSync)(packagePath, newPack);
-  const adminPath = import_path5.default.join(pagesPath, "admin", "[[...tina]].js");
+  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/[[...tina]].js, this path already exists.
+    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();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.60.6",
+  "version": "0.60.7",
   "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",