@cedarjs/testing 6.0.0-canary.2673 → 6.0.0-canary.2675

package/config/jest/web/RedwoodWebJestEnv.d.ts

@@ -1,5 +1,5 @@
-import { TestEnvironment } from 'jest-environment-jsdom';
-declare class RedwoodWebJestEnvironment extends TestEnvironment {
+import JSDOMEnvironment from 'jest-fixed-jsdom';
+declare class RedwoodWebJestEnvironment extends JSDOMEnvironment {
     setup(): Promise<void>;
 }
 export default RedwoodWebJestEnvironment;

package/config/jest/web/RedwoodWebJestEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedwoodWebJestEnv.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/RedwoodWebJestEnv.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,cAAM,yBAA0B,SAAQ,eAAe;IAC/C,KAAK;CAaZ;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"RedwoodWebJestEnv.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/RedwoodWebJestEnv.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,kBAAkB,CAAA;AAkB/C,cAAM,yBAA0B,SAAQ,gBAAgB;IAChD,KAAK;CASZ;AAED,eAAe,yBAAyB,CAAA"}

package/config/jest/web/RedwoodWebJestEnv.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,21 +17,24 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var RedwoodWebJestEnv_exports = {};
 __export(RedwoodWebJestEnv_exports, {
   default: () => RedwoodWebJestEnv_default
 });
 module.exports = __toCommonJS(RedwoodWebJestEnv_exports);
-var import_node_util = require("node:util");
-var import_jest_environment_jsdom = require("jest-environment-jsdom");
-class RedwoodWebJestEnvironment extends import_jest_environment_jsdom.TestEnvironment {
+var import_jest_fixed_jsdom = __toESM(require("jest-fixed-jsdom"), 1);
+class RedwoodWebJestEnvironment extends import_jest_fixed_jsdom.default {
   async setup() {
     await super.setup();
-    if (typeof this.global.TextEncoder === "undefined") {
-      this.global.TextEncoder = import_node_util.TextEncoder;
-      this.global.TextDecoder = import_node_util.TextDecoder;
-    }
     if (typeof this.global.crypto.subtle === "undefined") {
       this.global.crypto.subtle = {};
     }

package/config/jest/web/jest-fixed-jsdom.d.js

@@ -0,0 +1 @@
+"use strict";

package/config/jest/web/jest-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,QAAA,MAAM,MAAM,EAAE,MAuFb,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,QAAA,MAAM,MAAM,EAAE,MAkHb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/config/jest/web/jest-preset.js

@@ -40,6 +40,9 @@ const config = {
   // use correct path, for example, coverageDirectory
   rootDir: cedarPaths.base,
   roots: [import_node_path.default.join(cedarPaths.web.src)],
+  // Opting out of jsdom's browser-style export condition resolution (needed to
+  // resolve `msw/node`) is handled by the environment itself, via
+  // jest-fixed-jsdom
   testEnvironment: import_node_path.default.join(__dirname, "./RedwoodWebJestEnv.js"),
   displayName: {
     color: "blueBright",
@@ -109,6 +112,23 @@ const config = {
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
+    // MSW's CommonJS build `require`s ESM-only packages (`rettime`,
+    // `@open-draft/deferred-promise` and `until-async`, which ships ESM in
+    // plain `.js` files). Node supports require(esm), but Jest's runtime
+    // doesn't, so compile any `.mjs` file that gets pulled in from
+    // node_modules (plus until-async) to CommonJS. This needs its own
+    // transform entry (with the config inlined) because the web babel config
+    // ignores node_modules
+    "[/\\\\]node_modules[/\\\\](?:.+\\.mjs|until-async[/\\\\].+\\.js)$": [
+      "babel-jest",
+      {
+        babelrc: false,
+        configFile: false,
+        presets: [
+          [require.resolve("@babel/preset-env"), { targets: { node: "20" } }]
+        ]
+      }
+    ],
     "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
@@ -118,6 +138,13 @@ const config = {
       }
     ]
   },
+  // Jest's default is to not transform anything in node_modules, but `.mjs`
+  // files (and until-async) have to be compiled to CommonJS (see the
+  // transform above)
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!.*\\.mjs$)(?!until-async[/\\\\])",
+    "\\.pnp\\.[^\\\\/]+$"
+  ],
   resolver: import_node_path.default.resolve(__dirname, "./resolver.js"),
   testPathIgnorePatterns: [".(stories|mock).[jt]sx?$"]
 };

package/config/jest/web/jest.setup.d.ts

@@ -1,5 +1,4 @@
 import '@testing-library/jest-dom';
-import 'whatwg-fetch';
 import { mockCurrentUser as _mockCurrentUser } from '../../../web/mockRequests.js';
 declare global {
     var __RWJS_TESTROOT_DIR: string;

package/config/jest/web/jest.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAClC,OAAO,cAAc,CAAA;AAGrB,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}
+{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAGlC,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}

package/config/jest/web/jest.setup.js

@@ -1,6 +1,5 @@
 "use strict";
 var import_jest_dom = require("@testing-library/jest-dom");
-var import_whatwg_fetch = require("whatwg-fetch");
 var import_findCellMocks = require("@cedarjs/testing/dist/cjs/web/findCellMocks.js");
 var import_mockRequests = require("@cedarjs/testing/dist/cjs/web/mockRequests.js");
 global.mockGraphQLQuery = import_mockRequests.mockGraphQLQuery;

package/dist/cjs/config/jest/web/RedwoodWebJestEnv.d.ts

@@ -1,5 +1,5 @@
-import { TestEnvironment } from 'jest-environment-jsdom';
-declare class RedwoodWebJestEnvironment extends TestEnvironment {
+import JSDOMEnvironment from 'jest-fixed-jsdom';
+declare class RedwoodWebJestEnvironment extends JSDOMEnvironment {
     setup(): Promise<void>;
 }
 export default RedwoodWebJestEnvironment;

package/dist/cjs/config/jest/web/RedwoodWebJestEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedwoodWebJestEnv.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/RedwoodWebJestEnv.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,cAAM,yBAA0B,SAAQ,eAAe;IAC/C,KAAK;CAaZ;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"RedwoodWebJestEnv.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/RedwoodWebJestEnv.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,kBAAkB,CAAA;AAkB/C,cAAM,yBAA0B,SAAQ,gBAAgB;IAChD,KAAK;CASZ;AAED,eAAe,yBAAyB,CAAA"}

package/dist/cjs/config/jest/web/RedwoodWebJestEnv.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,21 +17,24 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var RedwoodWebJestEnv_exports = {};
 __export(RedwoodWebJestEnv_exports, {
   default: () => RedwoodWebJestEnv_default
 });
 module.exports = __toCommonJS(RedwoodWebJestEnv_exports);
-var import_node_util = require("node:util");
-var import_jest_environment_jsdom = require("jest-environment-jsdom");
-class RedwoodWebJestEnvironment extends import_jest_environment_jsdom.TestEnvironment {
+var import_jest_fixed_jsdom = __toESM(require("jest-fixed-jsdom"), 1);
+class RedwoodWebJestEnvironment extends import_jest_fixed_jsdom.default {
   async setup() {
     await super.setup();
-    if (typeof this.global.TextEncoder === "undefined") {
-      this.global.TextEncoder = import_node_util.TextEncoder;
-      this.global.TextDecoder = import_node_util.TextDecoder;
-    }
     if (typeof this.global.crypto.subtle === "undefined") {
       this.global.crypto.subtle = {};
     }

package/dist/cjs/config/jest/web/jest-fixed-jsdom.d.js

@@ -0,0 +1 @@
+"use strict";

package/dist/cjs/config/jest/web/jest-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,QAAA,MAAM,MAAM,EAAE,MAuFb,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,QAAA,MAAM,MAAM,EAAE,MAkHb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/dist/cjs/config/jest/web/jest-preset.js

@@ -40,6 +40,9 @@ const config = {
   // use correct path, for example, coverageDirectory
   rootDir: cedarPaths.base,
   roots: [import_node_path.default.join(cedarPaths.web.src)],
+  // Opting out of jsdom's browser-style export condition resolution (needed to
+  // resolve `msw/node`) is handled by the environment itself, via
+  // jest-fixed-jsdom
   testEnvironment: import_node_path.default.join(__dirname, "./RedwoodWebJestEnv.js"),
   displayName: {
     color: "blueBright",
@@ -109,6 +112,23 @@ const config = {
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
+    // MSW's CommonJS build `require`s ESM-only packages (`rettime`,
+    // `@open-draft/deferred-promise` and `until-async`, which ships ESM in
+    // plain `.js` files). Node supports require(esm), but Jest's runtime
+    // doesn't, so compile any `.mjs` file that gets pulled in from
+    // node_modules (plus until-async) to CommonJS. This needs its own
+    // transform entry (with the config inlined) because the web babel config
+    // ignores node_modules
+    "[/\\\\]node_modules[/\\\\](?:.+\\.mjs|until-async[/\\\\].+\\.js)$": [
+      "babel-jest",
+      {
+        babelrc: false,
+        configFile: false,
+        presets: [
+          [require.resolve("@babel/preset-env"), { targets: { node: "20" } }]
+        ]
+      }
+    ],
     "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
@@ -118,6 +138,13 @@ const config = {
       }
     ]
   },
+  // Jest's default is to not transform anything in node_modules, but `.mjs`
+  // files (and until-async) have to be compiled to CommonJS (see the
+  // transform above)
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!.*\\.mjs$)(?!until-async[/\\\\])",
+    "\\.pnp\\.[^\\\\/]+$"
+  ],
   resolver: import_node_path.default.resolve(__dirname, "./resolver.js"),
   testPathIgnorePatterns: [".(stories|mock).[jt]sx?$"]
 };

package/dist/cjs/config/jest/web/jest.setup.d.ts

@@ -1,5 +1,4 @@
 import '@testing-library/jest-dom';
-import 'whatwg-fetch';
 import { mockCurrentUser as _mockCurrentUser } from '../../../web/mockRequests.js';
 declare global {
     var __RWJS_TESTROOT_DIR: string;

package/dist/cjs/config/jest/web/jest.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAClC,OAAO,cAAc,CAAA;AAGrB,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}
+{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAGlC,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}

package/dist/cjs/config/jest/web/jest.setup.js

@@ -1,6 +1,5 @@
 "use strict";
 var import_jest_dom = require("@testing-library/jest-dom");
-var import_whatwg_fetch = require("whatwg-fetch");
 var import_findCellMocks = require("../../../web/findCellMocks.js");
 var import_mockRequests = require("../../../web/mockRequests.js");
 global.mockGraphQLQuery = import_mockRequests.mockGraphQLQuery;

package/dist/cjs/web/mockRequests.d.ts

@@ -1,25 +1,67 @@
-import type { StartOptions as StartMSWWorkerOptions, SharedOptions as SharedMSWOptions, MockedResponse, DefaultBodyType, RequestHandler, GraphQLContext, GraphQLRequest, ResponseTransformer } from 'msw';
-/**
- * Plugs fetch for the correct target in order to capture requests.
- *
- * Request handlers can be registered lazily (via `mockGraphQL<Query|Mutation>`),
- * the queue will be drained and used.
- */
-type StartOptions<Target> = Target extends 'browsers' ? StartMSWWorkerOptions : SharedMSWOptions;
-export declare const startMSW: <Target extends "node" | "browsers">(target: Target, options?: StartOptions<Target>) => Promise<any>;
+import type { RequestHandler, SharedOptions } from 'msw';
+import type { StartOptions as StartMSWWorkerOptions } from 'msw/browser';
+interface MockServerCommonApi {
+    use(...handlers: any[]): void;
+    resetHandlers(): void;
+}
+type MockWorkerInstance = MockServerCommonApi & {
+    stop(): void;
+};
+type MockServerInstance = MockServerCommonApi & {
+    listen(options?: Partial<SharedOptions>): void;
+    close(): void;
+};
+type StartOptions<Target> = Target extends 'browsers' ? StartMSWWorkerOptions : Partial<SharedOptions>;
+export declare const startMSW: <Target extends "node" | "browsers">(target: Target, options?: StartOptions<Target>) => Promise<MockWorkerInstance | MockServerInstance>;
 export declare const setupRequestHandlers: () => void;
 export declare const closeServer: () => void;
 export declare const registerHandler: (handler: RequestHandler) => void;
+/**
+ * The `ctx` object passed to mock-data functions. It mirrors the API of MSW
+ * v1's GraphQL context so that existing Cedar mocks keep working with MSW v2,
+ * where the `(req, res, ctx)` resolver signature no longer exists.
+ */
+export interface MockGraphQLContext {
+    /** Set the http response status code (and optionally status text) */
+    status(code: number, text?: string): void;
+    /** Delay the response by the given number of milliseconds */
+    delay(durationMs: number): void;
+    /** Return GraphQL errors in the response */
+    errors(errorList: Record<string, unknown>[]): void;
+    /** Set a response header. Accepts a name/value pair or an object */
+    set(name: string | Record<string, string>, value?: string): void;
+    /** Set a response cookie */
+    cookie(name: string, value: string): void;
+    /** Set the `extensions` field of the GraphQL response */
+    extensions(extensions: Record<string, unknown>): void;
+    /** Set an arbitrary field on the GraphQL response body */
+    field(fieldName: string, value: unknown): void;
+    /** Set the `data` field of the response. Overrides the returned mock-data */
+    data(data: Record<string, unknown>): void;
+    /** Perform a request that bypasses any mock handlers */
+    fetch(input: string | URL | Request, init?: RequestInit): Promise<Response>;
+}
+/**
+ * Information about the intercepted GraphQL request, passed to mock-data
+ * functions as `req`
+ */
+export interface MockGraphQLRequest {
+    /** The intercepted Fetch API `Request` */
+    request: Request;
+    /** The GraphQL query document string */
+    query: string;
+    operationName: string;
+    variables: Record<string, any>;
+    cookies: Record<string, string>;
+    url: URL;
+    headers: Headers;
+    method: string;
+}
 export type DataFunction<Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>> = (variables: QueryVariables, { req, ctx, }: {
-    req: GraphQLRequest<any>;
-    ctx: GraphQLContext<Record<string, any>>;
-}) => Query | void;
-type ResponseFunction<BodyType extends DefaultBodyType = any> = (...transformers: ResponseTransformer<BodyType>[]) => MockedResponse<BodyType>;
-type ResponseEnhancers = {
-    once: ResponseFunction<any>;
-    networkError: (message: string) => void;
-};
-type ResponseEnhancer = keyof ResponseEnhancers;
+    req: MockGraphQLRequest;
+    ctx: MockGraphQLContext;
+}) => Query | void | Promise<Query | void>;
+type ResponseEnhancer = 'once' | 'networkError';
 export declare const mockGraphQLQuery: <Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>>(operation: string, data: DataFunction<Query, QueryVariables> | Query, responseEnhancer?: ResponseEnhancer) => Record<string, any> | DataFunction<Record<string, unknown>, Record<string, any>>;
 export declare const mockGraphQLMutation: <Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>>(operation: string, data: DataFunction<Query, QueryVariables> | Query, responseEnhancer?: ResponseEnhancer) => Record<string, any> | DataFunction<Record<string, unknown>, Record<string, any>>;
 export declare const mockedUserMeta: {

package/dist/cjs/web/mockRequests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../../src/web/mockRequests.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,IAAI,qBAAqB,EACrC,aAAa,IAAI,gBAAgB,EACjC,cAAc,EACd,eAAe,EACf,cAAc,EACd,cAAc,EACd,cAAc,EACd,mBAAmB,EAGpB,MAAM,KAAK,CAAA;AAQZ;;;;;GAKG;AAEH,KAAK,YAAY,CAAC,MAAM,IAAI,MAAM,SAAS,UAAU,GACjD,qBAAqB,GACrB,gBAAgB,CAAA;AACpB,eAAO,MAAM,QAAQ,GAAU,MAAM,SAAS,MAAM,GAAG,UAAU,EAC/D,QAAQ,MAAM,EACd,UAAU,YAAY,CAAC,MAAM,CAAC,iBAgB/B,CAAA;AAED,eAAO,MAAM,oBAAoB,YAMhC,CAAA;AAED,eAAO,MAAM,WAAW,YAEvB,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,SAAS,cAAc,SAQtD,CAAA;AAED,MAAM,MAAM,YAAY,CACtB,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAClC,CACF,SAAS,EAAE,cAAc,EACzB,EACE,GAAG,EACH,GAAG,GACJ,EAAE;IACD,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;IACxB,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;CACzC,KACE,KAAK,GAAG,IAAI,CAAA;AAGjB,KAAK,gBAAgB,CAAC,QAAQ,SAAS,eAAe,GAAG,GAAG,IAAI,CAC9D,GAAG,YAAY,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,KAC7C,cAAc,CAAC,QAAQ,CAAC,CAAA;AAE7B,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAA;IAC3B,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC,CAAA;AACD,KAAK,gBAAgB,GAAG,MAAM,iBAAiB,CAAA;AAuD/C,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,WAAW,MAAM,EACjB,MAAM,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,GAAG,KAAK,EACjD,mBAAmB,gBAAgB,qFAGpC,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,WAAW,MAAM,EACjB,MAAM,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,GAAG,KAAK,EACjD,mBAAmB,gBAAgB,qFAGpC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAEzE,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,SASnE,CAAA"}
+{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../../src/web/mockRequests.ts"],"names":[],"mappings":"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"}

package/dist/cjs/web/mockRequests.js

@@ -41,28 +41,42 @@ module.exports = __toCommonJS(mockRequests_exports);
 var import_msw = require("msw");
 let REQUEST_HANDLER_QUEUE = [];
 let SERVER_INSTANCE;
+const MSW_NODE_SPECIFIER = "msw/node";
 const startMSW = async (target, options) => {
   if (SERVER_INSTANCE) {
     return SERVER_INSTANCE;
   }
   if (target === "browsers") {
-    SERVER_INSTANCE = (0, import_msw.setupWorker)();
-    await SERVER_INSTANCE.start(options);
+    const { setupWorker } = require("msw/browser");
+    const worker = setupWorker();
+    SERVER_INSTANCE = worker;
+    await worker.start(options);
   } else {
-    const { setupServer } = require("msw/node");
-    SERVER_INSTANCE = setupServer();
-    await SERVER_INSTANCE.listen(options);
+    const { setupServer } = require(
+      /* @vite-ignore */
+      MSW_NODE_SPECIFIER
+    );
+    const server = setupServer();
+    SERVER_INSTANCE = server;
+    server.listen(options);
   }
   return SERVER_INSTANCE;
 };
 const setupRequestHandlers = () => {
-  SERVER_INSTANCE.resetHandlers();
+  SERVER_INSTANCE?.resetHandlers();
   for (const handler of REQUEST_HANDLER_QUEUE) {
-    SERVER_INSTANCE.use(handler);
+    SERVER_INSTANCE?.use(handler);
   }
 };
 const closeServer = () => {
-  SERVER_INSTANCE.close();
+  if (!SERVER_INSTANCE) {
+    return;
+  }
+  if ("close" in SERVER_INSTANCE) {
+    SERVER_INSTANCE.close();
+  } else {
+    SERVER_INSTANCE.stop();
+  }
 };
 const registerHandler = (handler) => {
   if (!SERVER_INSTANCE) {
@@ -72,39 +86,95 @@ const registerHandler = (handler) => {
   }
 };
 const mockGraphQL = (type, operation, data, responseEnhancer) => {
-  const resolver = (req, res, ctx) => {
-    let d = data;
-    let responseTransforms = [];
+  const resolver = async ({
+    request,
+    query,
+    operationName,
+    variables,
+    cookies
+  }) => {
+    let d = void 0;
+    let status = 200;
+    let statusText;
+    let delayDurationMs;
+    let errorList;
+    let extensions;
+    let explicitData;
+    const extraFields = {};
+    const headers = new Headers();
     if (typeof data === "function") {
-      const captureTransform = (fn) => {
-        return (...args) => {
-          const resTransform = fn(...args);
-          responseTransforms = [...responseTransforms, resTransform];
-          return resTransform;
-        };
+      const ctx = {
+        status: (code, text) => {
+          status = code;
+          statusText = text;
+        },
+        delay: (durationMs) => {
+          delayDurationMs = durationMs;
+        },
+        errors: (errors) => {
+          errorList = errors;
+        },
+        set: (name, value) => {
+          if (typeof name === "object") {
+            for (const [headerName, headerValue] of Object.entries(name)) {
+              headers.set(headerName, headerValue);
+            }
+          } else if (typeof value !== "undefined") {
+            headers.set(name, value);
+          }
+        },
+        cookie: (name, value) => {
+          headers.append("Set-Cookie", `${name}=${value}`);
+        },
+        extensions: (ext) => {
+          extensions = ext;
+        },
+        field: (fieldName, value) => {
+          extraFields[fieldName] = value;
+        },
+        data: (dataValue) => {
+          explicitData = dataValue;
+        },
+        fetch: (input, init) => fetch((0, import_msw.bypass)(input, init))
       };
-      const newCtx = {
-        status: captureTransform(ctx.status),
-        delay: captureTransform(ctx.delay),
-        errors: captureTransform(ctx.errors),
-        set: captureTransform(ctx.set),
-        fetch: captureTransform(ctx.fetch),
-        data: captureTransform(ctx.data),
-        extensions: captureTransform(ctx.extensions),
-        cookie: captureTransform(ctx.cookie),
-        field: captureTransform(ctx.field)
+      const req = {
+        request,
+        query,
+        operationName,
+        variables,
+        cookies,
+        url: new URL(request.url),
+        headers: request.headers,
+        method: request.method
       };
-      d = data(req.variables, {
-        req,
-        ctx: newCtx
-      });
+      d = await data(variables, { req, ctx });
+    } else {
+      d = data;
     }
-    return (responseEnhancer ? res[responseEnhancer] : res)(
-      ctx.data(d),
-      ...responseTransforms
-    );
+    if (responseEnhancer === "networkError") {
+      return import_msw.HttpResponse.error();
+    }
+    if (typeof delayDurationMs !== "undefined") {
+      await (0, import_msw.delay)(delayDurationMs);
+    }
+    const body = { ...extraFields };
+    const bodyData = explicitData ?? d;
+    if (typeof bodyData !== "undefined") {
+      body.data = bodyData;
+    }
+    if (typeof errorList !== "undefined") {
+      body.errors = errorList;
+    }
+    if (typeof extensions !== "undefined") {
+      body.extensions = extensions;
+    }
+    return import_msw.HttpResponse.json(body, { status, statusText, headers });
   };
-  registerHandler(import_msw.graphql[type](operation, resolver));
+  registerHandler(
+    import_msw.graphql[type](operation, resolver, {
+      once: responseEnhancer === "once"
+    })
+  );
   return data;
 };
 const mockGraphQLQuery = (operation, data, responseEnhancer) => {

package/dist/config/jest/web/RedwoodWebJestEnv.d.ts

@@ -1,5 +1,5 @@
-import { TestEnvironment } from 'jest-environment-jsdom';
-declare class RedwoodWebJestEnvironment extends TestEnvironment {
+import JSDOMEnvironment from 'jest-fixed-jsdom';
+declare class RedwoodWebJestEnvironment extends JSDOMEnvironment {
     setup(): Promise<void>;
 }
 export default RedwoodWebJestEnvironment;

package/dist/config/jest/web/RedwoodWebJestEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedwoodWebJestEnv.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/RedwoodWebJestEnv.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,cAAM,yBAA0B,SAAQ,eAAe;IAC/C,KAAK;CAaZ;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"RedwoodWebJestEnv.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/RedwoodWebJestEnv.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,kBAAkB,CAAA;AAkB/C,cAAM,yBAA0B,SAAQ,gBAAgB;IAChD,KAAK;CASZ;AAED,eAAe,yBAAyB,CAAA"}

package/dist/config/jest/web/RedwoodWebJestEnv.js

@@ -1,12 +1,7 @@
-import { TextEncoder, TextDecoder } from "node:util";
-import { TestEnvironment } from "jest-environment-jsdom";
-class RedwoodWebJestEnvironment extends TestEnvironment {
+import JSDOMEnvironment from "jest-fixed-jsdom";
+class RedwoodWebJestEnvironment extends JSDOMEnvironment {
   async setup() {
     await super.setup();
-    if (typeof this.global.TextEncoder === "undefined") {
-      this.global.TextEncoder = TextEncoder;
-      this.global.TextDecoder = TextDecoder;
-    }
     if (typeof this.global.crypto.subtle === "undefined") {
       this.global.crypto.subtle = {};
     }

package/dist/config/jest/web/jest-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,QAAA,MAAM,MAAM,EAAE,MAuFb,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,QAAA,MAAM,MAAM,EAAE,MAkHb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/dist/config/jest/web/jest-preset.js

@@ -7,6 +7,9 @@ const config = {
   // use correct path, for example, coverageDirectory
   rootDir: cedarPaths.base,
   roots: [path.join(cedarPaths.web.src)],
+  // Opting out of jsdom's browser-style export condition resolution (needed to
+  // resolve `msw/node`) is handled by the environment itself, via
+  // jest-fixed-jsdom
   testEnvironment: path.join(__dirname, "./RedwoodWebJestEnv.js"),
   displayName: {
     color: "blueBright",
@@ -76,6 +79,23 @@ const config = {
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
+    // MSW's CommonJS build `require`s ESM-only packages (`rettime`,
+    // `@open-draft/deferred-promise` and `until-async`, which ships ESM in
+    // plain `.js` files). Node supports require(esm), but Jest's runtime
+    // doesn't, so compile any `.mjs` file that gets pulled in from
+    // node_modules (plus until-async) to CommonJS. This needs its own
+    // transform entry (with the config inlined) because the web babel config
+    // ignores node_modules
+    "[/\\\\]node_modules[/\\\\](?:.+\\.mjs|until-async[/\\\\].+\\.js)$": [
+      "babel-jest",
+      {
+        babelrc: false,
+        configFile: false,
+        presets: [
+          [require.resolve("@babel/preset-env"), { targets: { node: "20" } }]
+        ]
+      }
+    ],
     "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
@@ -85,6 +105,13 @@ const config = {
       }
     ]
   },
+  // Jest's default is to not transform anything in node_modules, but `.mjs`
+  // files (and until-async) have to be compiled to CommonJS (see the
+  // transform above)
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!.*\\.mjs$)(?!until-async[/\\\\])",
+    "\\.pnp\\.[^\\\\/]+$"
+  ],
   resolver: path.resolve(__dirname, "./resolver.js"),
   testPathIgnorePatterns: [".(stories|mock).[jt]sx?$"]
 };

package/dist/config/jest/web/jest.setup.d.ts

@@ -1,5 +1,4 @@
 import '@testing-library/jest-dom';
-import 'whatwg-fetch';
 import { mockCurrentUser as _mockCurrentUser } from '../../../web/mockRequests.js';
 declare global {
     var __RWJS_TESTROOT_DIR: string;

package/dist/config/jest/web/jest.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAClC,OAAO,cAAc,CAAA;AAGrB,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}
+{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAGlC,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}

package/dist/config/jest/web/jest.setup.js

@@ -1,5 +1,4 @@
 import "@testing-library/jest-dom";
-import "whatwg-fetch";
 import { findCellMocks } from "../../../web/findCellMocks.js";
 import {
   startMSW,

package/dist/web/mockRequests.d.ts

@@ -1,25 +1,67 @@
-import type { StartOptions as StartMSWWorkerOptions, SharedOptions as SharedMSWOptions, MockedResponse, DefaultBodyType, RequestHandler, GraphQLContext, GraphQLRequest, ResponseTransformer } from 'msw';
-/**
- * Plugs fetch for the correct target in order to capture requests.
- *
- * Request handlers can be registered lazily (via `mockGraphQL<Query|Mutation>`),
- * the queue will be drained and used.
- */
-type StartOptions<Target> = Target extends 'browsers' ? StartMSWWorkerOptions : SharedMSWOptions;
-export declare const startMSW: <Target extends "node" | "browsers">(target: Target, options?: StartOptions<Target>) => Promise<any>;
+import type { RequestHandler, SharedOptions } from 'msw';
+import type { StartOptions as StartMSWWorkerOptions } from 'msw/browser';
+interface MockServerCommonApi {
+    use(...handlers: any[]): void;
+    resetHandlers(): void;
+}
+type MockWorkerInstance = MockServerCommonApi & {
+    stop(): void;
+};
+type MockServerInstance = MockServerCommonApi & {
+    listen(options?: Partial<SharedOptions>): void;
+    close(): void;
+};
+type StartOptions<Target> = Target extends 'browsers' ? StartMSWWorkerOptions : Partial<SharedOptions>;
+export declare const startMSW: <Target extends "node" | "browsers">(target: Target, options?: StartOptions<Target>) => Promise<MockWorkerInstance | MockServerInstance>;
 export declare const setupRequestHandlers: () => void;
 export declare const closeServer: () => void;
 export declare const registerHandler: (handler: RequestHandler) => void;
+/**
+ * The `ctx` object passed to mock-data functions. It mirrors the API of MSW
+ * v1's GraphQL context so that existing Cedar mocks keep working with MSW v2,
+ * where the `(req, res, ctx)` resolver signature no longer exists.
+ */
+export interface MockGraphQLContext {
+    /** Set the http response status code (and optionally status text) */
+    status(code: number, text?: string): void;
+    /** Delay the response by the given number of milliseconds */
+    delay(durationMs: number): void;
+    /** Return GraphQL errors in the response */
+    errors(errorList: Record<string, unknown>[]): void;
+    /** Set a response header. Accepts a name/value pair or an object */
+    set(name: string | Record<string, string>, value?: string): void;
+    /** Set a response cookie */
+    cookie(name: string, value: string): void;
+    /** Set the `extensions` field of the GraphQL response */
+    extensions(extensions: Record<string, unknown>): void;
+    /** Set an arbitrary field on the GraphQL response body */
+    field(fieldName: string, value: unknown): void;
+    /** Set the `data` field of the response. Overrides the returned mock-data */
+    data(data: Record<string, unknown>): void;
+    /** Perform a request that bypasses any mock handlers */
+    fetch(input: string | URL | Request, init?: RequestInit): Promise<Response>;
+}
+/**
+ * Information about the intercepted GraphQL request, passed to mock-data
+ * functions as `req`
+ */
+export interface MockGraphQLRequest {
+    /** The intercepted Fetch API `Request` */
+    request: Request;
+    /** The GraphQL query document string */
+    query: string;
+    operationName: string;
+    variables: Record<string, any>;
+    cookies: Record<string, string>;
+    url: URL;
+    headers: Headers;
+    method: string;
+}
 export type DataFunction<Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>> = (variables: QueryVariables, { req, ctx, }: {
-    req: GraphQLRequest<any>;
-    ctx: GraphQLContext<Record<string, any>>;
-}) => Query | void;
-type ResponseFunction<BodyType extends DefaultBodyType = any> = (...transformers: ResponseTransformer<BodyType>[]) => MockedResponse<BodyType>;
-type ResponseEnhancers = {
-    once: ResponseFunction<any>;
-    networkError: (message: string) => void;
-};
-type ResponseEnhancer = keyof ResponseEnhancers;
+    req: MockGraphQLRequest;
+    ctx: MockGraphQLContext;
+}) => Query | void | Promise<Query | void>;
+type ResponseEnhancer = 'once' | 'networkError';
 export declare const mockGraphQLQuery: <Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>>(operation: string, data: DataFunction<Query, QueryVariables> | Query, responseEnhancer?: ResponseEnhancer) => Record<string, any> | DataFunction<Record<string, unknown>, Record<string, any>>;
 export declare const mockGraphQLMutation: <Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>>(operation: string, data: DataFunction<Query, QueryVariables> | Query, responseEnhancer?: ResponseEnhancer) => Record<string, any> | DataFunction<Record<string, unknown>, Record<string, any>>;
 export declare const mockedUserMeta: {

package/dist/web/mockRequests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../src/web/mockRequests.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,IAAI,qBAAqB,EACrC,aAAa,IAAI,gBAAgB,EACjC,cAAc,EACd,eAAe,EACf,cAAc,EACd,cAAc,EACd,cAAc,EACd,mBAAmB,EAGpB,MAAM,KAAK,CAAA;AAQZ;;;;;GAKG;AAEH,KAAK,YAAY,CAAC,MAAM,IAAI,MAAM,SAAS,UAAU,GACjD,qBAAqB,GACrB,gBAAgB,CAAA;AACpB,eAAO,MAAM,QAAQ,GAAU,MAAM,SAAS,MAAM,GAAG,UAAU,EAC/D,QAAQ,MAAM,EACd,UAAU,YAAY,CAAC,MAAM,CAAC,iBAgB/B,CAAA;AAED,eAAO,MAAM,oBAAoB,YAMhC,CAAA;AAED,eAAO,MAAM,WAAW,YAEvB,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,SAAS,cAAc,SAQtD,CAAA;AAED,MAAM,MAAM,YAAY,CACtB,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAClC,CACF,SAAS,EAAE,cAAc,EACzB,EACE,GAAG,EACH,GAAG,GACJ,EAAE;IACD,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;IACxB,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;CACzC,KACE,KAAK,GAAG,IAAI,CAAA;AAGjB,KAAK,gBAAgB,CAAC,QAAQ,SAAS,eAAe,GAAG,GAAG,IAAI,CAC9D,GAAG,YAAY,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,KAC7C,cAAc,CAAC,QAAQ,CAAC,CAAA;AAE7B,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAA;IAC3B,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC,CAAA;AACD,KAAK,gBAAgB,GAAG,MAAM,iBAAiB,CAAA;AAuD/C,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,WAAW,MAAM,EACjB,MAAM,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,GAAG,KAAK,EACjD,mBAAmB,gBAAgB,qFAGpC,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,WAAW,MAAM,EACjB,MAAM,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,GAAG,KAAK,EACjD,mBAAmB,gBAAgB,qFAGpC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAEzE,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,SASnE,CAAA"}
+{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../src/web/mockRequests.ts"],"names":[],"mappings":"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"}

package/dist/web/mockRequests.js

@@ -1,28 +1,42 @@
-import { setupWorker, graphql } from "msw";
+import { bypass, delay, graphql, HttpResponse } from "msw";
 let REQUEST_HANDLER_QUEUE = [];
 let SERVER_INSTANCE;
+const MSW_NODE_SPECIFIER = "msw/node";
 const startMSW = async (target, options) => {
   if (SERVER_INSTANCE) {
     return SERVER_INSTANCE;
   }
   if (target === "browsers") {
-    SERVER_INSTANCE = setupWorker();
-    await SERVER_INSTANCE.start(options);
+    const { setupWorker } = await import("msw/browser");
+    const worker = setupWorker();
+    SERVER_INSTANCE = worker;
+    await worker.start(options);
   } else {
-    const { setupServer } = await import("msw/node");
-    SERVER_INSTANCE = setupServer();
-    await SERVER_INSTANCE.listen(options);
+    const { setupServer } = await import(
+      /* @vite-ignore */
+      MSW_NODE_SPECIFIER
+    );
+    const server = setupServer();
+    SERVER_INSTANCE = server;
+    server.listen(options);
   }
   return SERVER_INSTANCE;
 };
 const setupRequestHandlers = () => {
-  SERVER_INSTANCE.resetHandlers();
+  SERVER_INSTANCE?.resetHandlers();
   for (const handler of REQUEST_HANDLER_QUEUE) {
-    SERVER_INSTANCE.use(handler);
+    SERVER_INSTANCE?.use(handler);
   }
 };
 const closeServer = () => {
-  SERVER_INSTANCE.close();
+  if (!SERVER_INSTANCE) {
+    return;
+  }
+  if ("close" in SERVER_INSTANCE) {
+    SERVER_INSTANCE.close();
+  } else {
+    SERVER_INSTANCE.stop();
+  }
 };
 const registerHandler = (handler) => {
   if (!SERVER_INSTANCE) {
@@ -32,39 +46,95 @@ const registerHandler = (handler) => {
   }
 };
 const mockGraphQL = (type, operation, data, responseEnhancer) => {
-  const resolver = (req, res, ctx) => {
-    let d = data;
-    let responseTransforms = [];
+  const resolver = async ({
+    request,
+    query,
+    operationName,
+    variables,
+    cookies
+  }) => {
+    let d = void 0;
+    let status = 200;
+    let statusText;
+    let delayDurationMs;
+    let errorList;
+    let extensions;
+    let explicitData;
+    const extraFields = {};
+    const headers = new Headers();
     if (typeof data === "function") {
-      const captureTransform = (fn) => {
-        return (...args) => {
-          const resTransform = fn(...args);
-          responseTransforms = [...responseTransforms, resTransform];
-          return resTransform;
-        };
+      const ctx = {
+        status: (code, text) => {
+          status = code;
+          statusText = text;
+        },
+        delay: (durationMs) => {
+          delayDurationMs = durationMs;
+        },
+        errors: (errors) => {
+          errorList = errors;
+        },
+        set: (name, value) => {
+          if (typeof name === "object") {
+            for (const [headerName, headerValue] of Object.entries(name)) {
+              headers.set(headerName, headerValue);
+            }
+          } else if (typeof value !== "undefined") {
+            headers.set(name, value);
+          }
+        },
+        cookie: (name, value) => {
+          headers.append("Set-Cookie", `${name}=${value}`);
+        },
+        extensions: (ext) => {
+          extensions = ext;
+        },
+        field: (fieldName, value) => {
+          extraFields[fieldName] = value;
+        },
+        data: (dataValue) => {
+          explicitData = dataValue;
+        },
+        fetch: (input, init) => fetch(bypass(input, init))
       };
-      const newCtx = {
-        status: captureTransform(ctx.status),
-        delay: captureTransform(ctx.delay),
-        errors: captureTransform(ctx.errors),
-        set: captureTransform(ctx.set),
-        fetch: captureTransform(ctx.fetch),
-        data: captureTransform(ctx.data),
-        extensions: captureTransform(ctx.extensions),
-        cookie: captureTransform(ctx.cookie),
-        field: captureTransform(ctx.field)
+      const req = {
+        request,
+        query,
+        operationName,
+        variables,
+        cookies,
+        url: new URL(request.url),
+        headers: request.headers,
+        method: request.method
       };
-      d = data(req.variables, {
-        req,
-        ctx: newCtx
-      });
+      d = await data(variables, { req, ctx });
+    } else {
+      d = data;
     }
-    return (responseEnhancer ? res[responseEnhancer] : res)(
-      ctx.data(d),
-      ...responseTransforms
-    );
+    if (responseEnhancer === "networkError") {
+      return HttpResponse.error();
+    }
+    if (typeof delayDurationMs !== "undefined") {
+      await delay(delayDurationMs);
+    }
+    const body = { ...extraFields };
+    const bodyData = explicitData ?? d;
+    if (typeof bodyData !== "undefined") {
+      body.data = bodyData;
+    }
+    if (typeof errorList !== "undefined") {
+      body.errors = errorList;
+    }
+    if (typeof extensions !== "undefined") {
+      body.extensions = extensions;
+    }
+    return HttpResponse.json(body, { status, statusText, headers });
   };
-  registerHandler(graphql[type](operation, resolver));
+  registerHandler(
+    graphql[type](operation, resolver, {
+      once: responseEnhancer === "once"
+    })
+  );
   return data;
 };
 const mockGraphQLQuery = (operation, data, responseEnhancer) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/testing",
-  "version": "6.0.0-canary.2673",
+  "version": "6.0.0-canary.2675",
   "description": "Tools, wrappers and configuration for testing a Cedar project.",
   "repository": {
     "type": "git",
@@ -116,10 +116,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/babel-config": "6.0.0-canary.2673",
-    "@cedarjs/context": "6.0.0-canary.2673",
-    "@cedarjs/graphql-server": "6.0.0-canary.2673",
-    "@cedarjs/project-config": "6.0.0-canary.2673",
+    "@babel/preset-env": "7.29.7",
+    "@cedarjs/babel-config": "6.0.0-canary.2675",
+    "@cedarjs/context": "6.0.0-canary.2675",
+    "@cedarjs/graphql-server": "6.0.0-canary.2675",
+    "@cedarjs/project-config": "6.0.0-canary.2675",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
@@ -133,18 +134,18 @@
     "fast-glob": "3.3.3",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
+    "jest-fixed-jsdom": "0.0.11",
     "jest-watch-typeahead": "2.2.2",
-    "msw": "1.3.5",
+    "msw": "2.15.0",
     "ts-toolbelt": "9.6.0",
-    "unplugin-auto-import": "19.3.0",
-    "whatwg-fetch": "3.6.20"
+    "unplugin-auto-import": "19.3.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "6.0.0-canary.2673",
-    "@cedarjs/framework-tools": "6.0.0-canary.2673",
-    "@cedarjs/router": "6.0.0-canary.2673",
-    "@cedarjs/web": "6.0.0-canary.2673",
+    "@cedarjs/auth": "6.0.0-canary.2675",
+    "@cedarjs/framework-tools": "6.0.0-canary.2675",
+    "@cedarjs/router": "6.0.0-canary.2675",
+    "@cedarjs/web": "6.0.0-canary.2675",
     "concurrently": "9.2.1",
     "jsdom": "27.4.0",
     "publint": "0.3.21",