@graphcommerce/cli 6.2.0-canary.9 → 6.2.0-canary.90

package/CHANGELOG.md

@@ -1,5 +1,189 @@
 # @graphcommerce/cli
 
+## 6.2.0-canary.90
+
+### Patch Changes
+
+- [#2034](https://github.com/graphcommerce-org/graphcommerce/pull/2034) [`6fca47484`](https://github.com/graphcommerce-org/graphcommerce/commit/6fca474847fe52f004a6ac0abbd88492512b46ad) - Pre-resolve the customFetch in mesh config ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.89
+
+## 6.2.0-canary.88
+
+## 6.2.0-canary.87
+
+## 6.2.0-canary.86
+
+## 6.2.0-canary.85
+
+## 6.2.0-canary.84
+
+## 6.2.0-canary.83
+
+## 6.2.0-canary.82
+
+## 6.2.0-canary.81
+
+## 6.2.0-canary.80
+
+## 6.2.0-canary.79
+
+## 6.2.0-canary.78
+
+## 6.2.0-canary.77
+
+## 6.2.0-canary.76
+
+## 6.2.0-canary.75
+
+## 6.2.0-canary.74
+
+## 6.2.0-canary.73
+
+## 6.2.0-canary.72
+
+## 6.2.0-canary.71
+
+## 6.2.0-canary.70
+
+## 6.2.0-canary.69
+
+### Patch Changes
+
+- [#2012](https://github.com/graphcommerce-org/graphcommerce/pull/2012) [`1dbb3ae13`](https://github.com/graphcommerce-org/graphcommerce/commit/1dbb3ae13553992ee1ed77f375375560f28c418c) - Upgrade graphql to 16.7.1, add graphql as peer dependency ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 6.2.0-canary.68
+
+## 6.2.0-canary.67
+
+## 6.2.0-canary.66
+
+## 6.2.0-canary.65
+
+## 6.2.0-canary.64
+
+## 6.2.0-canary.63
+
+## 6.2.0-canary.62
+
+## 6.2.0-canary.61
+
+## 6.2.0-canary.60
+
+## 6.2.0-canary.59
+
+## 6.2.0-canary.58
+
+## 6.2.0-canary.57
+
+### Patch Changes
+
+- [#1982](https://github.com/graphcommerce-org/graphcommerce/pull/1982) [`e1fab2f6d`](https://github.com/graphcommerce-org/graphcommerce/commit/e1fab2f6d8f57d0488d8a915596d5c19cb7718e6) - Better detection what the package roots are when a custom node_modules directory is used ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.56
+
+## 6.2.0-canary.55
+
+## 6.2.0-canary.54
+
+## 6.2.0-canary.53
+
+## 6.2.0-canary.52
+
+## 6.2.0-canary.51
+
+## 6.2.0-canary.50
+
+## 6.2.0-canary.49
+
+## 6.2.0-canary.48
+
+## 6.2.0-canary.47
+
+## 6.2.0-canary.46
+
+## 6.2.0-canary.45
+
+## 6.2.0-canary.44
+
+## 6.2.0-canary.43
+
+## 6.2.0-canary.42
+
+## 6.2.0-canary.41
+
+### Patch Changes
+
+- [#1960](https://github.com/graphcommerce-org/graphcommerce/pull/1960) [`f78caf5a8`](https://github.com/graphcommerce-org/graphcommerce/commit/f78caf5a83683f1ae4b901fb94bd22d50943fa2f) - Updated packages @apollo/client, react-hook-form, @emotion/\*, @lingui/\*, @mui/\* and various others. ([@paales](https://github.com/paales))
+
+- [#1960](https://github.com/graphcommerce-org/graphcommerce/pull/1960) [`86e14569b`](https://github.com/graphcommerce-org/graphcommerce/commit/86e14569b1f68f73be7f93b614e36b382c5debff) - Updated to the latest release of GraphQL codegen and solve compatibility issues with our own generator ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.40
+
+## 6.2.0-canary.39
+
+## 6.2.0-canary.38
+
+## 6.2.0-canary.37
+
+## 6.2.0-canary.36
+
+## 6.2.0-canary.35
+
+## 6.2.0-canary.34
+
+## 6.2.0-canary.33
+
+## 6.2.0-canary.32
+
+## 6.2.0-canary.31
+
+## 6.2.0-canary.30
+
+## 6.2.0-canary.29
+
+## 6.2.0-canary.28
+
+## 6.2.0-canary.27
+
+## 6.2.0-canary.26
+
+## 6.2.0-canary.25
+
+## 6.2.0-canary.24
+
+## 6.2.0-canary.23
+
+## 6.2.0-canary.22
+
+## 6.2.0-canary.21
+
+## 6.2.0-canary.20
+
+## 6.2.0-canary.19
+
+## 6.2.0-canary.18
+
+## 6.2.0-canary.17
+
+## 6.2.0-canary.16
+
+## 6.2.0-canary.15
+
+## 6.2.0-canary.14
+
+## 6.2.0-canary.13
+
+### Patch Changes
+
+- [#1924](https://github.com/graphcommerce-org/graphcommerce/pull/1924) [`04581f619`](https://github.com/graphcommerce-org/graphcommerce/commit/04581f619c609f2f6ca5268ee5effb6a1db3f0eb) - Use the latest branch from graphql-mesh so that all versions are in sync ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.12
+
+## 6.2.0-canary.11
+
+## 6.2.0-canary.10
+
 ## 6.2.0-canary.9
 
 ## 6.2.0-canary.8

package/dist/bin/codegen.js

@@ -10,7 +10,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const next_config_1 = require("@graphcommerce/next-config");
 const cli_1 = require("@graphql-codegen/cli");
 const dotenv_1 = __importDefault(require("dotenv"));
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const yaml_1 = __importDefault(require("yaml"));
 const [, , cmd] = process.argv;
 dotenv_1.default.config();
@@ -39,14 +39,19 @@ async function main() {
     if (process.argv.includes('--config') || process.argv.includes('-c')) {
         throw Error('--config or -c argument is not supported, modify codegen.yml to make changes');
     }
-    const packages = [...(0, next_config_1.resolveDependenciesSync)().values()].filter((p) => p !== '.');
-    // Detect if we're operating in the monorepo environment or in an installation
-    const isMono = !!packages.find((p) => p.startsWith('../..'));
+    const deps = (0, next_config_1.resolveDependenciesSync)();
+    const packages = [...deps.values()].filter((p) => p !== '.');
     // Load the current codegen.yml
     // Todo: implement loading with a custom --config or -c here.
     const conf = await (0, cli_1.loadCodegenConfig)({ configFilePath: root });
     // Get a a list of all generates configurations.
-    const generates = Object.entries(conf.config.generates);
+    const generates = Object.entries(conf.config.generates).map(([generatedPath, value]) => {
+        const found = [...deps.entries()].find((dep) => generatedPath.startsWith(`node_modules/${dep[0]}`));
+        if (!found)
+            return [generatedPath, value];
+        const newPath = generatedPath.replace(`node_modules/${found[0]}`, found[1]);
+        return [newPath, value];
+    });
     let extension;
     // Find the file extension used for the generated graphql files and cleanup if not used anymore.
     generates.forEach(([, gen]) => {
@@ -57,13 +62,16 @@ async function main() {
     });
     const isWatching = process.argv.includes('--watch') || process.argv.includes('-w');
     if (!isWatching && extension)
-        (0, rimraf_1.default)(node_path_1.default.join(root, `**/*${extension}`), console.error);
+        await (0, rimraf_1.rimraf)(node_path_1.default.join(root, `**/*${extension}`));
     // - Prepend the all targets with ../../ if we're running in a monorepo setup.
     // - Append all the Graphcommerce packages to the configuration
     conf.config.generates = Object.fromEntries(generates.map(([generateTarget, generateConf]) => [
-        isMono ? `../../${generateTarget}` : generateTarget,
+        generateTarget,
         Array.isArray(generateConf) ? generateConf : appendDocumentLocations(generateConf, packages),
     ]));
+    (0, next_config_1.packageRoots)(packages).forEach((r) => {
+        conf.config.generates[r] = conf.config.generates['.'];
+    });
     // Reexport the mesh to is can be used by codegen
     await promises_1.default.writeFile(configLocation, yaml_1.default.stringify(conf.config));
     // Append the new cli argument

package/dist/bin/graphcommerce.js

@@ -1,20 +1,43 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const hygraph_cli_1 = require("@graphcommerce/hygraph-cli");
-const next_config_1 = require("@graphcommerce/next-config");
 const commands = {
-    'codegen-config': next_config_1.generateConfig,
-    'export-config': next_config_1.exportConfig,
-    'hygraph-migrate': hygraph_cli_1.migrateHygraph,
+    'codegen-config': () => Promise.resolve().then(() => __importStar(require('@graphcommerce/next-config'))).then((m) => m.generateConfig),
+    'export-config': () => Promise.resolve().then(() => __importStar(require('@graphcommerce/next-config'))).then((m) => m.exportConfig),
+    'hygraph-migrate': () => Promise.resolve().then(() => __importStar(require('@graphcommerce/hygraph-cli'))).then((m) => m.migrateHygraph),
 };
 const args = process.argv.slice(2);
 const command = args[0];
-if (!commands[command]) {
+if (!(command in commands)) {
     console.error(`Unknown command: ${args.join(' ')}, possible commands: ${Object.keys(commands).join(', ')}`);
     process.exit(1);
 }
-commands[command]().catch((e) => {
+commands[command]()
+    .then((c) => c())
+    .catch((e) => {
     console.error(e);
     process.exit(1);
 });

package/dist/bin/mesh.js

@@ -49,7 +49,7 @@ async function cleanup() {
 const main = async () => {
     const conf = (await (0, findConfig_1.findConfig)({}));
     // We're configuring a custom fetch function
-    conf.customFetch = '@graphcommerce/graphql-mesh/customFetch';
+    conf.customFetch = require.resolve('@graphcommerce/graphql-mesh/customFetch');
     conf.serve = { ...conf.serve, endpoint: '/api/graphql' };
     // Rewrite additionalResolvers so we can use module resolution more easily
     conf.additionalResolvers = conf.additionalResolvers ?? [];
@@ -70,13 +70,11 @@ const main = async () => {
     });
     // Scan the current working directory to also read all graphqls files.
     conf.additionalTypeDefs.push('**/*.graphqls');
-    if ((0, next_config_1.isMonorepo)()) {
-        conf.additionalTypeDefs.push('../../packages/**/*.graphqls');
-        conf.additionalTypeDefs.push('../../packagesDev/**/*.graphqls');
-    }
-    else {
-        conf.additionalTypeDefs.push('node_modules/@graphcommerce/**/*.graphqls');
-    }
+    const deps = (0, next_config_1.resolveDependenciesSync)();
+    const packages = [...deps.values()].filter((p) => p !== '.');
+    (0, next_config_1.packageRoots)(packages).forEach((r) => {
+        conf.additionalTypeDefs.push(`${r}/**/*.graphqls`);
+    });
     if (!conf.serve)
         conf.serve = {};
     if (!conf.serve.playgroundTitle)

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.2.0-canary.9",
+  "version": "6.2.0-canary.90",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -24,27 +24,28 @@
     "graphcommerce": "dist/bin/graphcommerce.js"
   },
   "dependencies": {
-    "@graphcommerce/next-config": "6.2.0-canary.9",
-    "@graphcommerce/hygraph-cli": "6.2.0-canary.9",
-    "@graphql-codegen/cli": "3.2.2",
-    "@graphql-mesh/cli": "0.82.25",
-    "@graphql-mesh/types": "0.91.7",
-    "@graphql-mesh/utils": "0.43.15",
-    "cosmiconfig": "^8.0.0",
+    "@graphcommerce/hygraph-cli": "6.2.0-canary.90",
+    "@graphcommerce/next-config": "6.2.0-canary.90",
+    "@graphql-codegen/cli": "4.0.1",
+    "@graphql-mesh/cli": "latest",
+    "@graphql-mesh/types": "latest",
+    "@graphql-mesh/utils": "latest",
+    "cosmiconfig": "^8.2.0",
     "detect-package-manager": "^2.0.1",
-    "graphql": "16.6.0",
-    "graphql-codegen-typescript-validation-schema": "^0.7.1",
+    "graphql-codegen-typescript-validation-schema": "^0.11.1",
     "graphql-tag": "^2.12.6",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.1",
     "ts-node": "^10.9.1"
   },
+  "peerDependencies": {
+    "graphql": "^16.7.1"
+  },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "6.2.0-canary.9",
-    "@graphcommerce/prettier-config-pwa": "6.2.0-canary.9",
-    "@graphcommerce/typescript-config-pwa": "6.2.0-canary.9",
-    "@types/rimraf": "^3.0.2",
+    "@graphcommerce/eslint-config-pwa": "6.2.0-canary.90",
+    "@graphcommerce/prettier-config-pwa": "6.2.0-canary.90",
+    "@graphcommerce/typescript-config-pwa": "6.2.0-canary.90",
     "react": "^18.2.0",
-    "typescript": "4.9.5"
+    "typescript": "5.1.3"
   },
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",

package/src/bin/codegen.ts

@@ -2,11 +2,11 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import { resolveDependenciesSync } from '@graphcommerce/next-config'
+import { packageRoots, resolveDependenciesSync } from '@graphcommerce/next-config'
 import { runCli, cliError, loadCodegenConfig } from '@graphql-codegen/cli'
 import { Types } from '@graphql-codegen/plugin-helpers'
 import dotenv from 'dotenv'
-import rimraf from 'rimraf'
+import { rimraf } from 'rimraf'
 import yaml from 'yaml'
 
 const [, , cmd] = process.argv
@@ -44,17 +44,23 @@ async function main() {
     throw Error('--config or -c argument is not supported, modify codegen.yml to make changes')
   }
 
-  const packages = [...resolveDependenciesSync().values()].filter((p) => p !== '.')
-
-  // Detect if we're operating in the monorepo environment or in an installation
-  const isMono = !!packages.find((p) => p.startsWith('../..'))
+  const deps = resolveDependenciesSync()
+  const packages = [...deps.values()].filter((p) => p !== '.')
 
   // Load the current codegen.yml
   // Todo: implement loading with a custom --config or -c here.
   const conf = await loadCodegenConfig({ configFilePath: root })
 
   // Get a a list of all generates configurations.
-  const generates = Object.entries(conf.config.generates)
+  const generates = Object.entries(conf.config.generates).map(([generatedPath, value]) => {
+    const found = [...deps.entries()].find((dep) =>
+      generatedPath.startsWith(`node_modules/${dep[0]}`),
+    )
+
+    if (!found) return [generatedPath, value] as const
+    const newPath = generatedPath.replace(`node_modules/${found[0]}`, found[1])
+    return [newPath, value] as const
+  })
 
   let extension: string | undefined
 
@@ -65,17 +71,21 @@ async function main() {
   })
 
   const isWatching = process.argv.includes('--watch') || process.argv.includes('-w')
-  if (!isWatching && extension) rimraf(path.join(root, `**/*${extension}`), console.error)
+  if (!isWatching && extension) await rimraf(path.join(root, `**/*${extension}`))
 
   // - Prepend the all targets with ../../ if we're running in a monorepo setup.
   // - Append all the Graphcommerce packages to the configuration
   conf.config.generates = Object.fromEntries(
     generates.map(([generateTarget, generateConf]) => [
-      isMono ? `../../${generateTarget}` : generateTarget,
+      generateTarget,
       Array.isArray(generateConf) ? generateConf : appendDocumentLocations(generateConf, packages),
     ]),
   )
 
+  packageRoots(packages).forEach((r) => {
+    conf.config.generates[r] = conf.config.generates['.']
+  })
+
   // Reexport the mesh to is can be used by codegen
   await fs.writeFile(configLocation, yaml.stringify(conf.config))
 

package/src/bin/graphcommerce.ts

@@ -1,25 +1,24 @@
 #!/usr/bin/env node
 
-import { migrateHygraph } from '@graphcommerce/hygraph-cli'
-import { generateConfig, exportConfig } from '@graphcommerce/next-config'
-
 const commands = {
-  'codegen-config': generateConfig,
-  'export-config': exportConfig,
-  'hygraph-migrate': migrateHygraph,
+  'codegen-config': () => import('@graphcommerce/next-config').then((m) => m.generateConfig),
+  'export-config': () => import('@graphcommerce/next-config').then((m) => m.exportConfig),
+  'hygraph-migrate': () => import('@graphcommerce/hygraph-cli').then((m) => m.migrateHygraph),
 }
 
 const args = process.argv.slice(2)
 const command = args[0] as keyof typeof commands
 
-if (!commands[command]) {
+if (!(command in commands)) {
   console.error(
     `Unknown command: ${args.join(' ')}, possible commands: ${Object.keys(commands).join(', ')}`,
   )
   process.exit(1)
 }
 
-commands[command]().catch((e) => {
-  console.error(e)
-  process.exit(1)
-})
+commands[command]()
+  .then((c) => c())
+  .catch((e) => {
+    console.error(e)
+    process.exit(1)
+  })

package/src/bin/mesh.ts

@@ -3,7 +3,13 @@
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
 import { exit } from 'node:process'
-import { isMonorepo, loadConfig, replaceConfigInString } from '@graphcommerce/next-config'
+import {
+  isMonorepo,
+  loadConfig,
+  packageRoots,
+  replaceConfigInString,
+  resolveDependenciesSync,
+} from '@graphcommerce/next-config'
 import { graphqlMesh, DEFAULT_CLI_PARAMS, GraphQLMeshCLIParams } from '@graphql-mesh/cli'
 import { Logger, YamlConfig } from '@graphql-mesh/types'
 import { DefaultLogger } from '@graphql-mesh/utils'
@@ -48,7 +54,7 @@ const main = async () => {
   const conf = (await findConfig({})) as YamlConfig.Config
 
   // We're configuring a custom fetch function
-  conf.customFetch = '@graphcommerce/graphql-mesh/customFetch'
+  conf.customFetch = require.resolve('@graphcommerce/graphql-mesh/customFetch')
   conf.serve = { ...conf.serve, endpoint: '/api/graphql' }
 
   // Rewrite additionalResolvers so we can use module resolution more easily
@@ -74,12 +80,12 @@ const main = async () => {
 
   // Scan the current working directory to also read all graphqls files.
   conf.additionalTypeDefs.push('**/*.graphqls')
-  if (isMonorepo()) {
-    conf.additionalTypeDefs.push('../../packages/**/*.graphqls')
-    conf.additionalTypeDefs.push('../../packagesDev/**/*.graphqls')
-  } else {
-    conf.additionalTypeDefs.push('node_modules/@graphcommerce/**/*.graphqls')
-  }
+
+  const deps = resolveDependenciesSync()
+  const packages = [...deps.values()].filter((p) => p !== '.')
+  packageRoots(packages).forEach((r) => {
+    conf.additionalTypeDefs.push(`${r}/**/*.graphqls`)
+  })
 
   if (!conf.serve) conf.serve = {}
   if (!conf.serve.playgroundTitle) conf.serve.playgroundTitle = 'GraphCommerce® Mesh'