@graphcommerce/cli 1.0.4 → 1.0.7

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @graphcommerce/cli
 
+## 1.0.7
+
+### Patch Changes
+
+- [#1562](https://github.com/graphcommerce-org/graphcommerce/pull/1562) [`01f1588c9`](https://github.com/graphcommerce-org/graphcommerce/commit/01f1588c9200bb39dd61146e260bfa2b32060612) Thanks [@paales](https://github.com/paales)! - The context was missing in apollo client
+
+* [#1501](https://github.com/graphcommerce-org/graphcommerce/pull/1501) [`475d23197`](https://github.com/graphcommerce-org/graphcommerce/commit/475d23197a6ce4b08cc325f872834ca592aa28dc) Thanks [@paales](https://github.com/paales)! - Native windows support added: Directory separator differences and package.json interpretation differences
+
+## 1.0.6
+
+### Patch Changes
+
+- [#1552](https://github.com/graphcommerce-org/graphcommerce/pull/1552) [`18054c441`](https://github.com/graphcommerce-org/graphcommerce/commit/18054c441962ba750bed3acc39ab46c8d3a341ce) Thanks [@paales](https://github.com/paales)! - Updated to Next.js v12.2.2 and other packages and made compatible
+
+## 1.0.5
+
+### Patch Changes
+
+- [#1490](https://github.com/graphcommerce-org/graphcommerce/pull/1490) [`d311ef48b`](https://github.com/graphcommerce-org/graphcommerce/commit/d311ef48bb3e97806d992af5516d6b7f183ec9cb) Thanks [@paales](https://github.com/paales)! - upgraded packages
+
 ## 1.0.4
 
 ### Patch Changes

package/bin/mesh.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-import { promises as fs } from 'fs'
-import path from 'path'
-import { exit } from 'process'
+import { promises as fs } from 'node:fs'
+import path from 'node:path'
+import { exit } from 'node:process'
 import { graphqlMesh, DEFAULT_CLI_PARAMS, GraphQLMeshCLIParams } from '@graphql-mesh/cli'
 import { Logger, YamlConfig } from '@graphql-mesh/types'
 import { DefaultLogger } from '@graphql-mesh/utils'
@@ -24,7 +24,7 @@ const root = process.cwd()
 const meshDir = path.dirname(require.resolve('@graphcommerce/graphql-mesh'))
 const relativePath = path.join(path.relative(meshDir, root), '/')
 
-const isMonoRepo = relativePath.startsWith('../../examples')
+const isMonoRepo = relativePath.startsWith(`..${path.sep}..${path.sep}examples`)
 
 const cliParams: GraphQLMeshCLIParams = {
   ...DEFAULT_CLI_PARAMS,
@@ -84,9 +84,11 @@ const main = async () => {
   await fs.writeFile(tmpMeshLocation, yaml.stringify(conf))
 
   // Reexport the mesh to is can be used by packages
-  await fs.writeFile(`${meshDir}/.mesh.ts`, `export * from '${relativePath}.mesh'`, {
-    encoding: 'utf8',
-  })
+  await fs.writeFile(
+    `${meshDir}/.mesh.ts`,
+    `export * from '${relativePath.split(path.sep).join('/')}.mesh'`,
+    { encoding: 'utf8' },
+  )
 
   await graphqlMesh({ ...cliParams, configName: tmpMesh })
 

package/dist/bin/mesh.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleFatalError = void 0;
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const process_1 = require("process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_process_1 = require("node:process");
 const cli_1 = require("@graphql-mesh/cli");
 const utils_1 = require("@graphql-mesh/utils");
 const dotenv_1 = __importDefault(require("dotenv"));
@@ -21,24 +21,24 @@ function handleFatalError(e, logger = new utils_1.DefaultLogger('◈')) {
     // eslint-disable-next-line no-console
     console.log(e);
     if (process.env.JEST == null)
-        (0, process_1.exit)(1);
+        (0, node_process_1.exit)(1);
 }
 exports.handleFatalError = handleFatalError;
 const root = process.cwd();
-const meshDir = path_1.default.dirname(require.resolve('@graphcommerce/graphql-mesh'));
-const relativePath = path_1.default.join(path_1.default.relative(meshDir, root), '/');
-const isMonoRepo = relativePath.startsWith('../../examples');
+const meshDir = node_path_1.default.dirname(require.resolve('@graphcommerce/graphql-mesh'));
+const relativePath = node_path_1.default.join(node_path_1.default.relative(meshDir, root), '/');
+const isMonoRepo = relativePath.startsWith(`..${node_path_1.default.sep}..${node_path_1.default.sep}examples`);
 const cliParams = {
     ...cli_1.DEFAULT_CLI_PARAMS,
     playgroundTitle: 'GraphCommerce® Mesh',
 };
 const tmpMesh = `_tmp_mesh_${Math.random().toString(36).substring(2, 15)}`;
-const tmpMeshLocation = path_1.default.join(root, `.${tmpMesh}rc.yml`);
+const tmpMeshLocation = node_path_1.default.join(root, `.${tmpMesh}rc.yml`);
 async function cleanup() {
     try {
-        await fs_1.promises.stat(tmpMeshLocation).then((r) => {
+        await node_fs_1.promises.stat(tmpMeshLocation).then((r) => {
             if (r.isFile())
-                return fs_1.promises.unlink(tmpMeshLocation);
+                return node_fs_1.promises.unlink(tmpMeshLocation);
         });
     }
     catch (e) {
@@ -54,7 +54,7 @@ const main = async () => {
         if (typeof additionalResolver !== 'string')
             return additionalResolver;
         if (additionalResolver.startsWith('@'))
-            return path_1.default.relative(root, require.resolve(additionalResolver));
+            return node_path_1.default.relative(root, require.resolve(additionalResolver));
         return additionalResolver;
     });
     // Rewrite additionalTypeDefs so we can use module resolution more easily
@@ -62,7 +62,7 @@ const main = async () => {
         conf.additionalTypeDefs = [];
     conf.additionalTypeDefs = (Array.isArray(conf.additionalTypeDefs) ? conf.additionalTypeDefs : [conf.additionalTypeDefs]).map((additionalTypeDef) => {
         if (additionalTypeDef.startsWith('@'))
-            return path_1.default.relative(root, require.resolve(additionalTypeDef));
+            return node_path_1.default.relative(root, require.resolve(additionalTypeDef));
         return additionalTypeDef;
     });
     // Scan the current working directory to also read all graphqls files.
@@ -78,11 +78,9 @@ const main = async () => {
         conf.serve = {};
     if (!conf.serve.playgroundTitle)
         conf.serve.playgroundTitle = 'GraphCommerce® Mesh';
-    await fs_1.promises.writeFile(tmpMeshLocation, yaml_1.default.stringify(conf));
+    await node_fs_1.promises.writeFile(tmpMeshLocation, yaml_1.default.stringify(conf));
     // Reexport the mesh to is can be used by packages
-    await fs_1.promises.writeFile(`${meshDir}/.mesh.ts`, `export * from '${relativePath}.mesh'`, {
-        encoding: 'utf8',
-    });
+    await node_fs_1.promises.writeFile(`${meshDir}/.mesh.ts`, `export * from '${relativePath.split(node_path_1.default.sep).join('/')}.mesh'`, { encoding: 'utf8' });
     await (0, cli_1.graphqlMesh)({ ...cliParams, configName: tmpMesh });
     await cleanup();
 };

package/dist/mesh/findConfig.js

@@ -8,7 +8,8 @@ exports.findConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@graphql-mesh/utils");
 const cosmiconfig_1 = require("cosmiconfig");
-function customLoader(ext, importFn = utils_1.defaultImportFn) {
+function customLoader(ext, importFn = utils_1.defaultImportFn, initialLoggerPrefix = '🕸️  Mesh') {
+    const logger = new utils_1.DefaultLogger(initialLoggerPrefix).child('config');
     // eslint-disable-next-line consistent-return
     function loader(filepath, content) {
         if (process.env) {
@@ -28,7 +29,7 @@ function customLoader(ext, importFn = utils_1.defaultImportFn) {
             return cosmiconfig_1.defaultLoaders['.json'](filepath, content);
         }
         if (ext === 'yaml') {
-            return (0, utils_1.loadYaml)(filepath, content);
+            return (0, utils_1.loadYaml)(filepath, content, logger);
         }
         if (ext === 'js') {
             return importFn(filepath);
@@ -37,7 +38,7 @@ function customLoader(ext, importFn = utils_1.defaultImportFn) {
     return loader;
 }
 async function findConfig(options) {
-    const { configName = 'mesh', dir: configDir = '' } = options || {};
+    const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix } = options || {};
     const dir = path_1.default.isAbsolute(configDir) ? configDir : path_1.default.join(process.cwd(), configDir);
     const explorer = (0, cosmiconfig_1.cosmiconfig)(configName, {
         searchPlaces: [
@@ -53,12 +54,12 @@ async function findConfig(options) {
             `${configName}.config.cjs`,
         ],
         loaders: {
-            '.json': customLoader('json', options?.importFn),
-            '.yaml': customLoader('yaml', options?.importFn),
-            '.yml': customLoader('yaml', options?.importFn),
-            '.js': customLoader('js', options?.importFn),
-            '.ts': customLoader('js', options?.importFn),
-            noExt: customLoader('yaml', options?.importFn),
+            '.json': customLoader('json', options?.importFn, initialLoggerPrefix),
+            '.yaml': customLoader('yaml', options?.importFn, initialLoggerPrefix),
+            '.yml': customLoader('yaml', options?.importFn, initialLoggerPrefix),
+            '.js': customLoader('js', options?.importFn, initialLoggerPrefix),
+            '.ts': customLoader('js', options?.importFn, initialLoggerPrefix),
+            noExt: customLoader('yaml', options?.importFn, initialLoggerPrefix),
         },
     });
     const results = await explorer.search(dir);

package/mesh/findConfig.ts

@@ -1,10 +1,16 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import path from 'path'
 import { ConfigProcessOptions } from '@graphql-mesh/config'
-import { defaultImportFn, loadYaml } from '@graphql-mesh/utils'
+import { defaultImportFn, loadYaml, DefaultLogger } from '@graphql-mesh/utils'
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig'
 
-function customLoader(ext: 'json' | 'yaml' | 'js', importFn = defaultImportFn) {
+function customLoader(
+  ext: 'json' | 'yaml' | 'js',
+  importFn = defaultImportFn,
+  initialLoggerPrefix = '🕸️  Mesh',
+) {
+  const logger = new DefaultLogger(initialLoggerPrefix).child('config')
+
   // eslint-disable-next-line consistent-return
   function loader(filepath: string, content: string) {
     if (process.env) {
@@ -28,7 +34,7 @@ function customLoader(ext: 'json' | 'yaml' | 'js', importFn = defaultImportFn) {
     }
 
     if (ext === 'yaml') {
-      return loadYaml(filepath, content)
+      return loadYaml(filepath, content, logger)
     }
 
     if (ext === 'js') {
@@ -40,9 +46,9 @@ function customLoader(ext: 'json' | 'yaml' | 'js', importFn = defaultImportFn) {
 }
 
 export async function findConfig(
-  options?: Pick<ConfigProcessOptions, 'configName' | 'dir' | 'importFn'>,
+  options?: Pick<ConfigProcessOptions, 'configName' | 'dir' | 'importFn' | 'initialLoggerPrefix'>,
 ) {
-  const { configName = 'mesh', dir: configDir = '' } = options || {}
+  const { configName = 'mesh', dir: configDir = '', initialLoggerPrefix } = options || {}
   const dir = path.isAbsolute(configDir) ? configDir : path.join(process.cwd(), configDir)
   const explorer = cosmiconfig(configName, {
     searchPlaces: [
@@ -58,12 +64,12 @@ export async function findConfig(
       `${configName}.config.cjs`,
     ],
     loaders: {
-      '.json': customLoader('json', options?.importFn),
-      '.yaml': customLoader('yaml', options?.importFn),
-      '.yml': customLoader('yaml', options?.importFn),
-      '.js': customLoader('js', options?.importFn),
-      '.ts': customLoader('js', options?.importFn),
-      noExt: customLoader('yaml', options?.importFn),
+      '.json': customLoader('json', options?.importFn, initialLoggerPrefix),
+      '.yaml': customLoader('yaml', options?.importFn, initialLoggerPrefix),
+      '.yml': customLoader('yaml', options?.importFn, initialLoggerPrefix),
+      '.js': customLoader('js', options?.importFn, initialLoggerPrefix),
+      '.ts': customLoader('js', options?.importFn, initialLoggerPrefix),
+      noExt: customLoader('yaml', options?.importFn, initialLoggerPrefix),
     },
   })
   const results = await explorer.search(dir)

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -19,17 +19,17 @@
     "graphql-code-generator": "dist/bin/codegen.js"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "2.6.2",
-    "@graphql-mesh/cli": "0.69.2",
-    "@graphql-mesh/types": "0.72.1",
-    "@graphql-mesh/utils": "0.34.6"
+    "@graphql-codegen/cli": "2.8.0",
+    "@graphql-mesh/cli": "0.75.2",
+    "@graphql-mesh/types": "0.78.4",
+    "@graphql-mesh/utils": "0.37.5"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.1.6",
+    "@graphcommerce/eslint-config-pwa": "^4.1.9",
     "@graphcommerce/prettier-config-pwa": "^4.0.6",
-    "@graphcommerce/typescript-config-pwa": "^4.0.2",
+    "@graphcommerce/typescript-config-pwa": "^4.0.4",
     "@playwright/test": "^1.21.1",
-    "typescript": "4.6.3"
+    "typescript": "4.7.4"
   },
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",