@tinacms/cli 0.0.0-b54b303-20241210232138 → 0.0.0-b551232-20250318064010

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.
@@ -150,7 +150,7 @@ export declare const parseSections: ({ val }: {
150
150
  }) => {
151
151
  sections?: {
152
152
  exclude?: string;
153
- type?: "heading" | "document" | "directory" | "jekyll-pages" | "jekyll-posts";
153
+ type?: "document" | "heading" | "directory" | "jekyll-pages" | "jekyll-posts";
154
154
  match?: string;
155
155
  path?: string;
156
156
  templates?: string[];
package/dist/index.js CHANGED
@@ -17,23 +17,28 @@ var __copyProps = (to, from, except, desc) => {
17
17
  return to;
18
18
  };
19
19
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ // If the importer is in node compatibility mode or this is not an ESM
21
+ // file that has been converted to a CommonJS file using a Babel-
22
+ // compatible transform (i.e. "__esModule" has not been set), then set
23
+ // "default" to the CommonJS "module.exports" for node compatibility.
20
24
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
25
  mod
22
26
  ));
23
27
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
28
 
25
29
  // src/index.ts
26
- var src_exports = {};
27
- __export(src_exports, {
28
- default: () => src_default
30
+ var index_exports = {};
31
+ __export(index_exports, {
32
+ default: () => index_default
29
33
  });
30
- module.exports = __toCommonJS(src_exports);
34
+ module.exports = __toCommonJS(index_exports);
31
35
  var import_clipanion8 = require("clipanion");
32
36
 
33
37
  // package.json
34
- var version = "1.6.13";
38
+ var version = "1.9.3";
35
39
 
36
40
  // src/next/commands/dev-command/index.ts
41
+ var import_async_lock = __toESM(require("async-lock"));
37
42
  var import_clipanion2 = require("clipanion");
38
43
  var import_fs_extra6 = __toESM(require("fs-extra"));
39
44
  var import_path5 = __toESM(require("path"));
@@ -57,7 +62,10 @@ function isUnicodeSupported() {
57
62
  if (process.platform !== "win32") {
58
63
  return process.env.TERM !== "linux";
59
64
  }
60
- return Boolean(process.env.CI) || Boolean(process.env.WT_SESSION) || Boolean(process.env.TERMINUS_SUBLIME) || process.env.ConEmuTask === "{cmd::Cmder}" || process.env.TERM_PROGRAM === "Terminus-Sublime" || process.env.TERM_PROGRAM === "vscode" || process.env.TERM === "xterm-256color" || process.env.TERM === "alacritty" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
65
+ return Boolean(process.env.CI) || Boolean(process.env.WT_SESSION) || // Windows Terminal
66
+ Boolean(process.env.TERMINUS_SUBLIME) || // Terminus (<0.2.27)
67
+ process.env.ConEmuTask === "{cmd::Cmder}" || // ConEmu and cmder
68
+ process.env.TERM_PROGRAM === "Terminus-Sublime" || process.env.TERM_PROGRAM === "vscode" || process.env.TERM === "xterm-256color" || process.env.TERM === "alacritty" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
61
69
  }
62
70
 
63
71
  // src/logger/index.ts
@@ -212,7 +220,7 @@ var ConfigManager = class {
212
220
  this.generatedCachePath = import_path.default.join(
213
221
  this.generatedFolderPath,
214
222
  ".cache",
215
- String(new Date().getTime())
223
+ String((/* @__PURE__ */ new Date()).getTime())
216
224
  );
217
225
  this.generatedGraphQLGQLPath = import_path.default.join(
218
226
  this.generatedFolderPath,
@@ -355,17 +363,22 @@ var ConfigManager = class {
355
363
  );
356
364
  }
357
365
  getTinaGraphQLVersion() {
358
- var _a, _b;
359
366
  if (this.tinaGraphQLVersionFromCLI) {
360
- return this.tinaGraphQLVersionFromCLI;
367
+ const version2 = this.tinaGraphQLVersionFromCLI.split(".");
368
+ return {
369
+ fullVersion: this.tinaGraphQLVersionFromCLI,
370
+ major: version2[0] || "x",
371
+ minor: version2[1] || "x",
372
+ patch: version2[2] || "x"
373
+ };
361
374
  }
362
375
  const generatedSchema = import_fs_extra.default.readJSONSync(this.generatedSchemaJSONPath);
363
- if (!generatedSchema || !(typeof (generatedSchema == null ? void 0 : generatedSchema.version) !== "undefined") || !(typeof ((_a = generatedSchema == null ? void 0 : generatedSchema.version) == null ? void 0 : _a.major) === "string") || !(typeof ((_b = generatedSchema == null ? void 0 : generatedSchema.version) == null ? void 0 : _b.minor) === "string")) {
376
+ if (!generatedSchema || !(typeof (generatedSchema == null ? void 0 : generatedSchema.version) !== "undefined")) {
364
377
  throw new Error(
365
378
  `Can not find Tina GraphQL version in ${this.generatedSchemaJSONPath}`
366
379
  );
367
380
  }
368
- return `${generatedSchema.version.major}.${generatedSchema.version.minor}`;
381
+ return generatedSchema.version;
369
382
  }
370
383
  printGeneratedClientFilePath() {
371
384
  if (this.isUsingTs()) {
@@ -394,6 +407,9 @@ var ConfigManager = class {
394
407
  }
395
408
  throw `No path provided to print`;
396
409
  }
410
+ /**
411
+ * Given a filepath without an extension, find the first match (eg. tsx, ts, jsx, js)
412
+ */
397
413
  async getPathWithExtension(filepath) {
398
414
  const extensions = ["tsx", "ts", "jsx", "js"];
399
415
  let result;
@@ -427,7 +443,10 @@ var ConfigManager = class {
427
443
  }
428
444
  async loadConfigFile(generatedFolderPath, configFilePath) {
429
445
  const tmpdir = import_path.default.join(import_os.default.tmpdir(), Date.now().toString());
430
- const prebuild = import_path.default.join(this.generatedFolderPath, "config.prebuild.jsx");
446
+ const preBuildConfigPath = import_path.default.join(
447
+ this.generatedFolderPath,
448
+ "config.prebuild.jsx"
449
+ );
431
450
  const outfile = import_path.default.join(tmpdir, "config.build.jsx");
432
451
  const outfile2 = import_path.default.join(tmpdir, "config.build.js");
433
452
  const tempTSConfigFile = import_path.default.join(tmpdir, "tsconfig.json");
@@ -441,7 +460,7 @@ var ConfigManager = class {
441
460
  logLevel: "silent",
442
461
  packages: "external",
443
462
  ignoreAnnotations: true,
444
- outfile: prebuild,
463
+ outfile: preBuildConfigPath,
445
464
  loader: loaders,
446
465
  metafile: true
447
466
  });
@@ -464,6 +483,7 @@ var ConfigManager = class {
464
483
  await esbuild.build({
465
484
  entryPoints: [outfile],
466
485
  bundle: true,
486
+ // Suppress warning about comparison with -0 from client module
467
487
  logLevel: "silent",
468
488
  platform: "node",
469
489
  outfile: outfile2,
@@ -481,7 +501,7 @@ var ConfigManager = class {
481
501
  import_fs_extra.default.removeSync(outfile2);
482
502
  return {
483
503
  config: result.default,
484
- prebuildPath: prebuild,
504
+ prebuildPath: preBuildConfigPath,
485
505
  watchList: flattenedList
486
506
  };
487
507
  }
@@ -570,19 +590,19 @@ var devHTML = (port) => `<!DOCTYPE html>
570
590
  window.$RefreshReg$ = () => {}
571
591
  window.$RefreshSig$ = () => (type) => type
572
592
  window.__vite_plugin_react_preamble_installed__ = true
573
- <\/script>
574
- <script type="module" src="http://localhost:${port}/@vite/client"><\/script>
593
+ </script>
594
+ <script type="module" src="http://localhost:${port}/@vite/client"></script>
575
595
  <script>
576
596
  function handleLoadError() {
577
597
  // Assets have failed to load
578
598
  document.getElementById('root').innerHTML = '${errorHTML}';
579
599
  }
580
- <\/script>
600
+ </script>
581
601
  <script
582
602
  type="module"
583
603
  src="http://localhost:${port}/src/main.tsx"
584
604
  onerror="handleLoadError()"
585
- ><\/script>
605
+ ></script>
586
606
  <body class="tina-tailwind">
587
607
  <div id="root"></div>
588
608
  </body>
@@ -628,6 +648,7 @@ var import_defaultTheme = __toESM(require("tailwindcss/defaultTheme.js"));
628
648
  var tinaTailwind = (spaPath, prebuildFilePath) => {
629
649
  return {
630
650
  name: "vite-plugin-tina",
651
+ // @ts-ignore
631
652
  config: (viteConfig) => {
632
653
  const plugins = [];
633
654
  const content = [
@@ -939,7 +960,6 @@ async function listFilesRecursively({
939
960
  }
940
961
  var createConfig = async ({
941
962
  configManager,
942
- database,
943
963
  apiURL,
944
964
  plugins = [],
945
965
  noWatch,
@@ -999,6 +1019,8 @@ var createConfig = async ({
999
1019
  if (configManager.config.build.basePath) {
1000
1020
  basePath = configManager.config.build.basePath;
1001
1021
  }
1022
+ const fullVersion = configManager.getTinaGraphQLVersion();
1023
+ const version2 = `${fullVersion.major}.${fullVersion.minor}`;
1002
1024
  const config2 = {
1003
1025
  root: configManager.spaRootPath,
1004
1026
  base: `/${basePath ? `${(0, import_normalize_path2.default)(basePath)}/` : ""}${(0, import_normalize_path2.default)(
@@ -1010,15 +1032,33 @@ var createConfig = async ({
1010
1032
  dedupe: ["graphql", "tinacms", "react", "react-dom", "react-router-dom"]
1011
1033
  },
1012
1034
  define: {
1035
+ /**
1036
+ * Since we prebuild the config.ts, it's possible for modules to be loaded which make
1037
+ * use of `process`. The main scenario where this is an issue is when co-locating schema
1038
+ * definitions with source files, and specifically source files which impor from NextJS.
1039
+ *
1040
+ * Some examples of what NextJS uses for `process.env` are:
1041
+ * - `process.env.__NEXT_TRAILING_SLASH`
1042
+ * - `process.env.__NEXT_CROSS_ORIGIN`
1043
+ * - `process.env.__NEXT_I18N_SUPPORT`
1044
+ *
1045
+ * Also, interestingly some of the advice for handling this doesn't work, references to replacing
1046
+ * `process.env` with `{}` are problematic, because browsers don't understand the `{}.` syntax,
1047
+ * but node does. This was a surprise, but using `new Object()` seems to do the trick.
1048
+ */
1013
1049
  "process.env": `new Object(${JSON.stringify(publicEnv)})`,
1050
+ // Used by picomatch https://github.com/micromatch/picomatch/blob/master/lib/utils.js#L4
1014
1051
  "process.platform": `"${process.platform}"`,
1015
1052
  __API_URL__: `"${apiURL}"`,
1016
1053
  __BASE_PATH__: `"${((_e = (_d = configManager.config) == null ? void 0 : _d.build) == null ? void 0 : _e.basePath) || ""}"`,
1017
- __TINA_GRAPHQL_VERSION__: `"${configManager.getTinaGraphQLVersion()}"`
1054
+ __TINA_GRAPHQL_VERSION__: version2
1018
1055
  },
1019
1056
  logLevel: "error",
1057
+ // Vite import warnings are noisy
1020
1058
  optimizeDeps: {
1021
1059
  force: true,
1060
+ // Not 100% sure why this isn't being picked up automatically, this works from within the monorepo
1061
+ // but breaks externally
1022
1062
  include: ["react/jsx-runtime", "react/jsx-dev-runtime"]
1023
1063
  },
1024
1064
  server: {
@@ -1026,6 +1066,7 @@ var createConfig = async ({
1026
1066
  watch: noWatch ? {
1027
1067
  ignored: ["**/*"]
1028
1068
  } : {
1069
+ // Ignore everything except for the alias fields we specified above
1029
1070
  ignored: [
1030
1071
  `${configManager.tinaFolderPath}/**/!(config.prebuild.jsx|_graphql.json)`
1031
1072
  ]
@@ -1041,8 +1082,13 @@ var createConfig = async ({
1041
1082
  rollupOptions
1042
1083
  },
1043
1084
  plugins: [
1085
+ /**
1086
+ * `splitVendorChunkPlugin` is needed because `tinacms` is quite large,
1087
+ * Vite's chunking strategy chokes on memory issues for smaller machines (ie. on CI).
1088
+ */
1044
1089
  (0, import_plugin_react.default)({
1045
1090
  babel: {
1091
+ // Supresses the warning [NOTE] babel The code generator has deoptimised the styling of
1046
1092
  compact: true
1047
1093
  }
1048
1094
  }),
@@ -1119,8 +1165,7 @@ var createMediaRouter = (config2) => {
1119
1165
  };
1120
1166
  var parseMediaFolder = (str) => {
1121
1167
  let returnString = str;
1122
- if (returnString.startsWith("/"))
1123
- returnString = returnString.substr(1);
1168
+ if (returnString.startsWith("/")) returnString = returnString.substr(1);
1124
1169
  if (returnString.endsWith("/"))
1125
1170
  returnString = returnString.substr(0, returnString.length - 1);
1126
1171
  return returnString;
@@ -1137,7 +1182,7 @@ var MediaModel = class {
1137
1182
  this.rootPath,
1138
1183
  this.publicFolder,
1139
1184
  this.mediaRoot,
1140
- args.searchPath
1185
+ decodeURIComponent(args.searchPath)
1141
1186
  );
1142
1187
  const searchPath = parseMediaFolder(args.searchPath);
1143
1188
  if (!await import_fs_extra3.default.pathExists(folderPath)) {
@@ -1209,7 +1254,7 @@ var MediaModel = class {
1209
1254
  this.rootPath,
1210
1255
  this.publicFolder,
1211
1256
  this.mediaRoot,
1212
- args.searchPath
1257
+ decodeURIComponent(args.searchPath)
1213
1258
  );
1214
1259
  await import_fs_extra3.default.stat(file);
1215
1260
  await import_fs_extra3.default.remove(file);
@@ -1285,7 +1330,8 @@ var devServerEndPointsPlugin = ({
1285
1330
  configManager,
1286
1331
  apiURL,
1287
1332
  database,
1288
- searchIndex
1333
+ searchIndex,
1334
+ databaseLock
1289
1335
  }) => {
1290
1336
  const plug = {
1291
1337
  name: "graphql-endpoints",
@@ -1329,14 +1375,17 @@ var devServerEndPointsPlugin = ({
1329
1375
  }
1330
1376
  if (req.url === "/graphql") {
1331
1377
  const { query, variables } = req.body;
1332
- const result = await (0, import_graphql.resolve)({
1333
- config: {
1334
- useRelativeMedia: true
1335
- },
1336
- database,
1337
- query,
1338
- variables,
1339
- verbose: false
1378
+ let result;
1379
+ await databaseLock(async () => {
1380
+ result = await (0, import_graphql.resolve)({
1381
+ config: {
1382
+ useRelativeMedia: true
1383
+ },
1384
+ database,
1385
+ query,
1386
+ variables,
1387
+ verbose: false
1388
+ });
1340
1389
  });
1341
1390
  res.end(JSON.stringify(result));
1342
1391
  return;
@@ -1387,6 +1436,7 @@ function viteTransformExtension({
1387
1436
  return {
1388
1437
  code: res.code,
1389
1438
  map: null
1439
+ // TODO:
1390
1440
  };
1391
1441
  }
1392
1442
  }
@@ -1394,10 +1444,16 @@ function viteTransformExtension({
1394
1444
  }
1395
1445
 
1396
1446
  // src/next/commands/dev-command/server/index.ts
1397
- var createDevServer = async (configManager, database, searchIndex, apiURL, noWatch) => {
1447
+ var createDevServer = async (configManager, database, searchIndex, apiURL, noWatch, databaseLock) => {
1398
1448
  const plugins = [
1399
1449
  transformTsxPlugin({ configManager }),
1400
- devServerEndPointsPlugin({ apiURL, configManager, database, searchIndex }),
1450
+ devServerEndPointsPlugin({
1451
+ apiURL,
1452
+ configManager,
1453
+ database,
1454
+ searchIndex,
1455
+ databaseLock
1456
+ }),
1401
1457
  viteTransformExtension()
1402
1458
  ];
1403
1459
  return (0, import_vite3.createServer)(
@@ -1407,6 +1463,14 @@ var createDevServer = async (configManager, database, searchIndex, apiURL, noWat
1407
1463
  apiURL,
1408
1464
  plugins,
1409
1465
  noWatch,
1466
+ /**
1467
+ * Ensure Vite's import scan uses the spaMainPath as the input
1468
+ * so it properly finds everything. This is for dev only, and when
1469
+ * running the server outside of this monorepo vite fails to find
1470
+ * and optimize the imports, so you get errors about it not being
1471
+ * able to find an export from a module, and it's always a CJS
1472
+ * module that Vite would usually transform to an ES module.
1473
+ */
1410
1474
  rollupOptions: {
1411
1475
  input: configManager.spaMainPath,
1412
1476
  onwarn(warning, warn) {
@@ -1532,6 +1596,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
1532
1596
  node,
1533
1597
  documentVariableName,
1534
1598
  operationType,
1599
+ // This is the only line that is different
1535
1600
  operationResultType: `{data: ${operationResultType}, errors?: { message: string, locations: { line: number, column: number }[], path: string[] }[], variables: ${operationVariablesTypes}, query: string}`,
1536
1601
  operationVariablesTypes
1537
1602
  });
@@ -1580,6 +1645,8 @@ var plugin = (schema, documents, config2) => {
1580
1645
  const visitor = new GenericSdkVisitor(schema, allFragments, config2);
1581
1646
  const visitorResult = (0, import_graphql3.visit)(allAst, { leave: visitor });
1582
1647
  return {
1648
+ // We will take care of imports
1649
+ // prepend: visitor.getImports(),
1583
1650
  content: [
1584
1651
  visitor.fragments,
1585
1652
  ...visitorResult.definitions.filter((t) => typeof t === "string"),
@@ -1595,6 +1662,7 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
1595
1662
  docs = await loadGraphQLDocuments(queryPathGlob);
1596
1663
  fragDocs = await loadGraphQLDocuments(fragDocPath);
1597
1664
  const res = await (0, import_core.codegen)({
1665
+ // Filename is not used. This is because the typescript plugin returns a string instead of writing to a file.
1598
1666
  filename: process.cwd(),
1599
1667
  schema: (0, import_graphql5.parse)((0, import_graphql5.printSchema)(schema)),
1600
1668
  documents: [...docs, ...fragDocs],
@@ -1629,9 +1697,12 @@ var loadGraphQLDocuments = async (globPath) => {
1629
1697
  loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
1630
1698
  });
1631
1699
  } catch (e) {
1632
- if ((e.message || "").includes(
1633
- "Unable to find any GraphQL type definitions for the following pointers:"
1634
- )) {
1700
+ if (
1701
+ // https://www.graphql-tools.com/docs/documents-loading#no-files-found
1702
+ (e.message || "").includes(
1703
+ "Unable to find any GraphQL type definitions for the following pointers:"
1704
+ )
1705
+ ) {
1635
1706
  } else {
1636
1707
  throw e;
1637
1708
  }
@@ -1668,7 +1739,10 @@ var Codegen = class {
1668
1739
  this.noClientBuildCache = noClientBuildCache;
1669
1740
  }
1670
1741
  async writeConfigFile(fileName, data) {
1671
- const filePath = import_path4.default.join(this.configManager.generatedFolderPath, fileName);
1742
+ const filePath = import_path4.default.join(
1743
+ this.configManager.generatedFolderPath,
1744
+ fileName
1745
+ );
1672
1746
  await import_fs_extra4.default.ensureFile(filePath);
1673
1747
  await import_fs_extra4.default.outputFile(filePath, data);
1674
1748
  if (this.configManager.hasSeparateContentRoot()) {
@@ -1788,16 +1862,14 @@ var Codegen = class {
1788
1862
  const branch = (_a = this.configManager.config) == null ? void 0 : _a.branch;
1789
1863
  const clientId = (_b = this.configManager.config) == null ? void 0 : _b.clientId;
1790
1864
  const token = (_c = this.configManager.config) == null ? void 0 : _c.token;
1791
- const version2 = this.configManager.getTinaGraphQLVersion();
1865
+ const fullVersion = this.configManager.getTinaGraphQLVersion();
1866
+ const version2 = `${fullVersion.major}.${fullVersion.minor}`;
1792
1867
  const baseUrl = ((_d = this.configManager.config.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://${TINA_HOST}`;
1793
1868
  if ((!branch || !clientId || !token) && !this.port && !this.configManager.config.contentApiUrlOverride) {
1794
1869
  const missing = [];
1795
- if (!branch)
1796
- missing.push("branch");
1797
- if (!clientId)
1798
- missing.push("clientId");
1799
- if (!token)
1800
- missing.push("token");
1870
+ if (!branch) missing.push("branch");
1871
+ if (!clientId) missing.push("clientId");
1872
+ if (!token) missing.push("token");
1801
1873
  throw new Error(
1802
1874
  `Client not configured properly. Missing ${missing.join(
1803
1875
  ", "
@@ -1951,7 +2023,11 @@ schema {
1951
2023
  }
1952
2024
  };
1953
2025
  var maybeWarnFragmentSize = async (filepath) => {
1954
- if ((await import_fs_extra4.default.stat(filepath)).size > 100 * 1024) {
2026
+ if (
2027
+ // is the file bigger than 100kb?
2028
+ (await import_fs_extra4.default.stat(filepath)).size > // convert to 100 kb to bytes
2029
+ 100 * 1024
2030
+ ) {
1955
2031
  console.warn(
1956
2032
  "Warning: frags.gql is very large (>100kb). Consider setting the reference depth to 1 or 0. See code snippet below."
1957
2033
  );
@@ -1979,6 +2055,7 @@ var import_many_level = require("many-level");
1979
2055
  var import_memory_level = require("memory-level");
1980
2056
  var createDBServer = (port) => {
1981
2057
  const levelHost = new import_many_level.ManyLevelHost(
2058
+ // @ts-ignore
1982
2059
  new import_memory_level.MemoryLevel({
1983
2060
  valueEncoding: "json"
1984
2061
  })
@@ -2129,7 +2206,9 @@ var BaseCommand = class extends import_clipanion.Command {
2129
2206
  let subProc;
2130
2207
  if (this.subCommand) {
2131
2208
  subProc = await startSubprocess2({ command: this.subCommand });
2132
- logger.info(`Starting subprocess: ${import_chalk4.default.cyan(this.subCommand)}`);
2209
+ logger.info(
2210
+ `Running web application with command: ${import_chalk4.default.cyan(this.subCommand)}`
2211
+ );
2133
2212
  }
2134
2213
  function exitHandler(options, exitCode) {
2135
2214
  if (subProc) {
@@ -2253,6 +2332,7 @@ var import_search = require("@tinacms/search");
2253
2332
  var DevCommand = class extends BaseCommand {
2254
2333
  constructor() {
2255
2334
  super(...arguments);
2335
+ // NOTE: camelCase commands for string options don't work if there's an `=` used https://github.com/arcanis/clipanion/issues/141
2256
2336
  this.watchFolders = import_clipanion2.Option.String("-w,--watchFolders", {
2257
2337
  description: "DEPRECATED - a list of folders (relative to where this is being run) that the cli will watch for changes"
2258
2338
  });
@@ -2262,6 +2342,10 @@ var DevCommand = class extends BaseCommand {
2262
2342
  this.outputSearchIndexPath = import_clipanion2.Option.String("--outputSearchIndexPath", {
2263
2343
  description: "Path to write the search index to"
2264
2344
  });
2345
+ this.noServer = import_clipanion2.Option.Boolean("--no-server", false, {
2346
+ description: "Do not start the dev server"
2347
+ });
2348
+ this.indexingLock = new import_async_lock.default();
2265
2349
  }
2266
2350
  async catch(error) {
2267
2351
  logger.error("Error occured during tinacms dev");
@@ -2282,10 +2366,13 @@ var DevCommand = class extends BaseCommand {
2282
2366
  rootPath: this.rootPath,
2283
2367
  legacyNoSDK: this.noSDK
2284
2368
  });
2285
- logger.info("Starting Tina Dev Server");
2369
+ logger.info("\u{1F999} TinaCMS Dev Server is initializing...");
2286
2370
  this.logDeprecationWarnings();
2287
2371
  createDBServer(Number(this.datalayerPort));
2288
2372
  let database = null;
2373
+ const dbLock = async (fn) => {
2374
+ return this.indexingLock.acquire("Key", fn);
2375
+ };
2289
2376
  const setup = async ({ firstTime }) => {
2290
2377
  try {
2291
2378
  await configManager.processConfig();
@@ -2336,9 +2423,6 @@ var DevCommand = class extends BaseCommand {
2336
2423
  await import_fs_extra6.default.outputFile(filePath, tinaLockContent);
2337
2424
  }
2338
2425
  }
2339
- if (!this.noWatch) {
2340
- this.watchQueries(configManager, async () => await codegen2.execute());
2341
- }
2342
2426
  await this.indexContentWithSpinner({
2343
2427
  database,
2344
2428
  graphQLSchema: graphQLSchema2,
@@ -2348,6 +2432,13 @@ var DevCommand = class extends BaseCommand {
2348
2432
  if (!firstTime) {
2349
2433
  logger.error("Re-index complete");
2350
2434
  }
2435
+ if (!this.noWatch) {
2436
+ this.watchQueries(
2437
+ configManager,
2438
+ dbLock,
2439
+ async () => await codegen2.execute()
2440
+ );
2441
+ }
2351
2442
  return { apiURL: apiURL2, database, graphQLSchema: graphQLSchema2, tinaSchema: tinaSchema2 };
2352
2443
  } catch (e) {
2353
2444
  logger.error(`
@@ -2382,14 +2473,6 @@ ${dangerText(e.message)}
2382
2473
  tokenSplitRegex: (_d = (_c = configManager.config.search) == null ? void 0 : _c.tina) == null ? void 0 : _d.tokenSplitRegex
2383
2474
  });
2384
2475
  await searchIndexClient.onStartIndexing();
2385
- const server = await createDevServer(
2386
- configManager,
2387
- database,
2388
- searchIndexClient.searchIndex,
2389
- apiURL,
2390
- this.noWatch
2391
- );
2392
- await server.listen(Number(this.port));
2393
2476
  const searchIndexer = new import_search.SearchIndexer({
2394
2477
  batchSize: ((_e = configManager.config.search) == null ? void 0 : _e.indexBatchSize) || 100,
2395
2478
  bridge: new import_graphql10.FilesystemBridge(
@@ -2411,16 +2494,34 @@ ${dangerText(e.message)}
2411
2494
  await searchIndexClient.export(this.outputSearchIndexPath);
2412
2495
  }
2413
2496
  }
2497
+ if (this.noServer) {
2498
+ logger.info("--no-server option specified - Dev server not started");
2499
+ process.exit(0);
2500
+ }
2414
2501
  if (!this.noWatch) {
2415
2502
  this.watchContentFiles(
2416
2503
  configManager,
2417
2504
  database,
2505
+ dbLock,
2418
2506
  configManager.config.search && searchIndexer
2419
2507
  );
2508
+ }
2509
+ const server = await createDevServer(
2510
+ configManager,
2511
+ database,
2512
+ searchIndexClient.searchIndex,
2513
+ apiURL,
2514
+ this.noWatch,
2515
+ dbLock
2516
+ );
2517
+ await server.listen(Number(this.port));
2518
+ if (!this.noWatch) {
2420
2519
  import_chokidar.default.watch(configManager.watchList).on("change", async () => {
2421
- logger.info(`Tina config change detected, rebuilding`);
2422
- await setup({ firstTime: false });
2423
- server.ws.send({ type: "full-reload", path: "*" });
2520
+ await dbLock(async () => {
2521
+ logger.info(`Tina config change detected, rebuilding`);
2522
+ await setup({ firstTime: false });
2523
+ server.ws.send({ type: "full-reload", path: "*" });
2524
+ });
2424
2525
  });
2425
2526
  }
2426
2527
  const subItems = [];
@@ -2433,7 +2534,7 @@ ${dangerText(e.message)}
2433
2534
  const summaryItems = [
2434
2535
  {
2435
2536
  emoji: "\u{1F999}",
2436
- heading: "Tina Config",
2537
+ heading: "TinaCMS URLs",
2437
2538
  subItems: [
2438
2539
  {
2439
2540
  key: "CMS",
@@ -2468,14 +2569,28 @@ ${dangerText(e.message)}
2468
2569
  });
2469
2570
  }
2470
2571
  summary({
2471
- heading: "Tina Dev Server is running...",
2572
+ heading: "\u2705 \u{1F999} TinaCMS Dev Server is active:",
2472
2573
  items: [
2473
2574
  ...summaryItems
2575
+ // {
2576
+ // emoji: '📚',
2577
+ // heading: 'Useful links',
2578
+ // subItems: [
2579
+ // {
2580
+ // key: 'Custom queries',
2581
+ // value: 'https://tina.io/querying',
2582
+ // },
2583
+ // {
2584
+ // key: 'Visual editing',
2585
+ // value: 'https://tina.io/visual-editing',
2586
+ // },
2587
+ // ],
2588
+ // },
2474
2589
  ]
2475
2590
  });
2476
2591
  await this.startSubCommand();
2477
2592
  }
2478
- watchContentFiles(configManager, database, searchIndexer) {
2593
+ watchContentFiles(configManager, database, databaseLock, searchIndexer) {
2479
2594
  const collectionContentFiles = [];
2480
2595
  configManager.config.schema.collections.forEach((collection) => {
2481
2596
  const collectionGlob = `${import_path5.default.join(
@@ -2491,39 +2606,42 @@ ${dangerText(e.message)}
2491
2606
  if (!ready) {
2492
2607
  return;
2493
2608
  }
2494
- const pathFromRoot = configManager.printContentRelativePath(addedFile);
2495
- await database.indexContentByPaths([pathFromRoot]).catch(console.error);
2496
- if (searchIndexer) {
2497
- await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
2498
- }
2609
+ await databaseLock(async () => {
2610
+ const pathFromRoot = configManager.printContentRelativePath(addedFile);
2611
+ await database.indexContentByPaths([pathFromRoot]).catch(console.error);
2612
+ if (searchIndexer) {
2613
+ await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
2614
+ }
2615
+ });
2499
2616
  }).on("change", async (changedFile) => {
2500
2617
  const pathFromRoot = configManager.printContentRelativePath(changedFile);
2501
- await database.indexContentByPaths([pathFromRoot]).catch(console.error);
2502
- if (searchIndexer) {
2503
- await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
2504
- }
2618
+ await databaseLock(async () => {
2619
+ await database.indexContentByPaths([pathFromRoot]).catch(console.error);
2620
+ if (searchIndexer) {
2621
+ await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
2622
+ }
2623
+ });
2505
2624
  }).on("unlink", async (removedFile) => {
2506
2625
  const pathFromRoot = configManager.printContentRelativePath(removedFile);
2507
- await database.deleteContentByPaths([pathFromRoot]).catch(console.error);
2508
- if (searchIndexer) {
2509
- await searchIndexer.deleteIndexContent([pathFromRoot]).catch(console.error);
2510
- }
2626
+ await databaseLock(async () => {
2627
+ await database.deleteContentByPaths([pathFromRoot]).catch(console.error);
2628
+ if (searchIndexer) {
2629
+ await searchIndexer.deleteIndexContent([pathFromRoot]).catch(console.error);
2630
+ }
2631
+ });
2511
2632
  });
2512
2633
  }
2513
- watchQueries(configManager, callback) {
2514
- let ready = false;
2515
- import_chokidar.default.watch(configManager.userQueriesAndFragmentsGlob).on("ready", () => {
2516
- ready = true;
2517
- }).on("add", async (addedFile) => {
2518
- await callback();
2519
- }).on("change", async (changedFile) => {
2520
- await callback();
2521
- }).on("unlink", async (removedFile) => {
2522
- await callback();
2523
- });
2634
+ watchQueries(configManager, databaseLock, callback) {
2635
+ const executeCallback = async (_) => {
2636
+ await databaseLock(async () => {
2637
+ await callback();
2638
+ });
2639
+ };
2640
+ import_chokidar.default.watch(configManager.userQueriesAndFragmentsGlob).on("add", executeCallback).on("change", executeCallback).on("unlink", executeCallback);
2524
2641
  }
2525
2642
  };
2526
2643
  DevCommand.paths = [["dev"], ["server:start"]];
2644
+ // Prevent indexes and reads occurring at once
2527
2645
  DevCommand.usage = import_clipanion2.Command.Usage({
2528
2646
  category: `Commands`,
2529
2647
  description: `Builds Tina and starts the dev server`,
@@ -2713,6 +2831,9 @@ var BuildCommand = class extends BaseCommand {
2713
2831
  this.tinaGraphQLVersion = import_clipanion3.Option.String("--tina-graphql-version", {
2714
2832
  description: "Specify the version of @tinacms/graphql to use (defaults to latest)"
2715
2833
  });
2834
+ /**
2835
+ * This option allows the user to skip the tina cloud checks if they want to. This could be useful for mismatched GraphQL versions or if they want to build only using the local client and never connect to Tina Cloud
2836
+ */
2716
2837
  this.skipCloudChecks = import_clipanion3.Option.Boolean("--skip-cloud-checks", false, {
2717
2838
  description: "Skips checking the provided cloud config."
2718
2839
  });
@@ -2818,7 +2939,8 @@ ${dangerText(e.message)}
2818
2939
  database,
2819
2940
  null,
2820
2941
  apiURL,
2821
- true
2942
+ true,
2943
+ (lockedFn) => lockedFn()
2822
2944
  );
2823
2945
  await server.listen(Number(this.port));
2824
2946
  console.log("server listening on port", this.port);
@@ -2880,7 +3002,9 @@ ${dangerText(e.message)}
2880
3002
  `ERROR: Branch not configured in tina search configuration.`
2881
3003
  )}`
2882
3004
  );
2883
- throw new Error("Branch not configured in tina search configuration.");
3005
+ throw new Error(
3006
+ "Branch not configured in tina search configuration."
3007
+ );
2884
3008
  }
2885
3009
  if (!((_d = configManager.config) == null ? void 0 : _d.clientId)) {
2886
3010
  logger.error(`${dangerText(`ERROR: clientId not configured.`)}`);
@@ -3023,7 +3147,10 @@ ${dangerText(e.message)}
3023
3147
  });
3024
3148
  throw e;
3025
3149
  }
3026
- const branchBar = new import_progress2.default("Checking branch is on Tina Cloud. :prog", 1);
3150
+ const branchBar = new import_progress2.default(
3151
+ "Checking branch is on Tina Cloud. :prog",
3152
+ 1
3153
+ );
3027
3154
  if (branchKnown) {
3028
3155
  branchBar.tick({
3029
3156
  prog: "\u2705"
@@ -3127,7 +3254,7 @@ ${dangerText(e.message)}
3127
3254
  );
3128
3255
  const { config: config2 } = configManager;
3129
3256
  const token = config2.token;
3130
- const { remoteSchema, remoteVersion } = await fetchRemoteGraphqlSchema({
3257
+ const { remoteSchema, remoteProjectVersion } = await fetchRemoteGraphqlSchema({
3131
3258
  url: apiURL,
3132
3259
  token
3133
3260
  });
@@ -3147,7 +3274,7 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
3147
3274
  const localSchemaDocument = await database.getGraphQLSchemaFromBridge();
3148
3275
  const localGraphqlSchema = (0, import_graphql12.buildASTSchema)(localSchemaDocument);
3149
3276
  try {
3150
- const diffResult = await (0, import_core3.diff)(localGraphqlSchema, remoteGqlSchema);
3277
+ const diffResult = await (0, import_core3.diff)(remoteGqlSchema, localGraphqlSchema);
3151
3278
  if (diffResult.length === 0) {
3152
3279
  bar2.tick({
3153
3280
  prog: "\u2705"
@@ -3160,6 +3287,7 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
3160
3287
  const reason = diffResult[0].message;
3161
3288
  const errorLevel = diffResult[0].criticality.level;
3162
3289
  const faqLink = getFaqLink(type);
3290
+ const tinaGraphQLVersion = configManager.getTinaGraphQLVersion();
3163
3291
  let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to GitHub to update your remote GraphQL schema. ${faqLink && `
3164
3292
  Check out '${faqLink}' for possible solutions.`}`;
3165
3293
  errorMessage += `
@@ -3171,7 +3299,7 @@ Additional info:
3171
3299
  errorMessage += ` Branch: ${config2.branch}, Client ID: ${config2.clientId}
3172
3300
  `;
3173
3301
  }
3174
- errorMessage += ` Local GraphQL version: ${configManager.getTinaGraphQLVersion()} / Remote GraphQL version: ${remoteVersion}
3302
+ errorMessage += ` Local GraphQL version: ${tinaGraphQLVersion.fullVersion} / Remote GraphQL version: ${remoteProjectVersion}
3175
3303
  `;
3176
3304
  errorMessage += ` Last indexed at: ${new Date(
3177
3305
  timestamp
@@ -3203,7 +3331,9 @@ Additional info:
3203
3331
  const { clientId, branch, isLocalClient, host } = (0, import_schema_tools2.parseURL)(apiURL);
3204
3332
  if (isLocalClient || !host || !clientId || !branch) {
3205
3333
  if (verbose) {
3206
- logger.info(logText("Not using Tina Cloud, skipping Tina Schema check"));
3334
+ logger.info(
3335
+ logText("Not using Tina Cloud, skipping Tina Schema check")
3336
+ );
3207
3337
  }
3208
3338
  return;
3209
3339
  }
@@ -3326,7 +3456,8 @@ var fetchRemoteGraphqlSchema = async ({
3326
3456
  const data = await res.json();
3327
3457
  return {
3328
3458
  remoteSchema: data == null ? void 0 : data.data,
3329
- remoteVersion: res.headers.get("tinacms-grapqhl-version")
3459
+ remoteRuntimeVersion: res.headers.get("tinacms-grapqhl-version"),
3460
+ remoteProjectVersion: res.headers.get("tinacms-graphql-project-version")
3330
3461
  };
3331
3462
  };
3332
3463
  var fetchSchemaSha = async ({
@@ -3451,6 +3582,7 @@ var auditDocuments = async (args) => {
3451
3582
  logger.error(import_chalk5.default.red(err.message));
3452
3583
  if (err.originalError.originalError) {
3453
3584
  logger.error(
3585
+ // @ts-ignore FIXME: this doesn't seem right
3454
3586
  import_chalk5.default.red(` ${err.originalError.originalError.message}`)
3455
3587
  );
3456
3588
  }
@@ -3656,7 +3788,9 @@ var detectEnvironment = async ({
3656
3788
  const usingSrc = import_fs_extra8.default.pathExistsSync(import_path7.default.join(baseDir, "src")) && (import_fs_extra8.default.pathExistsSync(import_path7.default.join(baseDir, "src", "app")) || import_fs_extra8.default.pathExistsSync(import_path7.default.join(baseDir, "src", "pages")));
3657
3789
  const tinaFolder = import_path7.default.join(baseDir, "tina");
3658
3790
  const tinaConfigExists = Boolean(
3659
- await import_fs_extra8.default.pathExists(tinaFolder) && (await import_fs_extra8.default.readdir(tinaFolder)).find((x) => x.includes("config"))
3791
+ // Does the tina folder exist?
3792
+ await import_fs_extra8.default.pathExists(tinaFolder) && // Does the tina folder contain a config file?
3793
+ (await import_fs_extra8.default.readdir(tinaFolder)).find((x) => x.includes("config"))
3660
3794
  );
3661
3795
  const pagesDir = [baseDir, usingSrc ? "src" : false, "pages"].filter(
3662
3796
  Boolean
@@ -3891,6 +4025,7 @@ var supportedDatabaseAdapters = {
3891
4025
  {
3892
4026
  from: "mongodb",
3893
4027
  imported: [],
4028
+ // not explicitly imported
3894
4029
  packageName: "mongodb"
3895
4030
  }
3896
4031
  ]
@@ -3963,6 +4098,10 @@ var chooseDatabaseAdapter = async ({
3963
4098
  title: "MongoDB",
3964
4099
  value: "mongodb"
3965
4100
  }
4101
+ // {
4102
+ // title: "I'll create my own database adapter",
4103
+ // value: 'other',
4104
+ // },
3966
4105
  ]
3967
4106
  }
3968
4107
  ]);
@@ -4240,6 +4379,7 @@ async function configure(env, opts) {
4240
4379
  packageManager,
4241
4380
  forestryMigrate: false,
4242
4381
  isLocalEnvVarName: "TINA_PUBLIC_IS_LOCAL",
4382
+ // TODO: give this a better default
4243
4383
  typescript: false
4244
4384
  };
4245
4385
  if (config2.framework.name === "next") {
@@ -4343,15 +4483,25 @@ var import_js_yaml = __toESM(require("js-yaml"));
4343
4483
  var import_zod = __toESM(require("zod"));
4344
4484
 
4345
4485
  // src/cmds/forestry-migrate/util/errorSingleton.ts
4346
- var ErrorSingleton = class {
4486
+ var ErrorSingleton = class _ErrorSingleton {
4487
+ /**
4488
+ * The Singleton's constructor should always be private to prevent direct
4489
+ * construction calls with the `new` operator.
4490
+ */
4347
4491
  constructor() {
4348
4492
  }
4493
+ /**
4494
+ * The static method that controls the access to the singleton instance.
4495
+ *
4496
+ * This implementation let you subclass the Singleton class while keeping
4497
+ * just one instance of each subclass around.
4498
+ */
4349
4499
  static getInstance() {
4350
- if (!ErrorSingleton.instance) {
4351
- ErrorSingleton.instance = new ErrorSingleton();
4352
- ErrorSingleton.instance.collectionNameErrors = [];
4500
+ if (!_ErrorSingleton.instance) {
4501
+ _ErrorSingleton.instance = new _ErrorSingleton();
4502
+ _ErrorSingleton.instance.collectionNameErrors = [];
4353
4503
  }
4354
- return ErrorSingleton.instance;
4504
+ return _ErrorSingleton.instance;
4355
4505
  }
4356
4506
  addErrorName(error) {
4357
4507
  this.collectionNameErrors.push(error);
@@ -4394,8 +4544,7 @@ var makeFieldsWithInternalCode = ({
4394
4544
  if (hasBody) {
4395
4545
  return [bodyField, `__TINA_INTERNAL__:::...${field}():::`];
4396
4546
  } else {
4397
- if (spread)
4398
- return `__TINA_INTERNAL__:::...${field}():::`;
4547
+ if (spread) return `__TINA_INTERNAL__:::...${field}():::`;
4399
4548
  return `__TINA_INTERNAL__:::${field}():::`;
4400
4549
  }
4401
4550
  };
@@ -4479,6 +4628,7 @@ var forestryConfigSchema = import_zod.default.object({
4479
4628
  )
4480
4629
  });
4481
4630
  var forestryFieldWithoutField = import_zod.default.object({
4631
+ // TODO: maybe better type this?
4482
4632
  type: import_zod.default.union([
4483
4633
  import_zod.default.literal("text"),
4484
4634
  import_zod.default.literal("datetime"),
@@ -4502,6 +4652,7 @@ var forestryFieldWithoutField = import_zod.default.object({
4502
4652
  default: import_zod.default.any().optional(),
4503
4653
  template: import_zod.default.string().optional(),
4504
4654
  config: import_zod.default.object({
4655
+ // min and max are used for lists
4505
4656
  min: import_zod.default.number().optional().nullable(),
4506
4657
  max: import_zod.default.number().optional().nullable(),
4507
4658
  required: import_zod.default.boolean().optional().nullable(),
@@ -4515,6 +4666,7 @@ var forestryFieldWithoutField = import_zod.default.object({
4515
4666
  import_zod.default.literal("pages"),
4516
4667
  import_zod.default.literal("documents"),
4517
4668
  import_zod.default.literal("simple"),
4669
+ // TODO: I want to ignore this key if its invalid
4518
4670
  import_zod.default.string()
4519
4671
  ]).optional().nullable(),
4520
4672
  section: import_zod.default.string().optional().nullable()
@@ -4550,6 +4702,7 @@ var transformForestryFieldsToTinaFields = ({
4550
4702
  }
4551
4703
  let field;
4552
4704
  switch (forestryField2.type) {
4705
+ // Single filed types
4553
4706
  case "text":
4554
4707
  field = {
4555
4708
  type: "string",
@@ -4629,6 +4782,7 @@ var transformForestryFieldsToTinaFields = ({
4629
4782
  );
4630
4783
  }
4631
4784
  break;
4785
+ // List Types
4632
4786
  case "list":
4633
4787
  field = {
4634
4788
  type: "string",
@@ -4651,6 +4805,7 @@ var transformForestryFieldsToTinaFields = ({
4651
4805
  }
4652
4806
  };
4653
4807
  break;
4808
+ // Object (Group) types
4654
4809
  case "field_group":
4655
4810
  field = {
4656
4811
  type: "object",
@@ -4691,6 +4846,7 @@ var transformForestryFieldsToTinaFields = ({
4691
4846
  });
4692
4847
  const fieldsString = stringifyLabelWithField(template2.label);
4693
4848
  const t = {
4849
+ // @ts-ignore
4694
4850
  fields: makeFieldsWithInternalCode({
4695
4851
  hasBody: false,
4696
4852
  field: fieldsString
@@ -4699,7 +4855,6 @@ var transformForestryFieldsToTinaFields = ({
4699
4855
  name: stringifyTemplateName(tem, tem)
4700
4856
  };
4701
4857
  if (t.name != tem) {
4702
- ;
4703
4858
  t.nameOverride = tem;
4704
4859
  }
4705
4860
  templates2.push(t);
@@ -4728,6 +4883,7 @@ var transformForestryFieldsToTinaFields = ({
4728
4883
  spread: true
4729
4884
  });
4730
4885
  tinaFields.push(
4886
+ // @ts-ignore
4731
4887
  field2
4732
4888
  );
4733
4889
  break;
@@ -4787,6 +4943,7 @@ var parseSections = ({ val }) => {
4787
4943
 
4788
4944
  // src/cmds/forestry-migrate/index.ts
4789
4945
  var BODY_FIELD = {
4946
+ // This is the body field
4790
4947
  type: "rich-text",
4791
4948
  name: "body",
4792
4949
  label: "Body of Document",
@@ -4845,8 +5002,7 @@ var generateAllTemplates = async ({
4845
5002
  };
4846
5003
  var generateCollectionFromForestrySection = (args) => {
4847
5004
  const { section, templateMap } = args;
4848
- if (section.read_only)
4849
- return;
5005
+ if (section.read_only) return;
4850
5006
  let format3 = "md";
4851
5007
  if (section.new_doc_ext) {
4852
5008
  const ext = checkExt(section.new_doc_ext);
@@ -4913,12 +5069,14 @@ var generateCollectionFromForestrySection = (args) => {
4913
5069
  if (((forestryTemplates == null ? void 0 : forestryTemplates.length) || 0) > 1) {
4914
5070
  c = {
4915
5071
  ...baseCollection,
5072
+ // @ts-expect-error
4916
5073
  templates: forestryTemplates.map((tem) => {
4917
5074
  const currentTemplate = templateMap.get(tem);
4918
5075
  const fieldsString = stringifyLabelWithField(
4919
5076
  currentTemplate.templateObj.label
4920
5077
  );
4921
5078
  return {
5079
+ // fields: [BODY_FIELD],
4922
5080
  fields: makeFieldsWithInternalCode({
4923
5081
  hasBody,
4924
5082
  field: fieldsString,
@@ -4936,6 +5094,8 @@ var generateCollectionFromForestrySection = (args) => {
4936
5094
  const fieldsString = stringifyLabelWithField(template.templateObj.label);
4937
5095
  c = {
4938
5096
  ...baseCollection,
5097
+ // fields: [BODY_FIELD],
5098
+ // @ts-expect-error
4939
5099
  fields: makeFieldsWithInternalCode({
4940
5100
  field: fieldsString,
4941
5101
  hasBody,
@@ -5683,6 +5843,7 @@ var makeImportsVisitor = (sourceFile, importMap) => (ctx) => (node) => {
5683
5843
  ) : [];
5684
5844
  const newImports = [
5685
5845
  .../* @__PURE__ */ new Set([
5846
+ // we use Set to remove duplicates
5686
5847
  ...existingImports,
5687
5848
  ...imports
5688
5849
  ])
@@ -5837,10 +5998,14 @@ var addSelfHostedTinaAuthToConfig = async (config2, configFile) => {
5837
5998
  );
5838
5999
  const { configImports, configAuthProviderClass, extraTinaCollections } = config2.authProvider;
5839
6000
  const importMap = {
5840
- ...configImports.reduce((acc, { from, imported }) => {
5841
- acc[from] = imported;
5842
- return acc;
5843
- }, {})
6001
+ // iterate over configImports and add them to the import map
6002
+ ...configImports.reduce(
6003
+ (acc, { from, imported }) => {
6004
+ acc[from] = imported;
6005
+ return acc;
6006
+ },
6007
+ {}
6008
+ )
5844
6009
  };
5845
6010
  const transformedSourceFileResult = import_typescript3.default.transform(
5846
6011
  sourceFile,
@@ -6011,7 +6176,13 @@ async function apply({
6011
6176
  config: config2
6012
6177
  });
6013
6178
  }
6014
- if (env.tinaConfigExists && params.isBackendInit && config2.hosting === "self-host" && (((_a = config2.authProvider) == null ? void 0 : _a.name) || "") !== "tina-cloud") {
6179
+ if (
6180
+ // if the config was just generated we do not need to update the config file because it will be generated correctly
6181
+ env.tinaConfigExists && // Are we running tinacms init backend
6182
+ params.isBackendInit && // Do the user choose the 'self-host' option
6183
+ config2.hosting === "self-host" && // the user did not choose the 'tina-cloud' auth provider
6184
+ (((_a = config2.authProvider) == null ? void 0 : _a.name) || "") !== "tina-cloud"
6185
+ ) {
6015
6186
  await addSelfHostedTinaAuthToConfig(config2, env.generatedFiles["config"]);
6016
6187
  }
6017
6188
  logNextSteps({
@@ -6289,6 +6460,13 @@ ${titleText(" TinaCMS ")} has been initialized!`));
6289
6460
  logger.info(
6290
6461
  "To get started run: " + cmdText(frameworkDevCmds[framework.name]({ packageManager }))
6291
6462
  );
6463
+ if (framework.name === "hugo") {
6464
+ logger.info(
6465
+ focusText("Hugo is required. "),
6466
+ "Don't have Hugo installed? Follow this guide to set it up: ",
6467
+ linkText("https://gohugo.io/installation/")
6468
+ );
6469
+ }
6292
6470
  logger.info(
6293
6471
  "To get your site production ready, run: " + cmdText(`tinacms init backend`)
6294
6472
  );
@@ -6304,6 +6482,7 @@ var other = ({ packageManager }) => {
6304
6482
  const packageManagers = {
6305
6483
  pnpm: `pnpm`,
6306
6484
  npm: `npx`,
6485
+ // npx is the way to run executables that aren't in your "scripts"
6307
6486
  yarn: `yarn`
6308
6487
  };
6309
6488
  return `${packageManagers[packageManager]} tinacms dev -c "<your dev command>"`;
@@ -6316,6 +6495,7 @@ var frameworkDevCmds = {
6316
6495
  const packageManagers = {
6317
6496
  pnpm: `pnpm`,
6318
6497
  npm: `npm run`,
6498
+ // npx is the way to run executables that aren't in your "scripts"
6319
6499
  yarn: `yarn`
6320
6500
  };
6321
6501
  return `${packageManagers[packageManager]} dev`;
@@ -6572,6 +6752,4 @@ cli.register(SearchIndexCommand);
6572
6752
  cli.register(import_clipanion8.Builtins.DefinitionsCommand);
6573
6753
  cli.register(import_clipanion8.Builtins.HelpCommand);
6574
6754
  cli.register(import_clipanion8.Builtins.VersionCommand);
6575
- var src_default = cli;
6576
- // Annotate the CommonJS export names for ESM import in node:
6577
- 0 && (module.exports = {});
6755
+ var index_default = cli;
@@ -36,7 +36,8 @@ export declare const fetchRemoteGraphqlSchema: ({ url, token, }: {
36
36
  token?: string;
37
37
  }) => Promise<{
38
38
  remoteSchema: any;
39
- remoteVersion: string;
39
+ remoteRuntimeVersion: string;
40
+ remoteProjectVersion: string;
40
41
  }>;
41
42
  export declare const fetchSchemaSha: ({ url, token, }: {
42
43
  url: string;
@@ -1,3 +1,4 @@
1
+ import AsyncLock from 'async-lock';
1
2
  import { Database } from '@tinacms/graphql';
2
3
  import { ConfigManager } from '../../config-manager';
3
4
  import { BaseCommand } from '../baseCommands';
@@ -7,10 +8,12 @@ export declare class DevCommand extends BaseCommand {
7
8
  watchFolders: string;
8
9
  noWatch: boolean;
9
10
  outputSearchIndexPath: string;
11
+ noServer: boolean;
12
+ indexingLock: AsyncLock;
10
13
  static usage: import("clipanion").Usage;
11
14
  catch(error: any): Promise<void>;
12
15
  logDeprecationWarnings(): void;
13
16
  execute(): Promise<number | void>;
14
- watchContentFiles(configManager: ConfigManager, database: Database, searchIndexer?: SearchIndexer): void;
15
- watchQueries(configManager: ConfigManager, callback: () => Promise<string>): void;
17
+ watchContentFiles(configManager: ConfigManager, database: Database, databaseLock: (fn: () => Promise<void>) => Promise<void>, searchIndexer?: SearchIndexer): void;
18
+ watchQueries(configManager: ConfigManager, databaseLock: (fn: () => Promise<void>) => Promise<void>, callback: () => Promise<string>): void;
16
19
  }
@@ -1,3 +1,3 @@
1
1
  import type { Database } from '@tinacms/graphql';
2
2
  import { ConfigManager } from '../../../config-manager';
3
- export declare const createDevServer: (configManager: ConfigManager, database: Database, searchIndex: any, apiURL: string, noWatch: boolean) => Promise<import("vite").ViteDevServer>;
3
+ export declare const createDevServer: (configManager: ConfigManager, database: Database, searchIndex: any, apiURL: string, noWatch: boolean, databaseLock: (fn: () => Promise<void>) => Promise<void>) => Promise<import("vite").ViteDevServer>;
@@ -55,7 +55,12 @@ export declare class ConfigManager {
55
55
  shouldSkipSDK(): boolean;
56
56
  processConfig(): Promise<void>;
57
57
  getTinaFolderPath(rootPath: any): Promise<string>;
58
- getTinaGraphQLVersion(): string;
58
+ getTinaGraphQLVersion(): {
59
+ fullVersion: string;
60
+ major: string;
61
+ minor: string;
62
+ patch: string;
63
+ };
59
64
  printGeneratedClientFilePath(): string;
60
65
  printGeneratedTypesFilePath(): string;
61
66
  printoutputHTMLFilePath(): string;
@@ -22,7 +22,7 @@ interface StaticMediaItem {
22
22
  export interface StaticMedia {
23
23
  [offset: string]: StaticMediaItem[];
24
24
  }
25
- export declare const createConfig: ({ configManager, database, apiURL, plugins, noWatch, rollupOptions, }: {
25
+ export declare const createConfig: ({ configManager, apiURL, plugins, noWatch, rollupOptions, }: {
26
26
  configManager: ConfigManager;
27
27
  database: Database;
28
28
  apiURL: string;
@@ -7,11 +7,12 @@ import type { ConfigManager } from '../config-manager';
7
7
  export declare const transformTsxPlugin: ({ configManager: _configManager, }: {
8
8
  configManager: ConfigManager;
9
9
  }) => Plugin;
10
- export declare const devServerEndPointsPlugin: ({ configManager, apiURL, database, searchIndex, }: {
10
+ export declare const devServerEndPointsPlugin: ({ configManager, apiURL, database, searchIndex, databaseLock, }: {
11
11
  apiURL: string;
12
12
  database: Database;
13
13
  configManager: ConfigManager;
14
14
  searchIndex: any;
15
+ databaseLock: (fn: () => Promise<void>) => Promise<void>;
15
16
  }) => Plugin;
16
17
  export interface ViteSvgrOptions {
17
18
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tinacms/cli",
3
- "version": "0.0.0-b54b303-20241210232138",
3
+ "version": "0.0.0-b551232-20250318064010",
4
4
  "main": "dist/index.js",
5
5
  "typings": "dist/index.d.ts",
6
6
  "files": [
@@ -37,24 +37,25 @@
37
37
  "@types/prompts": "^2.4.9",
38
38
  "@types/yup": "^0.32.0",
39
39
  "jest": "^29.7.0",
40
- "@tinacms/scripts": "1.3.1"
40
+ "@tinacms/scripts": "1.3.3"
41
41
  },
42
42
  "dependencies": {
43
43
  "@graphql-codegen/core": "^2.6.8",
44
44
  "@graphql-codegen/plugin-helpers": "latest",
45
- "@graphql-codegen/typescript": "^4.1.1",
46
- "@graphql-codegen/typescript-operations": "^4.3.1",
45
+ "@graphql-codegen/typescript": "^4.1.3",
46
+ "@graphql-codegen/typescript-operations": "^4.4.1",
47
47
  "@graphql-codegen/visitor-plugin-common": "^4.1.2",
48
48
  "@graphql-inspector/core": "^4.2.2",
49
49
  "@graphql-tools/graphql-file-loader": "^7.5.17",
50
50
  "@graphql-tools/load": "^7.8.14",
51
- "@rollup/pluginutils": "^5.1.3",
51
+ "@rollup/pluginutils": "^5.1.4",
52
52
  "@svgr/core": "8.1.0",
53
53
  "@tailwindcss/aspect-ratio": "^0.4.2",
54
54
  "@tailwindcss/container-queries": "^0.1.1",
55
- "@tailwindcss/typography": "^0.5.15",
55
+ "@tailwindcss/typography": "^0.5.16",
56
56
  "@vitejs/plugin-react": "3.1.0",
57
57
  "altair-express-middleware": "^7.3.6",
58
+ "async-lock": "^1.4.1",
58
59
  "auto-bind": "^4.0.0",
59
60
  "body-parser": "^1.20.3",
60
61
  "busboy": "^1.6.0",
@@ -64,9 +65,9 @@
64
65
  "clipanion": "^3.2.1",
65
66
  "cors": "^2.8.5",
66
67
  "crypto-js": "^4.2.0",
67
- "dotenv": "^16.4.5",
68
- "esbuild": "^0.18.20",
69
- "fs-extra": "^11.2.0",
68
+ "dotenv": "^16.4.7",
69
+ "esbuild": "^0.24.2",
70
+ "fs-extra": "^11.3.0",
70
71
  "graphql": "15.8.0",
71
72
  "js-yaml": "^4.1.0",
72
73
  "log4js": "^6.9.1",
@@ -77,19 +78,19 @@
77
78
  "prettier": "^2.8.8",
78
79
  "progress": "^2.0.3",
79
80
  "prompts": "^2.4.2",
80
- "readable-stream": "^4.5.2",
81
- "tailwindcss": "^3.4.15",
81
+ "readable-stream": "^4.7.0",
82
+ "tailwindcss": "^3.4.17",
82
83
  "typanion": "3.13.0",
83
- "typescript": "^5.6.3",
84
- "vite": "^4.5.5",
85
- "yup": "^1.4.0",
86
- "zod": "^3.23.8",
87
- "@tinacms/app": "0.0.0-b54b303-20241210232138",
88
- "@tinacms/metrics": "1.0.8",
89
- "@tinacms/graphql": "1.5.8",
90
- "@tinacms/search": "1.0.35",
91
- "@tinacms/schema-tools": "1.6.8",
92
- "tinacms": "0.0.0-b54b303-20241210232138"
84
+ "typescript": "^5.7.3",
85
+ "vite": "^4.5.9",
86
+ "yup": "^1.6.1",
87
+ "zod": "^3.24.2",
88
+ "@tinacms/app": "0.0.0-b551232-20250318064010",
89
+ "@tinacms/graphql": "0.0.0-b551232-20250318064010",
90
+ "@tinacms/metrics": "1.0.9",
91
+ "@tinacms/schema-tools": "1.7.2",
92
+ "@tinacms/search": "0.0.0-b551232-20250318064010",
93
+ "tinacms": "0.0.0-b551232-20250318064010"
93
94
  },
94
95
  "publishConfig": {
95
96
  "registry": "https://registry.npmjs.org"