Skip to content

Commit

Permalink
[fix] clear node output before adapting (#2388)
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatiusmb authored Sep 8, 2021
1 parent d23c8b8 commit 68f39e0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .changeset/shiny-books-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/adapter-node': patch
---

Clear output directory before adapting
18 changes: 10 additions & 8 deletions packages/adapter-node/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ export default function ({
out = 'build',
precompress,
env: { path: path_env = 'SOCKET_PATH', host: host_env = 'HOST', port: port_env = 'PORT' } = {},
esbuild: esbuildConfig
esbuild: esbuild_config
} = {}) {
return {
name: '@sveltejs/adapter-node',

async adapt({ utils, config }) {
utils.rimraf(out);

utils.log.minor('Copying assets');
const static_directory = join(out, 'assets');
utils.copy_client_files(static_directory);
Expand Down Expand Up @@ -69,12 +71,12 @@ export default function ({
APP_DIR: `"/${config.kit.appDir}/"`
}
};
const buildOptions = esbuildConfig ? await esbuildConfig(defaultOptions) : defaultOptions;
await esbuild.build(buildOptions);
const build_options = esbuild_config ? await esbuild_config(defaultOptions) : defaultOptions;
await esbuild.build(build_options);

utils.log.minor('Building SvelteKit reference server');
/** @type {BuildOptions} */
const defaultOptionsRefServer = {
const default_options_ref_server = {
entryPoints: ['.svelte-kit/node/index.js'],
outfile: join(out, 'index.js'),
bundle: true,
Expand All @@ -93,10 +95,10 @@ export default function ({
}
]
};
const buildOptionsRefServer = esbuildConfig
? await esbuildConfig(defaultOptionsRefServer)
: defaultOptionsRefServer;
await esbuild.build(buildOptionsRefServer);
const build_options_ref_server = esbuild_config
? await esbuild_config(default_options_ref_server)
: default_options_ref_server;
await esbuild.build(build_options_ref_server);

utils.log.minor('Prerendering static pages');
await utils.prerender({
Expand Down

0 comments on commit 68f39e0

Please sign in to comment.