try esm only

yaacovCR · yaacovCR · commit 48bdad394030 · 2025-06-11T22:40:39.000+03:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -764,7 +764,7 @@ export default tsConfig(
       'n/no-missing-import': [
         'error',
         {
-          allowModules: ['graphql', 'graphql-esm'],
+          allowModules: ['graphql'],
         },
       ],
       'n/no-missing-require': [
diff --git a/integrationTests/node/index.mjs b/integrationTests/node/index.mjs
@@ -1,18 +1,7 @@
 import assert from 'node:assert';
-import { readFileSync } from 'node:fs';
-
-import {
-  experimentalExecuteIncrementally,
-  graphqlSync,
-  parse,
-} from 'graphql-esm';
-import { buildSchema } from 'graphql-esm/utilities';
-import { version } from 'graphql-esm/version';
-
-assert.deepStrictEqual(
-  version + '+esm',
-  JSON.parse(readFileSync('./node_modules/graphql-esm/package.json')).version,
-);
+
+import { experimentalExecuteIncrementally, graphqlSync, parse } from 'graphql';
+import { buildSchema } from 'graphql/utilities';
 
 const schema = buildSchema('type Query { hello: String }');
 
diff --git a/integrationTests/node/package.json b/integrationTests/node/package.json
@@ -6,7 +6,6 @@
     "test": "node test.js"
   },
   "dependencies": {
-    "graphql": "file:../graphql.tgz",
-    "graphql-esm": "file:../graphql-esm.tgz"
+    "graphql": "file:../graphql.tgz"
   }
 }
diff --git a/integrationTests/ts/esm.ts b/integrationTests/ts/esm.ts
@@ -1,11 +1,7 @@
-import type { ExecutionResult } from 'graphql-esm/execution';
+import type { ExecutionResult } from 'graphql/execution';
 
-import { graphqlSync } from 'graphql-esm';
-import {
-  GraphQLString,
-  GraphQLSchema,
-  GraphQLObjectType,
-} from 'graphql-esm/type';
+import { graphqlSync } from 'graphql';
+import { GraphQLString, GraphQLSchema, GraphQLObjectType } from 'graphql/type';
 
 const queryType: GraphQLObjectType = new GraphQLObjectType({
   name: 'Query',
diff --git a/integrationTests/ts/package.json b/integrationTests/ts/package.json
@@ -7,7 +7,6 @@
   },
   "dependencies": {
     "graphql": "file:../graphql.tgz",
-    "graphql-esm": "file:../graphql-esm.tgz",
     "typescript-4.9": "npm:typescript@4.9.x",
     "typescript-5.0": "npm:typescript@5.0.x",
     "typescript-5.1": "npm:typescript@5.1.x",
diff --git a/integrationTests/webpack/entry-esm.mjs b/integrationTests/webpack/entry-esm.mjs
diff --git a/integrationTests/webpack/package.json b/integrationTests/webpack/package.json
@@ -7,7 +7,6 @@
   },
   "dependencies": {
     "graphql": "file:../graphql.tgz",
-    "graphql-esm": "file:../graphql-esm.tgz",
     "webpack": "5.x.x",
     "webpack-cli": "4.x.x"
   }
diff --git a/integrationTests/webpack/test.js b/integrationTests/webpack/test.js
@@ -1,18 +1,10 @@
 import assert from 'node:assert';
 
 /* eslint-disable n/no-missing-import */
-import cjs from './dist/main-cjs.cjs';
-import mjs from './dist/main-mjs.cjs';
+import main from './dist/main.cjs';
 /* eslint-enable n/no-missing-import */
 
-assert.deepStrictEqual(cjs.result, {
-  data: {
-    __proto__: null,
-    hello: 'world',
-  },
-});
-
-assert.deepStrictEqual(mjs.result, {
+assert.deepStrictEqual(main.result, {
   data: {
     __proto__: null,
     hello: 'world',
diff --git a/integrationTests/webpack/webpack.config.json b/integrationTests/webpack/webpack.config.json
@@ -1,11 +1,8 @@
 {
   "mode": "production",
-  "entry": {
-    "cjs": "./entry.js",
-    "mjs": "./entry-esm.mjs"
-  },
+  "entry": "./entry.js",
   "output": {
-    "filename": "main-[name].cjs",
+    "filename": "main.cjs",
     "library": {
       "type": "commonjs2"
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "graphql-js"
   ],
   "engines": {
-    "node": "^16.19.0 || ^18.14.0 || >=19.7.0"
+    "node": "^20.19.0 || ^22.12.0 || >=23.0.0"
   },
   "scripts": {
     "preversion": "bash -c '. ./resources/checkgit.sh && npm ci --ignore-scripts'",
@@ -73,6 +73,9 @@
     "typescript": "5.7.2",
     "typescript-eslint": "^8.17.0"
   },
+  "exports": {
+    ".": "./src/index.js"
+  },
   "publishConfig": {
     "tag": "alpha"
   }
diff --git a/resources/build-npm.ts b/resources/build-npm.ts
@@ -15,14 +15,10 @@ import {
 } from './utils.js';
 
 console.log('\n./npmDist');
-await buildPackage('./npmDist', false);
+await buildPackage('./npmDist');
 showDirStats('./npmDist');
 
-console.log('\n./npmEsmDist');
-await buildPackage('./npmEsmDist', true);
-showDirStats('./npmEsmDist');
-
-async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
+async function buildPackage(outDir: string): Promise<void> {
   fs.rmSync(outDir, { recursive: true, force: true });
   fs.mkdirSync(outDir);
 
@@ -81,37 +77,25 @@ async function buildPackage(outDir: string, isESMOnly: boolean): Promise<void> {
       'Publish tag and version tag should match!',
     );
   }
+  packageJSON.exports = {};
 
-  if (isESMOnly) {
-    packageJSON.exports = {};
-
-    const { emittedTSFiles } = emitTSFiles({
-      outDir,
-      module: 'es2020',
-      extension: '.js',
-    });
+  const { emittedTSFiles } = emitTSFiles({
+    outDir,
+    module: 'es2020',
+    extension: '.js',
+  });
 
-    for (const filepath of emittedTSFiles) {
-      if (path.basename(filepath) === 'index.js') {
-        const relativePath = './' + path.relative('./npmEsmDist', filepath);
-        packageJSON.exports[path.dirname(relativePath)] = relativePath;
-      }
+  for (const filepath of emittedTSFiles) {
+    if (path.basename(filepath) === 'index.js') {
+      const relativePath = './' + path.relative('./npmDist', filepath);
+      packageJSON.exports[path.dirname(relativePath)] = relativePath;
     }
-
-    // Temporary workaround to allow "internal" imports, no grantees provided
-    packageJSON.exports['./*.js'] = './*.js';
-    packageJSON.exports['./*'] = './*.js';
-
-    packageJSON.publishConfig.tag += '-esm';
-    packageJSON.version += '+esm';
-  } else {
-    delete packageJSON.type;
-    packageJSON.main = 'index';
-    packageJSON.module = 'index.mjs';
-    emitTSFiles({ outDir, module: 'commonjs', extension: '.js' });
-    emitTSFiles({ outDir, module: 'es2020', extension: '.mjs' });
   }
 
+  // Temporary workaround to allow "internal" imports, no grantees provided
+  packageJSON.exports['./*.js'] = './*.js';
+  packageJSON.exports['./*'] = './*.js';
+
   const packageJsonPath = `./${outDir}/package.json`;
   const prettified = await prettify(
     packageJsonPath,
@@ -140,23 +124,7 @@ function emitTSFiles(options: {
   });
 
   const tsHost = ts.createCompilerHost(tsOptions);
-  tsHost.writeFile = (filepath, body) => {
-    if (filepath.match(/.js$/) && extension === '.mjs') {
-      let bodyToWrite = body;
-      bodyToWrite = bodyToWrite.replace(
-        '//# sourceMappingURL=graphql.js.map',
-        '//# sourceMappingURL=graphql.mjs.map',
-      );
-      writeGeneratedFile(filepath.replace(/.js$/, extension), bodyToWrite);
-    } else if (filepath.match(/.js.map$/) && extension === '.mjs') {
-      writeGeneratedFile(
-        filepath.replace(/.js.map$/, extension + '.map'),
-        body,
-      );
-    } else {
-      writeGeneratedFile(filepath, body);
-    }
-  };
+  tsHost.writeFile = (filepath, body) => writeGeneratedFile(filepath, body);
 
   const tsProgram = ts.createProgram(['src/index.ts'], tsOptions, tsHost);
   const tsResult = tsProgram.emit(undefined, undefined, undefined, undefined, {
diff --git a/resources/integration-test.ts b/resources/integration-test.ts
@@ -16,12 +16,6 @@ describe('Integration Tests', () => {
   const archiveName = npm({ cwd: tmpDirPath(), quiet: true }).pack(distDir);
   fs.renameSync(tmpDirPath(archiveName), tmpDirPath('graphql.tgz'));
 
-  const esmDistDir = localRepoPath('npmEsmDist');
-  const archiveEsmName = npm({ cwd: tmpDirPath(), quiet: true }).pack(
-    esmDistDir,
-  );
-  fs.renameSync(tmpDirPath(archiveEsmName), tmpDirPath('graphql-esm.tgz'));
-
   npm().run('build:deno');
 
   function testOnNodeProject(projectName: string) {

Original file line number	Diff line number	Diff line change
`@@ -764,7 +764,7 @@ export default tsConfig(`
`764`	`764`	`'n/no-missing-import': [`
`765`	`765`	`'error',`
`766`	`766`	`{`
`767`		`- allowModules: ['graphql', 'graphql-esm'],`
	`767`	`+ allowModules: ['graphql'],`
`768`	`768`	`},`
`769`	`769`	`],`
`770`	`770`	`'n/no-missing-require': [`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`"test": "node test.js"`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`		`- "graphql": "file:../graphql.tgz",`
`10`		`- "graphql-esm": "file:../graphql-esm.tgz"`
	`9`	`+ "graphql": "file:../graphql.tgz"`
`11`	`10`	`}`
`12`	`11`	`}`
-Original file line number
+Diff line change
   },
   "dependencies": {
     "graphql": "file:../graphql.tgz",
 -    "graphql-esm": "file:../graphql-esm.tgz",
     "typescript-4.9": "npm:[email protected]",
     "typescript-5.0": "npm:[email protected]",
     "typescript-5.1": "npm:[email protected]",
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`	`9`	`"graphql": "file:../graphql.tgz",`
`10`		`- "graphql-esm": "file:../graphql-esm.tgz",`
`11`	`10`	`"webpack": "5.x.x",`
`12`	`11`	`"webpack-cli": "4.x.x"`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"mode": "production",`
`3`		`- "entry": {`
`4`		`- "cjs": "./entry.js",`
`5`		`- "mjs": "./entry-esm.mjs"`
`6`		`- },`
	`3`	`+ "entry": "./entry.js",`
`7`	`4`	`"output": {`
`8`		`- "filename": "main-[name].cjs",`
	`5`	`+ "filename": "main.cjs",`
`9`	`6`	`"library": {`
`10`	`7`	`"type": "commonjs2"`
`11`	`8`	`}`