checkpoint

package.json

@@ -8,7 +8,7 @@
     "clean": "git clean -dfqX -- ./node_modules **/{dist,node_modules}/ **/tsconfig*tsbuildinfo",
     "precompile": "node scripts/precompile.mjs",
     "postcompile": "node scripts/postcompile.mjs",
-    "compile": "tsc --build tsconfig.build.json packages/server/tsconfig.cjs.json; x=$?; mv packages/server/src/.packageVersion.ts.original packages/server/src/packageVersion.ts; exit $x",
+    "compile": "tsc --build tsconfig.build.json packages/*/tsconfig.cjs.json; x=$?; mv packages/server/src/.packageVersion.ts.original packages/server/src/packageVersion.ts; exit $x",
     "watch": "tsc --build tsconfig.build.json --watch",
     "install-with-npm-8.5": "npm i -g npm@^8.5.0 && npm i",
     "postinstall": "npm run compile",

packages/plugin-response-cache/jest.config.js

@@ -1,3 +1,3 @@
-const config = require('../../jest.config.base');
+import baseConfig from '../../jest.config.base.js';
 
-module.exports = Object.assign(Object.create(null), config);
+export default baseConfig;

packages/plugin-response-cache/package.json

@@ -2,8 +2,17 @@
   "name": "@apollo/server-plugin-response-cache",
   "version": "4.0.0",
   "description": "Apollo Server full query response cache",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/esm/index.d.ts",
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/apollographql/apollo-server",

packages/plugin-response-cache/src/ApolloServerPluginResponseCache.ts

@@ -1,26 +1,19 @@
 import type {
   ApolloServerPlugin,
-  GraphQLRequestListener,
+  BaseContext,
+  CacheHint,
   GraphQLRequestContext,
+  GraphQLRequestListener,
   GraphQLResponse,
-  CacheHint,
-  BaseContext,
 } from '@apollo/server';
+import { newHTTPGraphQLHead } from '@apollo/server';
+import { createHash } from '@apollo/utils.createhash';
 import {
   KeyValueCache,
   PrefixingKeyValueCache,
 } from '@apollo/utils.keyvaluecache';
 
 type ValueOrPromise<T> = T | Promise<T>;
-
-// XXX This should use createSHA from apollo-server-core in order to work on
-// non-Node environments. I'm not sure where that should end up ---
-// apollo-server-sha as its own tiny module? apollo-server-env seems bad because
-// that would add sha.js to unnecessary places, I think?
-import { createHash } from '@apollo/utils.createhash';
-import { CacheScope } from 'packages/server/src/plugin/schemaReporting/generated/operations';
-import { newHTTPGraphQLHead } from 'packages/server/src/runHttpQuery';
-
 interface Options<TContext = Record<string, any>> {
   // Underlying cache used to save results. All writes will be under keys that
   // start with 'fqc:' and are followed by a fixed-size cryptographic hash of a
@@ -302,7 +295,7 @@ export default function plugin<TContext extends BaseContext>(
               .catch(logger.warn);
           };
 
-          const isPrivate = policyIfCacheable.scope === CacheScope.Private;
+          const isPrivate = policyIfCacheable.scope === 'PRIVATE';
           if (isPrivate) {
             if (!options.sessionId) {
               logger.warn(

packages/plugin-response-cache/src/index.ts

@@ -1,2 +1,3 @@
-import plugin from './ApolloServerPluginResponseCache';
+import plugin from './ApolloServerPluginResponseCache.js';
+
 export default plugin;

packages/plugin-response-cache/tsconfig.cjs.json

@@ -0,0 +1,11 @@
+{
+  "extends": ".",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "./dist/cjs",
+    // We delete the CJS .d.ts files in postcompile so we don't need to
+    // ever make their maps. (We can't disable creating the files because
+    // this is a composite project.)
+    "declarationMap": false,
+  },
+}

packages/plugin-response-cache/tsconfig.json

@@ -2,11 +2,13 @@
   "extends": "../../tsconfig.base",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "./dist"
+    "outDir": "./dist/esm"
   },
   "include": ["src/**/*"],
   "exclude": ["**/__tests__"],
   "references": [
-    { "path": "../server" }
+    {
+      "path": "../server"
+    }
   ]
 }

packages/server/src/index.ts

@@ -13,3 +13,5 @@ export {
 
 // TODO(AS4): consider moving to `@apollo/server/express`
 export { expressMiddleware } from './express/index.js';
+
+export { newHTTPGraphQLHead } from './runHttpQuery.js';

scripts/postcompile.mjs

@@ -12,14 +12,16 @@ import { writeFileSync } from 'fs';
 import rimraf from 'rimraf';
 
 // Tell Node what kinds of files the ".js" files in these subdirectories are.
-writeFileSync(
-  path.join('packages', 'server', 'dist', 'esm', 'package.json'),
-  JSON.stringify({ type: 'module' }),
-);
-writeFileSync(
-  path.join('packages', 'server', 'dist', 'cjs', 'package.json'),
-  JSON.stringify({ type: 'commonjs' }),
-);
+for (const dir of ['plugin-response-cache', 'server']) {
+  writeFileSync(
+    path.join('packages', dir, 'dist', 'esm', 'package.json'),
+    JSON.stringify({ type: 'module' }),
+  );
+  writeFileSync(
+    path.join('packages', dir, 'dist', 'cjs', 'package.json'),
+    JSON.stringify({ type: 'commonjs' }),
+  );
 
-// Remove CJS .d.ts files: we don't need two copies!
-rimraf.sync('packages/server/dist/cjs/**/*.d.ts');
+  // Remove CJS .d.ts files: we don't need two copies!
+  rimraf.sync(`packages/${dir}/dist/cjs/**/*.d.ts`);
+}