Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions packages/void/src/cli/package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import type {
WebSocketManifestMeta,
} from "./types";
import type { WebSocketRouteDefinition } from "../router/websocket";
import { toSlash } from "../shared/utils";

/**
* Compute a CF-compatible asset hash: SHA-256, first 32 hex chars.
Expand Down Expand Up @@ -41,7 +42,7 @@ export function collectAndHashAssets(dir: string): {
try {
const files = collectFiles(dir);
for (const filePath of files) {
const relativePath = "/" + relative(dir, filePath);
const relativePath = "/" + toSlash(relative(dir, filePath));
const content = readFileSync(filePath);
assetManifest[relativePath] = {
hash: computeAssetHash(content),
Expand Down Expand Up @@ -223,7 +224,7 @@ export function packageBuild(
const workerDir = join(distDir, workerDirName);
const workerFiles = collectFiles(workerDir);
for (const filePath of workerFiles) {
const relativePath = relative(workerDir, filePath);
const relativePath = toSlash(relative(workerDir, filePath));
if (!isWorkerModule(relativePath)) continue;
const content = readFileSync(filePath);
formData.append(`worker:${relativePath}`, new Blob([content]), relativePath);
Expand All @@ -234,7 +235,7 @@ export function packageBuild(
try {
const clientFiles = collectFiles(clientDir);
for (const filePath of clientFiles) {
const relativePath = relative(clientDir, filePath);
const relativePath = toSlash(relative(clientDir, filePath));
if (neededAssets && !neededAssets.has("/" + relativePath)) continue;
const content = readFileSync(filePath);
formData.append(`asset:${relativePath}`, new Blob([content]), relativePath);
Expand Down Expand Up @@ -286,7 +287,7 @@ export function packageStaticBuild(

const files = collectFiles(outputDir);
for (const filePath of files) {
const relativePath = relative(outputDir, filePath);
const relativePath = toSlash(relative(outputDir, filePath));
if (neededAssets && !neededAssets.has("/" + relativePath)) continue;
const content = readFileSync(filePath);
formData.append(`asset:${relativePath}`, new Blob([content]), relativePath);
Expand Down Expand Up @@ -396,7 +397,7 @@ export function packageFrameworkBuild(opts: {
// Worker files
const workerFiles = collectFiles(opts.workerDir);
for (const filePath of workerFiles) {
const relativePath = relative(opts.workerDir, filePath);
const relativePath = toSlash(relative(opts.workerDir, filePath));
if (!isWorkerModule(relativePath)) continue;
const content = readFileSync(filePath);
formData.append(`worker:${relativePath}`, new Blob([content]), relativePath);
Expand All @@ -408,7 +409,7 @@ export function packageFrameworkBuild(opts: {
for (const filePath of assetFiles) {
// Skip worker files when workerDir overlaps with assetsDir
if (isOverlap && filePath.replace(/\\/g, "/").startsWith(workerDirNorm)) continue;
const relativePath = relative(opts.assetsDir, filePath);
const relativePath = toSlash(relative(opts.assetsDir, filePath));
if (opts.neededAssets && !opts.neededAssets.has("/" + relativePath)) continue;
const content = readFileSync(filePath);
formData.append(`asset:${relativePath}`, new Blob([content]), relativePath);
Expand Down
15 changes: 15 additions & 0 deletions packages/void/src/shared/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { posix } from "node:path";

export const isWindows: boolean = typeof process !== "undefined" && process.platform === "win32";

export function slash(p: string): string {
return p.replace(/\\/g, "/");
}

export function toSlash(p: string): string {
return isWindows ? slash(p) : p;
}

export function normalizePath(id: string): string {
return posix.normalize(toSlash(id));
}
Loading