Skip to content
Open
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
6 changes: 6 additions & 0 deletions .changeset/fair-apricots-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@sveltejs/adapter-cloudflare": minor
"@sveltejs/adapter-cloudflare-workers": minor
---

feat: atomic builds
Copy link
Member

@teemingc teemingc Oct 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this may be a patch fix instead; it prevents those transient error messages during rebuilds.

27 changes: 21 additions & 6 deletions packages/adapter-cloudflare-workers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
import { posix, dirname } from 'node:path';
import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
import { posix, dirname, basename, join } from 'node:path';
import { execSync } from 'node:child_process';
import esbuild from 'esbuild';
import toml from '@iarna/toml';
Expand Down Expand Up @@ -40,10 +40,19 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
const { main, site, compatibility_flags } = validate_config(builder, config);

const files = fileURLToPath(new URL('./files', import.meta.url).href);
const dest_main = builder.getBuildDirectory(dirname(main) + '-intermediate');
const dest_bucket = builder.getBuildDirectory(site.bucket + '-intermediate');
const final_dest_main = dirname(main);
const final_dest_bucket = site.bucket;
const tmp = builder.getBuildDirectory('cloudflare-workers-tmp');

builder.rimraf(site.bucket);
builder.rimraf(dirname(main));
builder.rimraf(dest_main);
builder.rimraf(dest_bucket);
builder.rimraf(tmp);

builder.mkdirp(dest_main);
builder.mkdirp(dest_bucket);
builder.mkdirp(tmp);

builder.log.info('Installing worker dependencies...');
builder.copy(`${files}/_package.json`, `${tmp}/package.json`);
Expand Down Expand Up @@ -91,7 +100,7 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
sourcemap: 'linked',
target: 'es2022',
entryPoints: [`${tmp}/entry.js`],
outfile: main,
outfile: join(dest_main, basename(main)),
bundle: true,
external,
alias: Object.fromEntries(compatible_node_modules.map((id) => [id, `node:${id}`])),
Expand All @@ -107,6 +116,9 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
logLevel: 'silent'
});

builder.rimraf(final_dest_main);
renameSync(dest_main, final_dest_main);

if (result.warnings.length > 0) {
const formatted = await esbuild.formatMessages(result.warnings, {
kind: 'warning',
Expand Down Expand Up @@ -144,9 +156,12 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
}

builder.log.minor('Copying assets...');
const bucket_dir = `${site.bucket}${builder.config.kit.paths.base}`;
const bucket_dir = `${dest_bucket}${builder.config.kit.paths.base}`;
builder.writeClient(bucket_dir);
builder.writePrerendered(bucket_dir);

builder.rimraf(final_dest_bucket);
renameSync(dest_bucket, final_dest_bucket);
},

async emulate() {
Expand Down
8 changes: 6 additions & 2 deletions packages/adapter-cloudflare/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { existsSync, writeFileSync } from 'node:fs';
import { existsSync, writeFileSync, renameSync } from 'node:fs';
import * as path from 'node:path';
import { fileURLToPath } from 'node:url';
import * as esbuild from 'esbuild';
Expand Down Expand Up @@ -31,7 +31,8 @@ export default function (options = {}) {
}

const files = fileURLToPath(new URL('./files', import.meta.url).href);
const dest = builder.getBuildDirectory('cloudflare');
const dest = builder.getBuildDirectory('cloudflare-intermediate');
const final_dest = builder.getBuildDirectory('cloudflare');
const tmp = builder.getBuildDirectory('cloudflare-tmp');

builder.rimraf(dest);
Expand Down Expand Up @@ -108,6 +109,9 @@ export default function (options = {}) {
logLevel: 'silent'
});

builder.rimraf(final_dest);
renameSync(dest, final_dest);

if (result.warnings.length > 0) {
const formatted = await esbuild.formatMessages(result.warnings, {
kind: 'warning',
Expand Down
Loading