@graphcommerce/cli 6.2.0-canary.56 → 6.2.0-canary.58

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphcommerce/cli
 
+## 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

package/dist/bin/codegen.js

@@ -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]) => {
@@ -61,9 +66,12 @@ async function main() {
     // - 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/mesh.js

@@ -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.56",
+  "version": "6.2.0-canary.58",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -24,8 +24,8 @@
     "graphcommerce": "dist/bin/graphcommerce.js"
   },
   "dependencies": {
-    "@graphcommerce/hygraph-cli": "6.2.0-canary.56",
-    "@graphcommerce/next-config": "6.2.0-canary.56",
+    "@graphcommerce/hygraph-cli": "6.2.0-canary.58",
+    "@graphcommerce/next-config": "6.2.0-canary.58",
     "@graphql-codegen/cli": "4.0.1",
     "@graphql-mesh/cli": "latest",
     "@graphql-mesh/types": "latest",
@@ -39,9 +39,9 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "6.2.0-canary.56",
-    "@graphcommerce/prettier-config-pwa": "6.2.0-canary.56",
-    "@graphcommerce/typescript-config-pwa": "6.2.0-canary.56",
+    "@graphcommerce/eslint-config-pwa": "6.2.0-canary.58",
+    "@graphcommerce/prettier-config-pwa": "6.2.0-canary.58",
+    "@graphcommerce/typescript-config-pwa": "6.2.0-canary.58",
     "@types/rimraf": "^4.0.5",
     "react": "^18.2.0",
     "typescript": "5.1.3"

package/src/bin/codegen.ts

@@ -2,7 +2,7 @@
 /* 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'
@@ -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
 
@@ -71,11 +77,15 @@ async function main() {
   // - 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/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'
@@ -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'