pass validated svelte config to adapters (#1559)

sveltejs · May 26, 2021 · 028abd9 · 028abd9
1 parent eb96322
commit 028abd9
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 9 deletions.
diff --git a/.changeset/smooth-items-march.md b/.changeset/smooth-items-march.md
@@ -0,0 +1,11 @@
+---
+'@sveltejs/adapter-begin': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-static': patch
+'@sveltejs/adapter-vercel': patch
+'@sveltejs/kit': patch
+---
+
+Pass validated svelte config to adapter adapt function
diff --git a/packages/adapter-begin/index.js b/packages/adapter-begin/index.js
@@ -25,7 +25,7 @@ export default function () {
 	const adapter = {
 		name: '@sveltejs/adapter-begin',
 
-		async adapt(utils) {
+		async adapt({ utils }) {
 			utils.log.minor('Parsing app.arc file');
 			const { static: static_mount_point } = parse_arc('app.arc');
 

diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js
@@ -8,7 +8,7 @@ export default function () {
 	/** @type {import('@sveltejs/kit').Adapter} */
 	const adapter = {
 		name: '@sveltejs/adapter-cloudflare-workers',
-		async adapt(utils) {
+		async adapt({ utils }) {
 			const { site } = validate_config(utils);
 
 			const bucket = site.bucket;

diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
@@ -9,7 +9,7 @@ export default function () {
 	const adapter = {
 		name: '@sveltejs/adapter-netlify',
 
-		async adapt(utils) {
+		async adapt({ utils }) {
 			const { publish, functions } = validate_config().build;
 
 			utils.rimraf(publish);

diff --git a/packages/adapter-node/index.js b/packages/adapter-node/index.js
@@ -12,7 +12,7 @@ export default function ({ out = 'build' } = {}) {
 	const adapter = {
 		name: '@sveltejs/adapter-node',
 
-		async adapt(utils) {
+		async adapt({ utils }) {
 			utils.log.minor('Copying assets');
 			const static_directory = join(out, 'assets');
 			utils.copy_client_files(static_directory);

diff --git a/packages/adapter-static/index.js b/packages/adapter-static/index.js
@@ -10,7 +10,7 @@ export default function ({ pages = 'build', assets = pages, fallback = null } =
 	const adapter = {
 		name: '@sveltejs/adapter-static',
 
-		async adapt(utils) {
+		async adapt({ utils }) {
 			utils.copy_static_files(assets);
 			utils.copy_client_files(assets);
 

diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
@@ -8,7 +8,7 @@ export default function () {
 	const adapter = {
 		name: '@sveltejs/adapter-vercel',
 
-		async adapt(utils) {
+		async adapt({ utils }) {
 			const dir = '.vercel_build_output';
 			utils.rimraf(dir);
 

diff --git a/packages/kit/src/core/adapt/index.js b/packages/kit/src/core/adapt/index.js
@@ -14,7 +14,7 @@ export async function adapt(config, build_data, { cwd = process.cwd(), verbose }
 
 	const log = logger({ verbose });
 	const utils = get_utils({ cwd, config, build_data, log });
-	await adapt(utils);
+	await adapt({ utils, config });
 
 	log.success('done');
 }
diff --git a/packages/kit/types/config.d.ts b/packages/kit/types/config.d.ts
@@ -22,7 +22,7 @@ export type AdapterUtils = {
 
 export type Adapter = {
 	name: string;
-	adapt: (utils: AdapterUtils) => Promise<void>;
+	adapt: ({ utils, config }: { utils: AdapterUtils; config: ValidatedConfig }) => Promise<void>;
 };
 
 export type Config = {

diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
@@ -3,7 +3,7 @@
 
 import './ambient-modules';
 
-export { Adapter, AdapterUtils, Config } from './config';
+export { Adapter, AdapterUtils, Config, ValidatedConfig } from './config';
 export { EndpointOutput, RequestHandler } from './endpoint';
 export { ErrorLoad, Load, Page } from './page';
 export {