Attempt to make things work with yarn berry

Author: benjie

__tests__/helpers.ts

@@ -5,7 +5,7 @@ import {
   sleep,
   sleepUntil as baseSleepUntil,
 } from "jest-time-helpers";
-import * as pg from "pg";
+import pg from "pg";
 
 import defer from "../src/deferred";
 import {
@@ -43,10 +43,6 @@ export function sleepUntil(condition: () => boolean, ms?: number) {
   return baseSleepUntil(condition, ms ?? 5000);
 }
 
-// Sometimes CI's clock can get interrupted (it is shared infra!) so this
-// extends the default timeout just in case.
-jest.setTimeout(20000);
-
 // process.env.GRAPHILE_LOGGER_DEBUG = "1";
 
 async function createTestDatabase() {

__tests__/nodeEnvironment.js

@@ -1,6 +1,6 @@
-const NodeEnvironment = require("jest-environment-node");
+const { TestEnvironment } = require("jest-environment-node");
 
-class CustomEnvironment extends NodeEnvironment {
+class CustomEnvironment extends TestEnvironment {
   constructor(config, context) {
     super(config, context);
     this.global.AbortController = global.AbortController;

jest.config.js

@@ -1,7 +1,10 @@
 module.exports = {
   roots: ["<rootDir>/src", "<rootDir>/__tests__"],
   transform: {
-    "^.+\\.tsx?$": "ts-jest",
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      { tsconfig: { rootDir: ".", module: "node16" } },
+    ],
   },
   testRegex: "(/__tests__/.*\\.(test|spec))\\.[tj]sx?$",
   moduleFileExtensions: ["ts", "js", "json"],
@@ -10,4 +13,5 @@ module.exports = {
     "^(\\.{1,2}/.*)\\.js$": "$1",
   },
   testEnvironment: "./__tests__/nodeEnvironment.js",
+  testTimeout: 20000,
 };

src/lib.ts

@@ -7,7 +7,8 @@ import {
   orderedApply,
   resolvePreset,
 } from "graphile-config";
-import { Client, Pool, PoolClient, PoolConfig } from "pg";
+import pg from "pg";
+import type { Pool, PoolClient, PoolConfig } from "pg";
 
 import { makeWorkerPresetWorkerOptions } from "./config";
 import { migrations } from "./generated/sql";
@@ -234,7 +235,8 @@ export function processSharedOptions<
       },
       plugins,
     } = resolvedPreset;
-    const escapedWorkerSchema = Client.prototype.escapeIdentifier(workerSchema);
+    const escapedWorkerSchema =
+      pg.Client.prototype.escapeIdentifier(workerSchema);
 
     const ctx: WorkerPluginBaseContext = {
       version,
@@ -357,7 +359,7 @@ function makeNewPool(
   releasers: Releasers,
   poolOptions: PoolConfig,
 ) {
-  const pgPool = new Pool(poolOptions);
+  const pgPool = new pg.Pool(poolOptions);
   releasers.push(() => {
     pgPool.end();
   });