Move tests

fixtures/asset-config/html-handling.test.ts → packages/workers-shared/asset-worker/tests/html-handling.test.ts

@@ -1,16 +1,16 @@
 import { SELF } from "cloudflare:test";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { applyConfigurationDefaults } from "../../packages/workers-shared/asset-worker/src/configuration";
-import Worker from "../../packages/workers-shared/asset-worker/src/index";
-import { getAssetWithMetadataFromKV } from "../../packages/workers-shared/asset-worker/src/utils/kv";
+import { applyConfigurationDefaults } from "../src/configuration";
+import Worker from "../src/index";
+import { getAssetWithMetadataFromKV } from "../src/utils/kv";
 import { encodingTestCases } from "./test-cases/encoding-test-cases";
 import { htmlHandlingTestCases } from "./test-cases/html-handling-test-cases";
-import type { AssetMetadata } from "../../packages/workers-shared/asset-worker/src/utils/kv";
+import type { AssetMetadata } from "../src/utils/kv";
 
 const IncomingRequest = Request<unknown, IncomingRequestCfProperties>;
 
-vi.mock("../../packages/workers-shared/asset-worker/src/utils/kv.ts");
-vi.mock("../../packages/workers-shared/asset-worker/src/configuration");
+vi.mock("../src/utils/kv.ts");
+vi.mock("../src/configuration");
 const existsMock = (fileList: Set<string>) => {
 	vi.spyOn(Worker.prototype, "unstable_exists").mockImplementation(
 		async (pathname: string) => {
@@ -22,14 +22,6 @@ const existsMock = (fileList: Set<string>) => {
 };
 const BASE_URL = "http://example.com";
 
-export type TestCase = {
-	title: string;
-	files: string[];
-	requestPath: string;
-	matchedFile?: string;
-	finalPath?: string;
-};
-
 const testSuites = [
 	{
 		title: "htmlHanding options",

fixtures/asset-config/test-cases/encoding-test-cases.ts → packages/workers-shared/asset-worker/tests/test-cases/encoding-test-cases.ts

@@ -1,4 +1,4 @@
-import { TestCase } from "../html-handling.test";
+import { TestCase } from "./test-case";
 
 export const encodingTestCases: {
 	html_handling:

fixtures/asset-config/test-cases/html-handling-test-cases.ts → packages/workers-shared/asset-worker/tests/test-cases/html-handling-test-cases.ts

@@ -1,4 +1,4 @@
-import { TestCase } from "../html-handling.test";
+import { TestCase } from "./test-case";
 
 export const htmlHandlingTestCases: {
 	html_handling:

packages/workers-shared/asset-worker/tests/test-cases/test-case.ts

@@ -0,0 +1,7 @@
+export type TestCase = {
+	title: string;
+	files: string[];
+	requestPath: string;
+	matchedFile?: string;
+	finalPath?: string;
+};

packages/workers-shared/asset-worker/tests/tsconfig.json

@@ -6,5 +6,5 @@
 			"@cloudflare/vitest-pool-workers"
 		]
 	},
-	"include": ["**/*.test.ts"]
+	"include": ["**/*.ts"]
 }

packages/workers-shared/package.json

@@ -29,16 +29,17 @@
 		"bundle:router-worker": "esbuild router-worker/src/index.ts --format=esm --bundle --outfile=dist/router-worker.mjs --sourcemap=external",
 		"bundle:router-worker:prod": "pnpm run bundle:router-worker --minify",
 		"check:lint": "eslint . --max-warnings=0",
-		"check:type": "tsc -p ./tsconfig.json && tsc -p ./tsconfig.node.json",
+		"check:type": "pnpm run check:type:package && pnpm run check:type:asset-worker && pnpm run check:type:router-worker",
 		"check:type:asset-worker": "tsc -p ./asset-worker/tsconfig.json && tsc -p ./asset-worker/tests/tsconfig.json",
+		"check:type:package": "tsc -p ./tsconfig.json && tsc -p ./tsconfig.node.json",
 		"check:type:router-worker": "tsc -p ./router-worker/tsconfig.json && tsc -p ./router-worker/tests/tsconfig.json",
 		"clean": "rimraf dist",
 		"deploy": "pnpm run deploy:router-worker && pnpm run deploy:asset-worker",
 		"deploy:asset-worker": "CLOUDFLARE_API_TOKEN=$WORKERS_DEPLOY_AND_CONFIG_CLOUDFLARE_API_TOKEN pnpx wrangler versions upload --experimental-versions -c asset-worker/wrangler.toml",
 		"deploy:router-worker": "CLOUDFLARE_API_TOKEN=$WORKERS_DEPLOY_AND_CONFIG_CLOUDFLARE_API_TOKEN pnpx wrangler versions upload --experimental-versions -c router-worker/wrangler.toml",
 		"dev": "pnpm run clean && concurrently -n bundle:asset-worker,bundle:router-worker -c blue,magenta \"pnpm run bundle:asset-worker --watch\" \"pnpm run bundle:router-worker --watch\"",
-		"test": "vitest",
-		"test:ci": "vitest run",
+		"test": "vitest -c asset-worker/vitest.config.mts",
+		"test:ci": "vitest run -c asset-worker/vitest.config.mts",
 		"types:emit": "tsc index.ts --declaration --emitDeclarationOnly --declarationDir ./dist"
 	},
 	"dependencies": {

packages/workers-shared/tsconfig.json

@@ -4,14 +4,14 @@
 		"lib": ["es2021"],
 		"module": "es2022",
 		"moduleResolution": "Bundler",
-		"types": ["@cloudflare/workers-types/experimental"],
+		"types": ["@cloudflare/workers-types/experimental", "@types/node"],
 		"noEmit": true,
 		"isolatedModules": true,
 		"allowSyntheticDefaultImports": true,
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true
 	},
-	"include": ["**/*.ts"],
+	"include": ["utils/*.ts"],
 	"exclude": ["scripts/**"]
 }