@graphcommerce/cli 9.1.0-canary.54 → 10.0.0-canary.56

package/dist/bin/graphcommerce.js

@@ -2,8 +2,10 @@
 const commands = {
   codegen: () => import('@graphcommerce/next-config').then((m) => m.codegen),
   "codegen-config": () => import('@graphcommerce/next-config').then((m) => m.generateConfig),
+  "codegen-config-values": () => import('@graphcommerce/next-config').then((m) => m.generateConfigValues),
   "copy-files": () => import('@graphcommerce/next-config').then((m) => m.copyFiles),
   "codegen-interceptors": () => import('@graphcommerce/next-config').then((m) => m.codegenInterceptors),
+  "cleanup-interceptors": () => import('@graphcommerce/next-config').then((m) => m.cleanupInterceptors),
   "export-config": () => import('@graphcommerce/next-config').then((m) => m.exportConfig),
   "hygraph-migrate": () => import('@graphcommerce/hygraph-cli').then((m) => m.migrateHygraph)
 };

package/dist/bin/mesh.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { promises } from 'node:fs';
-import path$1 from 'node:path';
+import path from 'node:path';
 import { exit } from 'node:process';
 import { loadConfig, resolveDependenciesSync, sig, packageRoots, replaceConfigInString } from '@graphcommerce/next-config';
 import { DEFAULT_CLI_PARAMS, graphqlMesh } from '@graphql-mesh/cli';
@@ -9,7 +9,7 @@ import dotenv from 'dotenv';
 import 'tsx/cjs';
 import 'tsx/esm';
 import yaml from 'yaml';
-import path from 'path';
+import require$$0 from 'path';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
 
 function customLoader(ext, importFn = defaultImportFn, initialLoggerPrefix = "\u{1F578}\uFE0F  Mesh") {
@@ -41,7 +41,7 @@ function customLoader(ext, importFn = defaultImportFn, initialLoggerPrefix = "\u
 }
 async function findConfig(options) {
   const { configName = "mesh", dir: configDir = "", initialLoggerPrefix } = options || {};
-  const dir = path.isAbsolute(configDir) ? configDir : path.join(process.cwd(), configDir);
+  const dir = require$$0.isAbsolute(configDir) ? configDir : require$$0.join(process.cwd(), configDir);
   const explorer = cosmiconfig(configName, {
     searchPlaces: [
       "package.json",
@@ -72,7 +72,7 @@ async function findConfig(options) {
   return config;
 }
 
-dotenv.config();
+dotenv.config({ quiet: true });
 function resolvePath(pathStr) {
   return fileURLToPath(import.meta.resolve(pathStr));
 }
@@ -82,14 +82,14 @@ function handleFatalError(e, logger = new DefaultLogger("\u25C8")) {
   if (process.env.JEST == null) exit(1);
 }
 const root = process.cwd();
-const meshDir = path$1.dirname(resolvePath("@graphcommerce/graphql-mesh"));
-const relativePath = path$1.join(path$1.relative(meshDir, root), "/");
+const meshDir = path.dirname(resolvePath("@graphcommerce/graphql-mesh"));
+const relativePath = path.join(path.relative(meshDir, root), "/");
 const cliParams = {
   ...DEFAULT_CLI_PARAMS,
   playgroundTitle: "GraphCommerce\xAE Mesh"
 };
 const tmpMesh = "_tmp_mesh";
-const tmpMeshLocation = path$1.join(root, `.${tmpMesh}rc.yml`);
+const tmpMeshLocation = path.join(root, `.${tmpMesh}rc.yml`);
 async function cleanup() {
   try {
     await promises.stat(tmpMeshLocation).then((r) => {
@@ -103,7 +103,7 @@ async function cleanup() {
 const main = async () => {
   const baseConf = await findConfig({});
   const graphCommerce = loadConfig(root);
-  const meshConfigf = await import('@graphcommerce/graphql-mesh/meshConfig.interceptor');
+  const meshConfigf = await import('@graphcommerce/graphql-mesh/meshConfig');
   const conf = meshConfigf.default.meshConfig(baseConf, graphCommerce);
   conf.customFetch = "@graphcommerce/graphql-mesh/customFetch";
   conf.serve = { ...conf.serve, endpoint: "/api/graphql" };
@@ -111,7 +111,7 @@ const main = async () => {
   conf.additionalResolvers = conf.additionalResolvers?.map((additionalResolver) => {
     if (typeof additionalResolver !== "string") return additionalResolver;
     if (additionalResolver.startsWith("@"))
-      return path$1.relative(root, resolvePath(additionalResolver));
+      return path.relative(root, resolvePath(additionalResolver));
     return additionalResolver;
   });
   conf.sources = conf.sources.map((source) => {
@@ -123,7 +123,7 @@ const main = async () => {
           if (key === "openapi" && value) {
             const openapi = value;
             if (openapi.source.startsWith("@")) {
-              return [key, { ...openapi, source: path$1.relative(root, resolvePath(openapi.source)) }];
+              return [key, { ...openapi, source: path.relative(root, resolvePath(openapi.source)) }];
             }
           }
           return [key, value];
@@ -134,7 +134,7 @@ const main = async () => {
   if (!conf.additionalTypeDefs) conf.additionalTypeDefs = [];
   conf.additionalTypeDefs = (Array.isArray(conf.additionalTypeDefs) ? conf.additionalTypeDefs : [conf.additionalTypeDefs]).map((additionalTypeDef) => {
     if (typeof additionalTypeDef === "string" && additionalTypeDef.startsWith("@"))
-      return path$1.relative(root, resolvePath(additionalTypeDef));
+      return path.relative(root, resolvePath(additionalTypeDef));
     return additionalTypeDef;
   });
   conf.additionalTypeDefs.push("graphql/**/*.graphqls");
@@ -169,14 +169,14 @@ const main = async () => {
   await promises.writeFile(tmpMeshLocation, yamlString);
   await promises.writeFile(
     `${meshDir}/.mesh.ts`,
-    `export type * from '${relativePath.split(path$1.sep).join("/")}.mesh'
+    `export type * from '${relativePath.split(path.sep).join("/")}.mesh'
 export {
   getBuiltMesh as getBuiltMeshBase,
   execute,
   subscribe,
   createBuiltMeshHTTPHandler as createBuiltMeshHTTPHandlerBase,
   rawServeConfig,
-} from '${relativePath.split(path$1.sep).join("/")}.mesh'`,
+} from '${relativePath.split(path.sep).join("/")}.mesh'`,
     { encoding: "utf8" }
   );
   await graphqlMesh({ ...cliParams, configName: tmpMesh });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.1.0-canary.54",
+  "version": "10.0.0-canary.56",
   "scripts": {
     "dev": "pkgroll --clean-dist --watch",
     "build": "pkgroll --clean-dist",
@@ -22,29 +22,30 @@
     "is-monorepo": "dist/bin/is-monorepo.js"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "5.0.5",
+    "@graphql-codegen/cli": "6.1.0",
     "cosmiconfig": "^8.3.6",
     "detect-package-manager": "^3.0.2",
-    "dotenv": "16.4.7",
-    "graphql": "^16.10.0",
-    "graphql-codegen-typescript-validation-schema": "^0.17.0",
+    "dotenv": "16.6.1",
+    "graphql": "^16.12.0",
+    "graphql-codegen-typescript-validation-schema": "^0.18.1",
     "graphql-tag": "^2.12.6",
     "rimraf": "^5.0.10",
     "tslib": "^2.8.1",
-    "tsx": "^4.19.2",
-    "yaml": "2.6.1"
+    "tsx": "^4.21.0",
+    "yaml": "2.8.2",
+    "zod": "^3.25.76"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.54",
-    "@graphcommerce/graphql-mesh": "^9.1.0-canary.54",
-    "@graphcommerce/hygraph-cli": "^9.1.0-canary.54",
-    "@graphcommerce/next-config": "^9.1.0-canary.54",
-    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.54",
-    "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.54",
+    "@graphcommerce/eslint-config-pwa": "^10.0.0-canary.56",
+    "@graphcommerce/graphql-mesh": "^10.0.0-canary.56",
+    "@graphcommerce/hygraph-cli": "^10.0.0-canary.56",
+    "@graphcommerce/next-config": "^10.0.0-canary.56",
+    "@graphcommerce/prettier-config-pwa": "^10.0.0-canary.56",
+    "@graphcommerce/typescript-config-pwa": "^10.0.0-canary.56",
     "@graphql-mesh/cli": "*",
     "@graphql-mesh/types": "*",
     "@graphql-mesh/utils": "*",
-    "react": "^18.2.0"
+    "react": "^19.2.0"
   },
   "peerDependenciesMeta": {
     "@graphcommerce/hygraph-cli": {
@@ -63,6 +64,6 @@
     }
   },
   "devDependencies": {
-    "pkgroll": "^2.5.1"
+    "pkgroll": "^2.21.4"
   }
 }

package/src/bin/codegen.ts

@@ -7,12 +7,13 @@ import { packageRoots, resolveDependenciesSync } from '@graphcommerce/next-confi
 import { cliError, loadCodegenConfig, runCli } from '@graphql-codegen/cli'
 import type { Types } from '@graphql-codegen/plugin-helpers'
 import dotenv from 'dotenv'
+import glob from 'fast-glob'
 import { rimraf } from 'rimraf'
 import yaml from 'yaml'
 
 const [, , cmd] = process.argv
 
-dotenv.config()
+dotenv.config({ quiet: true })
 
 const root = process.cwd()
 const configLocation = path.join(root, '._tmp_codegen.yml')
@@ -34,7 +35,14 @@ function appendDocumentLocations(
   packages: string[],
 ): Types.ConfiguredOutput {
   const documents = Array.isArray(conf.documents) ? conf.documents : [conf.documents]
-  documents.push(...packages.map((p) => `${p}/**/*.graphql`))
+
+  // Pre-resolve GraphQL files to avoid graphql-codegen following symlinks into node_modules
+  const packagePatterns = packages.map((p) => `${p}/**/*.graphql`)
+  const resolvedFiles = glob.sync(packagePatterns, {
+    ignore: ['**/node_modules/**'],
+    followSymbolicLinks: false,
+  })
+  documents.push(...resolvedFiles)
 
   return conf
 }

package/src/bin/graphcommerce.ts

@@ -3,9 +3,13 @@
 const commands = {
   codegen: () => import('@graphcommerce/next-config').then((m) => m.codegen),
   'codegen-config': () => import('@graphcommerce/next-config').then((m) => m.generateConfig),
+  'codegen-config-values': () =>
+    import('@graphcommerce/next-config').then((m) => m.generateConfigValues),
   'copy-files': () => import('@graphcommerce/next-config').then((m) => m.copyFiles),
   'codegen-interceptors': () =>
     import('@graphcommerce/next-config').then((m) => m.codegenInterceptors),
+  'cleanup-interceptors': () =>
+    import('@graphcommerce/next-config').then((m) => m.cleanupInterceptors),
   'export-config': () => import('@graphcommerce/next-config').then((m) => m.exportConfig),
   'hygraph-migrate': () => import('@graphcommerce/hygraph-cli').then((m) => m.migrateHygraph),
 }

package/src/bin/mesh.ts

@@ -21,7 +21,7 @@ import type { Entries, OmitIndexSignature } from 'type-fest'
 import yaml from 'yaml'
 import { findConfig } from '../utils/findConfig'
 
-dotenv.config()
+dotenv.config({ quiet: true })
 
 function resolvePath(pathStr: string) {
   return fileURLToPath(import.meta.resolve(pathStr))
@@ -62,9 +62,7 @@ const main = async () => {
   const baseConf = (await findConfig({})) as YamlConfig.Config
   const graphCommerce = loadConfig(root)
 
-  const meshConfigf = (await import(
-    '@graphcommerce/graphql-mesh/meshConfig.interceptor'
-  )) as unknown as {
+  const meshConfigf = (await import('@graphcommerce/graphql-mesh/meshConfig')) as unknown as {
     default: {
       meshConfig: typeof meshConfigBase
     }