npm - @tinacms/cli - Versions diffs - 1.5.18 → 1.5.20 - Mend

@tinacms/cli 1.5.18 → 1.5.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.js +145 -116
package/dist/next/commands/dev-command/index.d.ts +1 -0
package/dist/next/config-manager.d.ts +8 -1
package/dist/next/vite/tailwind.d.ts +1 -1
package/package.json +6 -6

package/dist/index.js CHANGED Viewed

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 // package.json
-var version = "1.5.18";
+var version = "1.5.20";
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -270,10 +270,13 @@ var ConfigManager = class {
         await import_fs_extra.default.outputFile(this.generatedClientJSFilePath, file);
       }
     }
-    this.config = await this.loadConfigFile(
+    const { config: config3, prebuildPath, watchList } = await this.loadConfigFile(
       this.generatedFolderPath,
       this.tinaConfigFilePath
     );
+    this.watchList = watchList;
+    this.config = config3;
+    this.prebuildFilePath = prebuildPath;
     this.publicFolderPath = import_path.default.join(
       this.rootPath,
       this.config.build.publicFolder
@@ -361,6 +364,9 @@ var ConfigManager = class {
     }
     throw `No path provided to print`;
   }
+  printPrebuildFilePath() {
+    return this.prebuildFilePath.replace(/\\/g, "/").replace(`${this.rootPath}/${this.tinaFolderPath}/`, "");
+  }
   printContentRelativePath(filename) {
     if (filename) {
       return filename.replace(/\\/g, "/").replace(`${this.contentRootPath}/`, "");
@@ -400,14 +406,36 @@ var ConfigManager = class {
   }
   async loadConfigFile(generatedFolderPath, configFilePath) {
     const tmpdir = import_path.default.join(import_os.default.tmpdir(), Date.now().toString());
+    const prebuild = import_path.default.join(this.generatedFolderPath, "config.prebuild.jsx");
     const outfile = import_path.default.join(tmpdir, "config.build.jsx");
     const outfile2 = import_path.default.join(tmpdir, "config.build.js");
     const tempTSConfigFile = import_path.default.join(tmpdir, "tsconfig.json");
     await import_fs_extra.default.outputFileSync(tempTSConfigFile, "{}");
+    const result2 = await esbuild.build({
+      entryPoints: [configFilePath],
+      bundle: true,
+      target: ["es2020"],
+      platform: "browser",
+      format: "esm",
+      logLevel: "silent",
+      external: ["tinacms", "react", "react-dom", "next"],
+      ignoreAnnotations: true,
+      outfile: prebuild,
+      loader: loaders,
+      metafile: true
+    });
+    const flattenedList = [];
+    Object.keys(result2.metafile.inputs).forEach((key) => {
+      if (key.includes("node_modules") || key.includes("__generated__")) {
+        return;
+      }
+      flattenedList.push(key);
+    });
     await esbuild.build({
       entryPoints: [configFilePath],
       bundle: true,
       target: ["es2020"],
+      logLevel: "silent",
       platform: "node",
       outfile,
       loader: loaders
@@ -415,6 +443,7 @@ var ConfigManager = class {
     await esbuild.build({
       entryPoints: [outfile],
       bundle: true,
+      logLevel: "silent",
       platform: "node",
       outfile: outfile2,
       loader: loaders
@@ -422,7 +451,11 @@ var ConfigManager = class {
     const result = require(outfile2);
     await import_fs_extra.default.removeSync(outfile);
     await import_fs_extra.default.removeSync(outfile2);
-    return result.default;
+    return {
+      config: result.default,
+      prebuildPath: prebuild,
+      watchList: flattenedList
+    };
   }
 };
 var loaders = {
@@ -527,6 +560,23 @@ var devHTML = (port) => `<!DOCTYPE html>
   </body>
 </html>`;
+// src/utils/theme.ts
+var import_chalk3 = __toESM(require("chalk"));
+var successText = import_chalk3.default.bold.green;
+var focusText = import_chalk3.default.bold;
+var dangerText = import_chalk3.default.bold.red;
+var neutralText = import_chalk3.default.bold.cyan;
+var linkText = import_chalk3.default.bold.cyan;
+var labelText = import_chalk3.default.bold;
+var cmdText = import_chalk3.default.inverse;
+var indentedCmd = (str) => {
+  return `  \u2503 ` + str;
+};
+var logText = import_chalk3.default.italic.gray;
+var warnText = import_chalk3.default.yellowBright.bgBlack;
+var titleText = import_chalk3.default.bgHex("d2f1f8").hex("ec4816");
+var CONFIRMATION_TEXT = import_chalk3.default.dim("enter to confirm");
 // src/next/commands/dev-command/server/index.ts
 var import_vite3 = require("vite");
@@ -541,17 +591,16 @@ var import_postcss_nested = __toESM(require("postcss-nested/index.js"));
 var import_nesting = __toESM(require("tailwindcss/nesting/index.js"));
 var import_defaultTheme = __toESM(require("tailwindcss/defaultTheme.js"));
 var import_typography = __toESM(require("@tailwindcss/typography"));
-var import_line_clamp = __toESM(require("@tailwindcss/line-clamp"));
 var import_aspect_ratio = __toESM(require("@tailwindcss/aspect-ratio"));
 var import_path2 = __toESM(require("path"));
-var tinaTailwind = (spaPath, configFilePath) => {
+var tinaTailwind = (spaPath, prebuildFilePath) => {
   return {
     name: "vite-plugin-tina",
     config: (viteConfig) => {
       const plugins = [];
       const content2 = [
         import_path2.default.join(spaPath, "src/**/*.{vue,js,ts,jsx,tsx,svelte}"),
-        import_path2.default.join(configFilePath, "../**/*.{vue,js,ts,jsx,tsx,svelte}")
+        prebuildFilePath
       ];
       const tw = (0, import_tailwindcss.default)({
         important: ".tina-tailwind",
@@ -770,7 +819,6 @@ var tinaTailwind = (spaPath, configFilePath) => {
         content: content2,
         plugins: [
           (0, import_typography.default)({ className: "tina-prose" }),
-          import_line_clamp.default,
           import_aspect_ratio.default
         ]
       });
@@ -817,7 +865,7 @@ var createConfig = async ({
     }
   });
   const alias = {
-    TINA_IMPORT: configManager.tinaConfigFilePath,
+    TINA_IMPORT: configManager.prebuildFilePath,
     SCHEMA_IMPORT: configManager.generatedGraphQLJSONPath
   };
   if (configManager.shouldSkipSDK()) {
@@ -859,7 +907,11 @@ var createConfig = async ({
       host: (_c = (_b = (_a = configManager.config) == null ? void 0 : _a.build) == null ? void 0 : _b.host) != null ? _c : false,
       watch: noWatch ? {
         ignored: ["**/*"]
-      } : void 0,
+      } : {
+        ignored: [
+          `${configManager.tinaFolderPath}/**/!(config.prebuild.jsx|_graphql.json)`
+        ]
+      },
       fs: {
         strict: false
       }
@@ -871,9 +923,13 @@ var createConfig = async ({
       rollupOptions
     },
     plugins: [
-      (0, import_plugin_react.default)(),
+      (0, import_plugin_react.default)({
+        babel: {
+          compact: true
+        }
+      }),
       (0, import_vite.splitVendorChunkPlugin)(),
-      tinaTailwind(configManager.spaRootPath, configManager.tinaConfigFilePath),
+      tinaTailwind(configManager.spaRootPath, configManager.prebuildFilePath),
       ...plugins
     ]
   };
@@ -1055,6 +1111,7 @@ var createSearchIndexRouter = ({
   const put = async (req, res) => {
     const { docs } = req.body;
     const result = await searchIndex.PUT(docs);
+    res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ result }));
   };
   const get = async (req, res) => {
@@ -1070,6 +1127,7 @@ var createSearchIndexRouter = ({
         ...JSON.parse(optionsParam)
       };
     }
+    res.writeHead(200, { "Content-Type": "application/json" });
     if (query) {
       const result = await searchIndex.QUERY(JSON.parse(query), options);
       res.end(JSON.stringify(result));
@@ -1081,6 +1139,7 @@ var createSearchIndexRouter = ({
     const requestURL = new URL(req.url, config3.apiURL);
     const docId = requestURL.pathname.split("/").filter(Boolean).slice(1).join("/");
     const result = await searchIndex.DELETE(docId);
+    res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ result }));
   };
   return { del, get, put };
@@ -1698,25 +1757,6 @@ var import_chalk4 = __toESM(require("chalk"));
 // src/utils/start-subprocess.ts
 var import_child_process = __toESM(require("child_process"));
-// src/utils/theme.ts
-var import_chalk3 = __toESM(require("chalk"));
-var successText = import_chalk3.default.bold.green;
-var focusText = import_chalk3.default.bold;
-var dangerText = import_chalk3.default.bold.red;
-var neutralText = import_chalk3.default.bold.cyan;
-var linkText = import_chalk3.default.bold.cyan;
-var labelText = import_chalk3.default.bold;
-var cmdText = import_chalk3.default.inverse;
-var indentedCmd = (str) => {
-  return `  \u2503 ` + str;
-};
-var logText = import_chalk3.default.italic.gray;
-var warnText = import_chalk3.default.yellowBright.bgBlack;
-var titleText = import_chalk3.default.bgHex("d2f1f8").hex("ec4816");
-var CONFIRMATION_TEXT = import_chalk3.default.dim("enter to confirm");
-// src/utils/start-subprocess.ts
 var startSubprocess2 = async ({ command }) => {
   if (typeof command === "string") {
     const commands = command.split(" ");
@@ -1877,7 +1917,6 @@ var BaseCommand = class extends import_clipanion.Command {
 };
 // src/next/commands/dev-command/index.ts
-var import_memory_level2 = require("memory-level");
 var import_search = require("@tinacms/search");
 var DevCommand = class extends BaseCommand {
   constructor() {
@@ -1888,6 +1927,9 @@ var DevCommand = class extends BaseCommand {
     this.noWatch = import_clipanion2.Option.Boolean("--noWatch", false, {
       description: "Don't regenerate config on file changes"
     });
+    this.outputSearchIndexPath = import_clipanion2.Option.String("--outputSearchIndexPath", {
+      description: "Path to write the search index to"
+    });
   }
   async catch(error) {
     logger.error("Error occured during tinacms dev");
@@ -1903,7 +1945,7 @@ var DevCommand = class extends BaseCommand {
     }
   }
   async execute() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const configManager = new ConfigManager({
       rootPath: this.rootPath,
       legacyNoSDK: this.noSDK
@@ -1915,63 +1957,70 @@ var DevCommand = class extends BaseCommand {
     const setup = async ({ firstTime }) => {
       try {
         await configManager.processConfig();
+        if (firstTime) {
+          database = await createAndInitializeDatabase(
+            configManager,
+            Number(this.datalayerPort)
+          );
+        } else {
+          database.clearCache();
+        }
+        const { tinaSchema: tinaSchema2, graphQLSchema: graphQLSchema2, lookup, queryDoc, fragDoc } = await (0, import_graphql8.buildSchema)(configManager.config);
+        const codegen2 = new Codegen({
+          isLocal: true,
+          configManager,
+          port: Number(this.port),
+          queryDoc,
+          fragDoc,
+          graphqlSchemaDoc: graphQLSchema2,
+          tinaSchema: tinaSchema2,
+          lookup
+        });
+        const apiURL2 = await codegen2.execute();
+        if (!configManager.isUsingLegacyFolder) {
+          delete require.cache[configManager.generatedSchemaJSONPath];
+          delete require.cache[configManager.generatedLookupJSONPath];
+          delete require.cache[configManager.generatedGraphQLJSONPath];
+          const schemaObject = require(configManager.generatedSchemaJSONPath);
+          const lookupObject = require(configManager.generatedLookupJSONPath);
+          const graphqlSchemaObject = require(configManager.generatedGraphQLJSONPath);
+          await import_fs_extra4.default.writeFileSync(
+            import_path7.default.join(configManager.tinaFolderPath, "tina-lock.json"),
+            JSON.stringify({
+              schema: schemaObject,
+              lookup: lookupObject,
+              graphql: graphqlSchemaObject
+            })
+          );
+        }
+        if (!this.noWatch) {
+          this.watchQueries(configManager, async () => await codegen2.execute());
+        }
+        await this.indexContentWithSpinner({
+          database,
+          graphQLSchema: graphQLSchema2,
+          tinaSchema: tinaSchema2
+        });
+        if (!firstTime) {
+          logger.error("Re-index complete");
+        }
+        return { apiURL: apiURL2, database, graphQLSchema: graphQLSchema2, tinaSchema: tinaSchema2 };
       } catch (e) {
-        logger.error(e.message);
+        logger.error(dangerText(e.message));
         if (this.verbose) {
           console.error(e);
         }
         if (firstTime) {
           logger.error(
-            "Unable to start dev server, please fix your Tina config and try again"
+            warnText(
+              "Unable to start dev server, please fix your Tina config and try again"
+            )
           );
           process.exit(1);
+        } else {
+          logger.error(warnText("Dev server has not been restarted"));
         }
       }
-      if (firstTime) {
-        database = await createAndInitializeDatabase(
-          configManager,
-          Number(this.datalayerPort)
-        );
-      } else {
-        database.clearCache();
-      }
-      const { tinaSchema: tinaSchema2, graphQLSchema: graphQLSchema2, lookup, queryDoc, fragDoc } = await (0, import_graphql8.buildSchema)(configManager.config);
-      const codegen2 = new Codegen({
-        isLocal: true,
-        configManager,
-        port: Number(this.port),
-        queryDoc,
-        fragDoc,
-        graphqlSchemaDoc: graphQLSchema2,
-        tinaSchema: tinaSchema2,
-        lookup
-      });
-      const apiURL2 = await codegen2.execute();
-      if (!configManager.isUsingLegacyFolder) {
-        delete require.cache[configManager.generatedSchemaJSONPath];
-        delete require.cache[configManager.generatedLookupJSONPath];
-        delete require.cache[configManager.generatedGraphQLJSONPath];
-        const schemaObject = require(configManager.generatedSchemaJSONPath);
-        const lookupObject = require(configManager.generatedLookupJSONPath);
-        const graphqlSchemaObject = require(configManager.generatedGraphQLJSONPath);
-        await import_fs_extra4.default.writeFileSync(
-          import_path7.default.join(configManager.tinaFolderPath, "tina-lock.json"),
-          JSON.stringify({
-            schema: schemaObject,
-            lookup: lookupObject,
-            graphql: graphqlSchemaObject
-          })
-        );
-      }
-      if (!this.noWatch) {
-        this.watchQueries(configManager, async () => await codegen2.execute());
-      }
-      await this.indexContentWithSpinner({
-        database,
-        graphQLSchema: graphQLSchema2,
-        tinaSchema: tinaSchema2
-      });
-      return { apiURL: apiURL2, database, graphQLSchema: graphQLSchema2, tinaSchema: tinaSchema2 };
     };
     const { apiURL, graphQLSchema, tinaSchema } = await setup({
       firstTime: true
@@ -1981,39 +2030,28 @@ var DevCommand = class extends BaseCommand {
       configManager.outputGitignorePath,
       "index.html\nassets/"
     );
-    const searchIndex = await (0, import_search.si)({
-      db: new import_memory_level2.MemoryLevel(),
-      stopwords: (0, import_search.lookupStopwords)(
-        (_b = (_a = configManager.config.search) == null ? void 0 : _a.tina) == null ? void 0 : _b.stopwordLanguages
-      )
+    const searchIndexClient = new import_search.LocalSearchIndexClient({
+      stopwordLanguages: (_b = (_a = configManager.config.search) == null ? void 0 : _a.tina) == null ? void 0 : _b.stopwordLanguages,
+      tokenSplitRegex: (_d = (_c = configManager.config.search) == null ? void 0 : _c.tina) == null ? void 0 : _d.tokenSplitRegex
     });
-    const searchIndexClient = new import_search.LocalSearchIndexClient(searchIndex);
+    await searchIndexClient.onStartIndexing();
     const server = await createDevServer(
       configManager,
       database,
-      searchIndex,
+      searchIndexClient.searchIndex,
       apiURL,
       this.noWatch
     );
     await server.listen(Number(this.port));
     const searchIndexer = new import_search.SearchIndexer({
-      batchSize: ((_c = configManager.config.search) == null ? void 0 : _c.indexBatchSize) || 100,
+      batchSize: ((_e = configManager.config.search) == null ? void 0 : _e.indexBatchSize) || 100,
       bridge: new import_graphql8.FilesystemBridge(
         configManager.rootPath,
         configManager.contentRootPath
       ),
       schema: tinaSchema,
       client: searchIndexClient,
-      textIndexLength: ((_d = configManager.config.search) == null ? void 0 : _d.maxSearchIndexFieldLength) || 100
-    });
-    await spin({
-      waitFor: async () => {
-        const res = await database.indexContent({
-          graphQLSchema,
-          tinaSchema
-        });
-      },
-      text: "Indexing local files"
+      textIndexLength: ((_f = configManager.config.search) == null ? void 0 : _f.maxSearchIndexFieldLength) || 100
     });
     if (configManager.config.search) {
       await spin({
@@ -2022,6 +2060,9 @@ var DevCommand = class extends BaseCommand {
         },
         text: "Building search index"
       });
+      if (this.outputSearchIndexPath) {
+        await searchIndexClient.export(this.outputSearchIndexPath);
+      }
     }
     if (!this.noWatch) {
       this.watchContentFiles(
@@ -2029,24 +2070,12 @@ var DevCommand = class extends BaseCommand {
         database,
         configManager.config.search && searchIndexer
       );
-    }
-    server.watcher.on("change", async (changedPath) => {
-      if (changedPath.includes("__generated__")) {
-        return;
-      }
-      if (changedPath.includes("@tinacms/app")) {
-        return;
-      }
-      if (changedPath.includes("tinacms/dist")) {
-        return;
-      }
-      try {
-        logger.info("Tina config updated");
+      import_chokidar.default.watch(configManager.watchList).on("change", async () => {
+        logger.info(`Tina config change detected, rebuilding`);
         await setup({ firstTime: false });
-      } catch (e) {
-        logger.error(e.message);
-      }
-    });
+        server.ws.send({ type: "full-reload", path: "*" });
+      });
+    }
     const subItems = [];
     if (configManager.hasSeparateContentRoot()) {
       subItems.push({
@@ -2272,11 +2301,11 @@ var waitForDB = async (config3, apiUrl, verbose) => {
         await sleepAndCallFunc({ fn: pollForStatus, ms: POLLING_INTERVAL });
       } else if (status === STATUS_FAILED) {
         throw new IndexFailedError(
-          `Attempting to index but responded with status 'failed', To retry the indexing process, click \u201CReset Repository Cache\u201D in tina cloud advance settings.  ${error}`
+          `Attempting to index but responded with status 'failed'. To retry the indexing process, click the "Reindex" button for '${branch}' in the Tina Cloud configuration for this project.  ${error}`
         );
       } else {
         throw new IndexFailedError(
-          `Attempting to index but responded with status 'unknown', To retry the indexing process, click \u201CReset Repository Cache\u201D in tina cloud advance settings.  ${error}`
+          `Attempting to index but responded with status 'unknown'. To retry the indexing process, click the "Reindex" button for '${branch}' in the Tina Cloud configuration for this project.  ${error}`
         );
       }
     } catch (e) {

package/dist/next/commands/dev-command/index.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ export declare class DevCommand extends BaseCommand {
     static paths: string[][];
     watchFolders: string;
     noWatch: boolean;
+    outputSearchIndexPath: string;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;
     logDeprecationWarnings(): void;

package/dist/next/config-manager.d.ts CHANGED Viewed

@@ -32,11 +32,13 @@ export declare class ConfigManager {
     outputHTMLFilePath: string;
     outputGitignorePath: string;
     selfHostedDatabaseFilePath?: string;
+    prebuildFilePath?: string;
     spaRootPath: string;
     spaMainPath: string;
     spaHTMLPath: string;
     tinaGraphQLVersionFromCLI?: string;
     legacyNoSDK?: boolean;
+    watchList?: string[];
     constructor({ rootPath, tinaGraphQLVersion, legacyNoSDK, }: {
         rootPath: string;
         tinaGraphQLVersion?: string;
@@ -53,13 +55,18 @@ export declare class ConfigManager {
     printGeneratedTypesFilePath(): string;
     printoutputHTMLFilePath(): string;
     printRelativePath(filename: string): string;
+    printPrebuildFilePath(): string;
     printContentRelativePath(filename: string): string;
     /**
      * Given a filepath without an extension, find the first match (eg. tsx, ts, jsx, js)
      */
     getPathWithExtension(filepath: string): Promise<any>;
     loadDatabaseFile(): Promise<any>;
-    loadConfigFile(generatedFolderPath: string, configFilePath: string): Promise<any>;
+    loadConfigFile(generatedFolderPath: string, configFilePath: string): Promise<{
+        config: any;
+        prebuildPath: string;
+        watchList: any[];
+    }>;
 }
 export declare const loaders: {
     [ext: string]: Loader;

package/dist/next/vite/tailwind.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
 import { Plugin } from 'vite';
-export declare const tinaTailwind: (spaPath: string, configFilePath: any) => Plugin;
+export declare const tinaTailwind: (spaPath: string, prebuildFilePath: string) => Plugin;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.18",
+  "version": "1.5.20",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,12 +58,12 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.16",
-    "@tinacms/datalayer": "1.2.16",
-    "@tinacms/graphql": "1.4.16",
+    "@tinacms/app": "1.2.18",
+    "@tinacms/datalayer": "1.2.18",
+    "@tinacms/graphql": "1.4.18",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.5",
-    "@tinacms/search": "1.0.1",
+    "@tinacms/schema-tools": "1.4.7",
+    "@tinacms/search": "1.0.3",
     "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",