@cloudflare/vitest-pool-workers 0.4.5 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -177,9 +177,19 @@ function ensureWorkersConfig(config) {
177
177
  return config;
178
178
  }
179
179
  function defineWorkersConfig(config) {
180
+ if (typeof config === "function") {
181
+ return mapAnyConfigExport(ensureWorkersConfig, config);
182
+ } else if (config instanceof Promise) {
183
+ return mapAnyConfigExport(ensureWorkersConfig, config);
184
+ }
180
185
  return mapAnyConfigExport(ensureWorkersConfig, config);
181
186
  }
182
187
  function defineWorkersProject(config) {
188
+ if (typeof config === "function") {
189
+ return mapAnyConfigExport(ensureWorkersConfig, config);
190
+ } else if (config instanceof Promise) {
191
+ return mapAnyConfigExport(ensureWorkersConfig, config);
192
+ }
183
193
  return mapAnyConfigExport(ensureWorkersConfig, config);
184
194
  }
185
195
  // Annotate the CommonJS export names for ESM import in node:
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/config/index.ts", "../../src/config/d1.ts", "../../src/config/pages.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["import_node_path", "fs", "path", "path", "assert", "crypto", "fs"]
6
6
  }
@@ -1,7 +1,8 @@
1
1
  import type { WorkersPoolOptions } from "../pool/config";
2
2
  import type { Awaitable, inject } from "vitest";
3
3
  import type { ConfigEnv, UserConfig, UserWorkspaceConfig } from "vitest/config";
4
- export type AnyConfigExport<T extends UserConfig> = T | Promise<T> | ((env: ConfigEnv) => T | Promise<T>);
4
+ type ConfigFn<T extends UserConfig> = (env: ConfigEnv) => T | Promise<T>;
5
+ export type AnyConfigExport<T extends UserConfig> = T | Promise<T> | ConfigFn<T>;
5
6
  export interface WorkerPoolOptionsContext {
6
7
  inject: typeof inject;
7
8
  }
@@ -16,7 +17,11 @@ export type WorkersUserConfig<T extends UserConfig> = T & {
16
17
  };
17
18
  export type WorkersUserConfigExport = WorkersUserConfig<UserConfig>;
18
19
  export type WorkersProjectConfigExport = WorkersUserConfig<UserWorkspaceConfig>;
19
- export declare function defineWorkersConfig(config: AnyConfigExport<WorkersUserConfigExport>): AnyConfigExport<WorkersUserConfigExport>;
20
- export declare function defineWorkersProject(config: AnyConfigExport<WorkersProjectConfigExport>): AnyConfigExport<WorkersProjectConfigExport>;
20
+ export declare function defineWorkersConfig(config: WorkersUserConfigExport): WorkersUserConfigExport;
21
+ export declare function defineWorkersConfig(config: Promise<WorkersUserConfigExport>): Promise<WorkersUserConfigExport>;
22
+ export declare function defineWorkersConfig(config: ConfigFn<WorkersUserConfigExport>): ConfigFn<WorkersUserConfigExport>;
23
+ export declare function defineWorkersProject(config: WorkersProjectConfigExport): WorkersProjectConfigExport;
24
+ export declare function defineWorkersProject(config: Promise<WorkersProjectConfigExport>): Promise<WorkersProjectConfigExport>;
25
+ export declare function defineWorkersProject(config: ConfigFn<WorkersProjectConfigExport>): ConfigFn<WorkersProjectConfigExport>;
21
26
  export * from "./d1";
22
27
  export * from "./pages";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudflare/vitest-pool-workers",
3
- "version": "0.4.5",
3
+ "version": "0.4.6",
4
4
  "description": "Workers Vitest integration for writing Vitest unit and integration tests that run inside the Workers runtime",
5
5
  "keywords": [
6
6
  "cloudflare",
@@ -46,11 +46,14 @@
46
46
  "@cloudflare/workers-types": "^4.20240605.0",
47
47
  "@types/node": "20.8.3",
48
48
  "@types/semver": "^7.5.1",
49
+ "@vitest/runner": "1.3.x - 1.5.x",
50
+ "@vitest/snapshot": "1.3.x - 1.5.x",
49
51
  "capnp-ts": "^0.7.0",
50
52
  "capnpc-ts": "^0.7.0",
51
53
  "ts-dedent": "^2.2.0",
52
- "typescript": "^5.4.3",
53
- "undici": "5.28.4",
54
+ "typescript": "^5.4.5",
55
+ "undici": "^5.28.4",
56
+ "vitest": "1.5.0",
54
57
  "@cloudflare/eslint-config-worker": "1.1.0",
55
58
  "@cloudflare/workers-tsconfig": "0.0.0"
56
59
  },
@@ -60,9 +63,9 @@
60
63
  "devalue": "^4.3.0",
61
64
  "esbuild": "0.17.19",
62
65
  "semver": "^7.5.1",
63
- "zod": "^3.20.6",
64
- "miniflare": "3.20240610.0",
65
- "wrangler": "3.60.3"
66
+ "zod": "^3.22.3",
67
+ "miniflare": "3.20240610.1",
68
+ "wrangler": "3.61.0"
66
69
  },
67
70
  "peerDependencies": {
68
71
  "@vitest/runner": "1.3.x - 1.5.x",