@cedarjs/testing 5.0.3 → 5.0.4-next.167

package/config/jest/api/apiBabelConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiBabelConfig.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/apiBabelConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAG7B,MAAM,uBAAuB,CAAA;AAS9B,KAAK,UAAU,GAAG,IAAI,CACpB,UAAU,CAAC,OAAO,4BAA4B,CAAC,EAC/C,SAAS,CACV,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,UAMb,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"apiBabelConfig.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/apiBabelConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAG7B,MAAM,uBAAuB,CAAA;AAO9B,KAAK,UAAU,GAAG,IAAI,CACpB,UAAU,CAAC,OAAO,4BAA4B,CAAC,EAC/C,SAAS,CACV,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,UAMb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/config/jest/api/apiBabelConfig.js

@@ -22,9 +22,7 @@ __export(apiBabelConfig_exports, {
 });
 module.exports = __toCommonJS(apiBabelConfig_exports);
 var import_babel_config = require("@cedarjs/babel-config");
-const { babelrc: _b, ...defaultBabelConfig } = (0, import_babel_config.getApiSideDefaultBabelConfig)({
-  forJest: true
-});
+const { babelrc: _b, ...defaultBabelConfig } = (0, import_babel_config.getApiSideDefaultBabelConfig)();
 const config = {
   ...defaultBabelConfig,
   plugins: (0, import_babel_config.getApiSideBabelPlugins)(),

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

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

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

@@ -35,8 +35,17 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 const rwjsPaths = (0, import_project_config.getPaths)();
-const NODE_MODULES_PATH = import_node_path.default.join(rwjsPaths.base, "node_modules");
-const { babelrc } = (0, import_babel_config.getApiSideDefaultBabelConfig)({ forJest: true });
+const { babelrc } = (0, import_babel_config.getApiSideDefaultBabelConfig)();
+function resolveSubpath(specifier) {
+  try {
+    return require.resolve(specifier, {
+      paths: [rwjsPaths.api.base, rwjsPaths.base]
+    });
+  } catch {
+    return void 0;
+  }
+}
+const testingApiPath = resolveSubpath("@cedarjs/testing/api");
 const config = {
   // To make sure other config option which depends on rootDir use
   // correct path, for example, coverageDirectory
@@ -77,11 +86,34 @@ const config = {
     "^src/(.*)$": import_node_path.default.join(rwjsPaths.api.src, "$1"),
     // @NOTE: Import @cedarjs/testing in api tests, and it automatically remaps to the api side only
     // This is to prevent web stuff leaking into api, and vice versa
-    "^@cedarjs/testing$": import_node_path.default.join(NODE_MODULES_PATH, "@cedarjs/testing/api"),
+    ...testingApiPath ? { "^@cedarjs/testing$": testingApiPath } : {},
     // Support for importing files with extensions (like you'd do in ESM projects)
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
+    // `@cedarjs/context`, `@cedarjs/api`, `@cedarjs/graphql-server`, and
+    // `@cedarjs/storage` are ESM-only. Two things pull them in at the top
+    // level of a generated project's api-side test run: @cedarjs/testing's
+    // own api entry point (which virtually every test imports, for
+    // scenario/mock helpers — pulls in `@cedarjs/context` and
+    // `@cedarjs/graphql-server` via `directive.ts`, and
+    // `@cedarjs/api/webhooks` via `apiFunction.ts`), and the *user's own*
+    // generated code — the `cedar setup uploads` template imports
+    // `@cedarjs/storage`. Jest's CJS runtime can't parse the real ESM these
+    // now emit, so they need the same babel-jest carve-out the web preset
+    // already uses for ESM-only node_modules packages (see jest-preset.ts
+    // on the web side for the fuller explanation of why this is
+    // necessary).
+    "[/\\\\]node_modules[/\\\\]@cedarjs[/\\\\](context|api|graphql-server|storage)[/\\\\].+\\.js$": [
+      "babel-jest",
+      {
+        babelrc: false,
+        configFile: false,
+        presets: [
+          [require.resolve("@babel/preset-env"), { targets: { node: "20" } }]
+        ]
+      }
+    ],
     "\\.[cm]?[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
@@ -95,6 +127,9 @@ const config = {
       }
     ]
   },
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!@cedarjs[/\\\\]context[/\\\\])(?!@cedarjs[/\\\\]api[/\\\\])(?!@cedarjs[/\\\\]graphql-server[/\\\\])(?!@cedarjs[/\\\\]storage[/\\\\])"
+  ],
   testPathIgnorePatterns: [".scenarios.[jt]s$"]
 };
 var jest_preset_default = config;

package/config/jest/babelPlugins/babel-plugin-redwood-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAA;AAqCtC,UAAU,WAAY,SAAQ,UAAU;IAKtC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,CAAC,OAAO,WAAW,EACvB,KAAK,GACN,EAAE;IACD,KAAK,EAAE,OAAO,CAAC,CAAA;CAChB,GAAG,SAAS,CAAC,WAAW,CAAC,CAkHzB"}
+{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAA;AAsCtC,UAAU,WAAY,SAAQ,UAAU;IAKtC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,CAAC,OAAO,WAAW,EACvB,KAAK,GACN,EAAE;IACD,KAAK,EAAE,OAAO,CAAC,CAAA;CAChB,GAAG,SAAS,CAAC,WAAW,CAAC,CAoHzB"}

package/config/jest/babelPlugins/babel-plugin-redwood-cell.js

@@ -25,6 +25,7 @@ var import_node_path = require("node:path");
 const EXPECTED_EXPORTS_FROM_CELL = [
   "beforeQuery",
   "QUERY",
+  "FRAGMENT",
   "data",
   "isEmpty",
   "afterQuery",
@@ -70,7 +71,7 @@ function babel_plugin_redwood_cell_default({
           state.hasDefaultExport = false;
         },
         exit(path, state) {
-          const hasQueryOrDataExport = state.exportNames.includes("QUERY") || state.exportNames.includes("data");
+          const hasQueryOrDataExport = state.exportNames.includes("QUERY") || state.exportNames.includes("FRAGMENT") || state.exportNames.includes("data");
           if (state.hasDefaultExport || !hasQueryOrDataExport) {
             return;
           }

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,MAkFb,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/web/jest-preset.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAiIlC,QAAA,MAAM,MAAM,EAAE,MA0Ib,CAAA;AAED,eAAe,MAAM,CAAA"}

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

@@ -31,15 +31,68 @@ __export(jest_preset_exports, {
   default: () => jest_preset_default
 });
 module.exports = __toCommonJS(jest_preset_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_project_config = require("@cedarjs/project-config");
 const cedarPaths = (0, import_project_config.getPaths)();
-const NODE_MODULES_PATH = import_node_path.default.join(cedarPaths.base, "node_modules");
+const RESOLVE_FROM = [cedarPaths.web.base, cedarPaths.base];
+function resolvePackageDir(packageName, resolveFrom = RESOLVE_FROM) {
+  try {
+    return import_node_path.default.dirname(
+      require.resolve(`${packageName}/package.json`, { paths: resolveFrom })
+    );
+  } catch {
+  }
+  try {
+    let dir = import_node_path.default.dirname(require.resolve(packageName, { paths: resolveFrom }));
+    for (; ; ) {
+      const manifestPath = import_node_path.default.join(dir, "package.json");
+      if (import_node_fs.default.existsSync(manifestPath)) {
+        const manifest = JSON.parse(
+          import_node_fs.default.readFileSync(manifestPath, "utf-8")
+        );
+        if (manifest && typeof manifest === "object" && "name" in manifest && manifest.name === packageName) {
+          return dir;
+        }
+      }
+      const parent = import_node_path.default.dirname(dir);
+      if (parent === dir) {
+        return void 0;
+      }
+      dir = parent;
+    }
+  } catch {
+    return void 0;
+  }
+}
+function packagePath(packageName, relativePath = "", resolveFrom = RESOLVE_FROM) {
+  const packageDir = resolvePackageDir(packageName, resolveFrom);
+  return packageDir && import_node_path.default.join(packageDir, relativePath);
+}
+function resolveSubpath(specifier, resolveFrom = RESOLVE_FROM) {
+  try {
+    return require.resolve(specifier, { paths: resolveFrom });
+  } catch {
+    return void 0;
+  }
+}
+const cedarWebDir = resolvePackageDir("@cedarjs/web");
+const cedarWebResolveFrom = cedarWebDir ? [cedarWebDir, ...RESOLVE_FROM] : RESOLVE_FROM;
+function definedEntries(mappings) {
+  return Object.fromEntries(
+    Object.entries(mappings).filter(
+      (entry) => entry[1] !== void 0
+    )
+  );
+}
 const config = {
   // To make sure other config option which depends on rootDir always
   // 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",
@@ -69,41 +122,78 @@ const config = {
   ],
   setupFilesAfterEnv: [import_node_path.default.resolve(__dirname, "./jest.setup.js")],
   moduleNameMapper: {
-    /**
-     * Make sure modules that require different versions of these
-     * dependencies end up using the same one.
-     */
-    "^react$": import_node_path.default.join(NODE_MODULES_PATH, "react"),
-    "^react-dom$": import_node_path.default.join(NODE_MODULES_PATH, "react-dom"),
-    "^@apollo/client/react$": import_node_path.default.join(
-      NODE_MODULES_PATH,
-      "@apollo/client/react"
-    ),
-    // We replace imports to "@cedarjs/router" with our own "mock" implementation.
-    "^@cedarjs/router$": import_node_path.default.join(
-      NODE_MODULES_PATH,
-      "@cedarjs/testing/dist/cjs/web/MockRouter.js"
-    ),
-    "^@cedarjs/web$": import_node_path.default.join(NODE_MODULES_PATH, "@cedarjs/web/dist/cjs"),
-    // This allows us to mock `createAuthentication` which is used by auth
-    // clients, which in turn lets us mock `useAuth` in tests
-    "^@cedarjs/auth$": import_node_path.default.join(
-      NODE_MODULES_PATH,
-      "@cedarjs/testing/dist/cjs/web/mockAuth.js"
-    ),
-    // @NOTE: Import @cedarjs/testing in web tests, and it automatically remaps to the web side only
-    // This is to prevent web stuff leaking into api, and vice versa
-    "^@cedarjs/testing$": import_node_path.default.join(NODE_MODULES_PATH, "@cedarjs/testing/web"),
+    ...definedEntries({
+      /**
+       * Make sure modules that require different versions of these
+       * dependencies end up using the same one.
+       */
+      "^react$": resolveSubpath("react"),
+      "^react-dom$": resolveSubpath("react-dom"),
+      // Point straight at Apollo Client's CJS build. Resolving the subpath
+      // would go through its `exports` map and land on the ESM build (Node 22+
+      // picks the `module-sync` condition), which Jest can't parse.
+      // Resolved starting from `@cedarjs/web` because that's what depends on
+      // Apollo — a project doesn't declare it itself, so under pnpm it isn't
+      // reachable from the web side at all, and searching from there finds
+      // either nothing or some unrelated copy pulled in by another dependency
+      "^@apollo/client/react$": packagePath(
+        "@apollo/client",
+        "__cjs/react/index.cjs",
+        cedarWebResolveFrom
+      ),
+      // We replace imports to "@cedarjs/router" with our own "mock" implementation.
+      "^@cedarjs/router$": resolveSubpath("@cedarjs/testing/web/MockRouter.js"),
+      "^@cedarjs/web$": resolveSubpath("@cedarjs/web"),
+      // This allows us to mock `createAuthentication` which is used by auth
+      // clients, which in turn lets us mock `useAuth` in tests
+      "^@cedarjs/auth$": resolveSubpath("@cedarjs/testing/auth"),
+      // @NOTE: Import @cedarjs/testing in web tests, and it automatically remaps to the web side only
+      // This is to prevent web stuff leaking into api, and vice versa
+      "^@cedarjs/testing$": resolveSubpath("@cedarjs/testing/web"),
+      /**
+       * Mock out files that aren't particularly useful in tests. See fileMock.js for more info.
+       */
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|css)$": resolveSubpath("@cedarjs/testing/dist/cjs/web/fileMock.js")
+    }),
     "~__CEDAR__USER_ROUTES_FOR_MOCK": cedarPaths.web.routes,
     "~__CEDAR__USER_AUTH_FOR_MOCK": import_node_path.default.join(cedarPaths.web.src, "auth"),
-    /**
-     * Mock out files that aren't particularly useful in tests. See fileMock.js for more info.
-     */
-    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|css)$": "@cedarjs/testing/dist/cjs/web/fileMock.js",
     // Support for importing files with extensions (like you'd do in ESM projects)
     "^(\\.{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
+    //
+    // The `@cedarjs/auth-*-web` packages are ESM-only too, and (like
+    // until-async) ship plain `.js` files rather than `.mjs` since their
+    // package.json already declares `"type": "module"`. A generated
+    // project's `web/src/auth.ts` imports one of these, so they need the
+    // same carve-out. `@cedarjs/forms` is ESM-only for the same reason, and
+    // gets pulled into virtually every generated project's web-side tests
+    // via `web/src/pages/**` scaffolds and dbAuth login/signup forms.
+    // `@cedarjs/web`, `@cedarjs/auth`, and `@cedarjs/router` are ESM-only
+    // too. `web` and `router` are imported directly by virtually every
+    // generated project's web-side test (`Routes.tsx`, page/component
+    // scaffolds), and `auth` gets pulled in transitively through `web`.
+    // Jest's own module loader re-applies this carve-out to every file it
+    // loads, including ones reached transitively through an
+    // already-transformed require() call, so all of them need to be listed
+    // even though only `web`/`router` are usually imported directly.
+    "[/\\\\]node_modules[/\\\\](?:.+\\.mjs|(?:until-async|@cedarjs[/\\\\](?:auth-[a-z-]+-web|forms|web|auth|router))[/\\\\].+\\.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
@@ -113,6 +203,21 @@ const config = {
       }
     ]
   },
+  // Jest's default is to not transform anything in node_modules, but `.mjs`
+  // files (and until-async, @cedarjs/auth-*-web, @cedarjs/forms,
+  // @cedarjs/web, @cedarjs/auth, and @cedarjs/router) have to be compiled to
+  // CommonJS (see the transform above).
+  // The `.pnpm` lookahead is what makes this work with pnpm: its virtual store
+  // puts packages at `node_modules/.pnpm/<pkg>@<version>/node_modules/<pkg>`,
+  // so without it the pattern matches (and thereby ignores) at the *first*
+  // `node_modules` segment, where the following path starts with `.pnpm/`
+  // instead of `until-async/` and the exception never gets a chance to apply.
+  // Skipping that segment forces the match onto the inner `node_modules`,
+  // which looks the same as a hoisted npm/yarn layout
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!\\.pnpm[/\\\\])(?!.*\\.mjs$)(?!until-async[/\\\\])(?!@cedarjs[/\\\\]auth-[a-z-]+-web[/\\\\])(?!@cedarjs[/\\\\]forms[/\\\\])(?!@cedarjs[/\\\\]web[/\\\\])(?!@cedarjs[/\\\\]auth[/\\\\])(?!@cedarjs[/\\\\]router[/\\\\])",
+    "\\.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/api/vitest/CedarApiVitestEnv.js

@@ -5,7 +5,7 @@ import { getPaths } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 const CedarApiVitestEnvironment = {
   name: "cedar-api",
-  transformMode: "ssr",
+  viteEnvironment: "ssr",
   async setup() {
     if (process.env.SKIP_DB_PUSH === "1") {
       return {

package/dist/api/vitest/vite-plugin-cedar-vitest-api-config.js

@@ -16,13 +16,13 @@ function cedarVitestApiConfigPlugin() {
         },
         test: {
           environment: path.join(import.meta.dirname, "CedarApiVitestEnv.js"),
-          // fileParallelism: false,
-          // fileParallelism doesn't work with vitest projects (which is what
-          // we're using in the root vitest.config.ts). As a workaround we set
-          // poolOptions instead, which also shouldn't work, but was suggested
-          // by Vitest team member AriPerkkio (Hiroshi's answer didn't work).
-          // https://github.com/vitest-dev/vitest/discussions/7416
-          poolOptions: { forks: { singleFork: true } },
+          // All api test files share a single test database, so they can't
+          // run in parallel. In Vitest 3 project-level fileParallelism didn't
+          // work (https://github.com/vitest-dev/vitest/discussions/7416) and
+          // we used the now-removed `poolOptions: { forks: { singleFork:
+          // true } }` as a workaround. Vitest 4 removed `poolOptions` and
+          // supports `fileParallelism` in project configs.
+          fileParallelism: false,
           setupFiles: [path.join(import.meta.dirname, "vitest-api.setup.js")]
         }
       };

package/dist/api/vitest/vitest-api.setup.js

@@ -60,8 +60,8 @@ function buildScenario(itFunc) {
     } else {
       throw new Error("scenario() requires 2 or 3 arguments");
     }
-    return itFunc(testName, async (ctx) => {
-      const testPath = ctx.task.file.filepath;
+    return itFunc(testName, async ({ task }) => {
+      const testPath = task.file.filepath;
       const { scenario } = await loadScenarios(testPath, scenarioName);
       const scenarioData = await seedScenario(scenario);
       try {
@@ -89,8 +89,8 @@ function buildDescribeScenario(describeFunc) {
     }
     return describeFunc(describeBlockName, () => {
       let scenarioData;
-      beforeAll(async (ctx) => {
-        const testPath = ctx.file.filepath;
+      beforeAll(async ({}, suite) => {
+        const testPath = suite.file.filepath;
         const { scenario } = await loadScenarios(testPath, scenarioName);
         scenarioData = await seedScenario(scenario);
       });

package/dist/cjs/api/vitest/CedarApiVitestEnv.js

@@ -38,7 +38,7 @@ var import_project_config = require("@cedarjs/project-config");
 var import_packageManager = require("@cedarjs/project-config/packageManager");
 const CedarApiVitestEnvironment = {
   name: "cedar-api",
-  transformMode: "ssr",
+  viteEnvironment: "ssr",
   async setup() {
     if (process.env.SKIP_DB_PUSH === "1") {
       return {

package/dist/cjs/api/vitest/vite-plugin-cedar-vitest-api-config.js

@@ -50,13 +50,13 @@ function cedarVitestApiConfigPlugin() {
         },
         test: {
           environment: import_node_path.default.join(import_meta.dirname, "CedarApiVitestEnv.js"),
-          // fileParallelism: false,
-          // fileParallelism doesn't work with vitest projects (which is what
-          // we're using in the root vitest.config.ts). As a workaround we set
-          // poolOptions instead, which also shouldn't work, but was suggested
-          // by Vitest team member AriPerkkio (Hiroshi's answer didn't work).
-          // https://github.com/vitest-dev/vitest/discussions/7416
-          poolOptions: { forks: { singleFork: true } },
+          // All api test files share a single test database, so they can't
+          // run in parallel. In Vitest 3 project-level fileParallelism didn't
+          // work (https://github.com/vitest-dev/vitest/discussions/7416) and
+          // we used the now-removed `poolOptions: { forks: { singleFork:
+          // true } }` as a workaround. Vitest 4 removed `poolOptions` and
+          // supports `fileParallelism` in project configs.
+          fileParallelism: false,
           setupFiles: [import_node_path.default.join(import_meta.dirname, "vitest-api.setup.js")]
         }
       };

package/dist/cjs/api/vitest/vitest-api.setup.js

@@ -83,8 +83,8 @@ function buildScenario(itFunc) {
     } else {
       throw new Error("scenario() requires 2 or 3 arguments");
     }
-    return itFunc(testName, async (ctx) => {
-      const testPath = ctx.task.file.filepath;
+    return itFunc(testName, async ({ task }) => {
+      const testPath = task.file.filepath;
       const { scenario } = await loadScenarios(testPath, scenarioName);
       const scenarioData = await seedScenario(scenario);
       try {
@@ -112,8 +112,8 @@ function buildDescribeScenario(describeFunc) {
     }
     return describeFunc(describeBlockName, () => {
       let scenarioData;
-      (0, import_vitest.beforeAll)(async (ctx) => {
-        const testPath = ctx.file.filepath;
+      (0, import_vitest.beforeAll)(async ({}, suite) => {
+        const testPath = suite.file.filepath;
         const { scenario } = await loadScenarios(testPath, scenarioName);
         scenarioData = await seedScenario(scenario);
       });

package/dist/cjs/config/jest/api/apiBabelConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiBabelConfig.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/apiBabelConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAG7B,MAAM,uBAAuB,CAAA;AAS9B,KAAK,UAAU,GAAG,IAAI,CACpB,UAAU,CAAC,OAAO,4BAA4B,CAAC,EAC/C,SAAS,CACV,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,UAMb,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"apiBabelConfig.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/apiBabelConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAG7B,MAAM,uBAAuB,CAAA;AAO9B,KAAK,UAAU,GAAG,IAAI,CACpB,UAAU,CAAC,OAAO,4BAA4B,CAAC,EAC/C,SAAS,CACV,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,UAMb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/dist/cjs/config/jest/api/apiBabelConfig.js

@@ -22,9 +22,7 @@ __export(apiBabelConfig_exports, {
 });
 module.exports = __toCommonJS(apiBabelConfig_exports);
 var import_babel_config = require("@cedarjs/babel-config");
-const { babelrc: _b, ...defaultBabelConfig } = (0, import_babel_config.getApiSideDefaultBabelConfig)({
-  forJest: true
-});
+const { babelrc: _b, ...defaultBabelConfig } = (0, import_babel_config.getApiSideDefaultBabelConfig)();
 const config = {
   ...defaultBabelConfig,
   plugins: (0, import_babel_config.getApiSideBabelPlugins)(),

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

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

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

@@ -35,8 +35,17 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 const rwjsPaths = (0, import_project_config.getPaths)();
-const NODE_MODULES_PATH = import_node_path.default.join(rwjsPaths.base, "node_modules");
-const { babelrc } = (0, import_babel_config.getApiSideDefaultBabelConfig)({ forJest: true });
+const { babelrc } = (0, import_babel_config.getApiSideDefaultBabelConfig)();
+function resolveSubpath(specifier) {
+  try {
+    return require.resolve(specifier, {
+      paths: [rwjsPaths.api.base, rwjsPaths.base]
+    });
+  } catch {
+    return void 0;
+  }
+}
+const testingApiPath = resolveSubpath("@cedarjs/testing/api");
 const config = {
   // To make sure other config option which depends on rootDir use
   // correct path, for example, coverageDirectory
@@ -77,11 +86,34 @@ const config = {
     "^src/(.*)$": import_node_path.default.join(rwjsPaths.api.src, "$1"),
     // @NOTE: Import @cedarjs/testing in api tests, and it automatically remaps to the api side only
     // This is to prevent web stuff leaking into api, and vice versa
-    "^@cedarjs/testing$": import_node_path.default.join(NODE_MODULES_PATH, "@cedarjs/testing/api"),
+    ...testingApiPath ? { "^@cedarjs/testing$": testingApiPath } : {},
     // Support for importing files with extensions (like you'd do in ESM projects)
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
+    // `@cedarjs/context`, `@cedarjs/api`, `@cedarjs/graphql-server`, and
+    // `@cedarjs/storage` are ESM-only. Two things pull them in at the top
+    // level of a generated project's api-side test run: @cedarjs/testing's
+    // own api entry point (which virtually every test imports, for
+    // scenario/mock helpers — pulls in `@cedarjs/context` and
+    // `@cedarjs/graphql-server` via `directive.ts`, and
+    // `@cedarjs/api/webhooks` via `apiFunction.ts`), and the *user's own*
+    // generated code — the `cedar setup uploads` template imports
+    // `@cedarjs/storage`. Jest's CJS runtime can't parse the real ESM these
+    // now emit, so they need the same babel-jest carve-out the web preset
+    // already uses for ESM-only node_modules packages (see jest-preset.ts
+    // on the web side for the fuller explanation of why this is
+    // necessary).
+    "[/\\\\]node_modules[/\\\\]@cedarjs[/\\\\](context|api|graphql-server|storage)[/\\\\].+\\.js$": [
+      "babel-jest",
+      {
+        babelrc: false,
+        configFile: false,
+        presets: [
+          [require.resolve("@babel/preset-env"), { targets: { node: "20" } }]
+        ]
+      }
+    ],
     "\\.[cm]?[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
@@ -95,6 +127,9 @@ const config = {
       }
     ]
   },
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!@cedarjs[/\\\\]context[/\\\\])(?!@cedarjs[/\\\\]api[/\\\\])(?!@cedarjs[/\\\\]graphql-server[/\\\\])(?!@cedarjs[/\\\\]storage[/\\\\])"
+  ],
   testPathIgnorePatterns: [".scenarios.[jt]s$"]
 };
 var jest_preset_default = config;

package/dist/cjs/config/jest/babelPlugins/babel-plugin-redwood-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAA;AAqCtC,UAAU,WAAY,SAAQ,UAAU;IAKtC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,CAAC,OAAO,WAAW,EACvB,KAAK,GACN,EAAE;IACD,KAAK,EAAE,OAAO,CAAC,CAAA;CAChB,GAAG,SAAS,CAAC,WAAW,CAAC,CAkHzB"}
+{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAA;AAsCtC,UAAU,WAAY,SAAQ,UAAU;IAKtC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,CAAC,OAAO,WAAW,EACvB,KAAK,GACN,EAAE;IACD,KAAK,EAAE,OAAO,CAAC,CAAA;CAChB,GAAG,SAAS,CAAC,WAAW,CAAC,CAoHzB"}

package/dist/cjs/config/jest/babelPlugins/babel-plugin-redwood-cell.js

@@ -25,6 +25,7 @@ var import_node_path = require("node:path");
 const EXPECTED_EXPORTS_FROM_CELL = [
   "beforeQuery",
   "QUERY",
+  "FRAGMENT",
   "data",
   "isEmpty",
   "afterQuery",
@@ -70,7 +71,7 @@ function babel_plugin_redwood_cell_default({
           state.hasDefaultExport = false;
         },
         exit(path, state) {
-          const hasQueryOrDataExport = state.exportNames.includes("QUERY") || state.exportNames.includes("data");
+          const hasQueryOrDataExport = state.exportNames.includes("QUERY") || state.exportNames.includes("FRAGMENT") || state.exportNames.includes("data");
           if (state.hasDefaultExport || !hasQueryOrDataExport) {
             return;
           }