@graphql-codegen/cli 2.8.0-alpha-5cf64cf6a.0 → 2.8.0-alpha-2fbcdb6d3.0

package/cjs/codegen.js

@@ -14,17 +14,29 @@ const config_js_1 = require("./config.js");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const os_1 = require("os");
-// eslint-disable-next-line
 const module_1 = require("module");
 const listr_1 = tslib_1.__importDefault(require("listr"));
 const cli_error_js_1 = require("./utils/cli-error.js");
+/**
+ * Poor mans ESM detection.
+ * Looking at this and you have a better method?
+ * Send a PR.
+ */
+const isESMModule = (typeof __dirname === 'string') === false;
 const makeDefaultLoader = (from) => {
     if (fs_1.default.statSync(from).isDirectory()) {
         from = path_1.default.join(from, '__fake.js');
     }
     const relativeRequire = (0, module_1.createRequire)(from);
-    return (mod) => {
-        return Promise.resolve().then(() => tslib_1.__importStar(require(relativeRequire.resolve(mod))));
+    return async (mod) => {
+        return Promise.resolve().then(() => tslib_1.__importStar(require(isESMModule
+            ? /**
+               * For ESM we currently have no "resolve path" solution
+               * as import.meta is unavailable in a CommonJS context
+               * and furthermore unavailable in stable Node.js.
+               **/
+                mod
+            : relativeRequire.resolve(mod))));
     };
 };
 function createCache() {

package/cjs/presets.js

@@ -22,7 +22,11 @@ async function getPresetByName(name, loader) {
             return loaded;
         }
         catch (err) {
-            if (err.code !== 'MODULE_NOT_FOUND') {
+            if (
+            /** CJS Error code */
+            err.code !== 'MODULE_NOT_FOUND' &&
+                /** ESM Error code */
+                err.code !== 'ERR_MODULE_NOT_FOUND') {
                 throw new plugin_helpers_1.DetailedError(`Unable to load preset matching ${name}`, `
               Unable to load preset matching '${name}'.
               Reason:

package/esm/codegen.js

@@ -10,17 +10,29 @@ import { ensureContext } from './config.js';
 import fs from 'fs';
 import path from 'path';
 import { cpus } from 'os';
-// eslint-disable-next-line
 import { createRequire } from 'module';
 import Listr from 'listr';
 import { isListrError } from './utils/cli-error.js';
+/**
+ * Poor mans ESM detection.
+ * Looking at this and you have a better method?
+ * Send a PR.
+ */
+const isESMModule = (typeof __dirname === 'string') === false;
 const makeDefaultLoader = (from) => {
     if (fs.statSync(from).isDirectory()) {
         from = path.join(from, '__fake.js');
     }
     const relativeRequire = createRequire(from);
-    return (mod) => {
-        return import(relativeRequire.resolve(mod));
+    return async (mod) => {
+        return import(isESMModule
+            ? /**
+               * For ESM we currently have no "resolve path" solution
+               * as import.meta is unavailable in a CommonJS context
+               * and furthermore unavailable in stable Node.js.
+               **/
+                mod
+            : relativeRequire.resolve(mod));
     };
 };
 function createCache() {

package/esm/presets.js

@@ -19,7 +19,11 @@ export async function getPresetByName(name, loader) {
             return loaded;
         }
         catch (err) {
-            if (err.code !== 'MODULE_NOT_FOUND') {
+            if (
+            /** CJS Error code */
+            err.code !== 'MODULE_NOT_FOUND' &&
+                /** ESM Error code */
+                err.code !== 'ERR_MODULE_NOT_FOUND') {
                 throw new DetailedError(`Unable to load preset matching ${name}`, `
               Unable to load preset matching '${name}'.
               Reason:

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.8.0-alpha-5cf64cf6a.0",
+  "version": "2.8.0-alpha-2fbcdb6d3.0",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/core": "2.5.1",
-    "@graphql-codegen/plugin-helpers": "^2.4.1",
+    "@graphql-codegen/core": "2.6.0-alpha-2fbcdb6d3.0",
+    "@graphql-codegen/plugin-helpers": "^2.5.0-alpha-2fbcdb6d3.0",
     "@graphql-tools/apollo-engine-loader": "^7.3.1",
     "@graphql-tools/code-file-loader": "^7.3.0",
     "@graphql-tools/git-loader": "^7.2.0",