Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first crack at adapter-auto #2867

Merged
merged 12 commits into from
Nov 23, 2021
Merged
Show file tree
Hide file tree
Changes from 6 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/popular-schools-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@sveltejs/adapter-auto': patch
'create-svelte': patch
---

Add adapter-auto
2 changes: 2 additions & 0 deletions packages/adapter-auto/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.DS_Store
node_modules
13 changes: 13 additions & 0 deletions packages/adapter-auto/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# adapter-auto

Automatically chooses the adapter for your current environment, if possible.

## Supported environments

- [Cloudflare Pages](https://developers.cloudflare.com/pages/) via [adapter-cloudflare](../adapter-cloudflare)
- [Netlify](https://netlify.com/) via [adapter-netlify](../adapter-netlify)
- [Vercel](https://vercel.com/) via [adapter-vercel](../adapter-vercel)

## Changelog

[The Changelog for this package is available on GitHub](https://github.com/sveltejs/kit/blob/master/packages/adapter-auto/CHANGELOG.md).
4 changes: 4 additions & 0 deletions packages/adapter-auto/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { Adapter } from '@sveltejs/kit';

declare function plugin(): Adapter;
export = plugin;
38 changes: 38 additions & 0 deletions packages/adapter-auto/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
const adapters = [
{
test: () => !!process.env.VERCEL,
module: '@sveltejs/adapter-vercel'
},
{
test: () => !!process.env.NETLIFY,
module: '@sveltejs/adapter-netlify'
},
{
test: () => !!process.env.CF_PAGES,
module: '@sveltejs/adapter-cloudflare'
}
];

/** @type {import('.')} **/
export default function () {
return {
name: '@sveltejs/adapter-auto',

async adapt(options) {
for (const candidate of adapters) {
if (candidate.test()) {
options.utils.log.info(`Detected support for ${candidate.module}`);

const module = await import(candidate.module);
const adapter = module.default();

return adapter.adapt(options);
}
}

options.utils.log.warn(
'Could not detect production environment. You may need to install an adapter. See https://kit.svelte.dev/docs#adapters for more information'
);
}
};
}
32 changes: 32 additions & 0 deletions packages/adapter-auto/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "@sveltejs/adapter-auto",
"version": "1.0.0-next",
"repository": {
"type": "git",
"url": "https://github.com/sveltejs/kit",
"directory": "packages/adapter-auto"
},
"homepage": "https://kit.svelte.dev",
"type": "module",
"exports": {
".": {
"import": "./index.js"
},
"./package.json": "./package.json"
},
"main": "index.js",
"types": "index.d.ts",
"files": [
"files",
"index.d.ts"
],
"scripts": {
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
},
"dependencies": {
Rich-Harris marked this conversation as resolved.
Show resolved Hide resolved
"@sveltejs/adapter-netlify": "workspace:*",
"@sveltejs/adapter-vercel": "workspace:*"
}
}
2 changes: 2 additions & 0 deletions packages/create-svelte/templates/default/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ node_modules
/.svelte-kit
/package
.env
.vercel
.output
6 changes: 2 additions & 4 deletions packages/create-svelte/templates/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
"start": "svelte-kit start"
},
"devDependencies": {
"@sveltejs/adapter-cloudflare-workers": "next",
"@sveltejs/adapter-netlify": "next",
"@sveltejs/adapter-vercel": "next",
"@sveltejs/kit": "next",
"@sveltejs/adapter-auto": "workspace:*",
"@sveltejs/kit": "workspace:*",
"svelte": "^3.44.0",
"svelte-preprocess": "^4.9.8",
"typescript": "^4.4.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"preview": "svelte-kit preview"
},
"devDependencies": {
"@sveltejs/adapter-auto": "workspace:*",
"@sveltejs/kit": "workspace:*",
"svelte": "^3.34.0"
},
Expand Down
10 changes: 3 additions & 7 deletions packages/create-svelte/templates/default/svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
import adapter from '@sveltejs/adapter-auto';
import preprocess from 'svelte-preprocess';

const adapter = process.env.ADAPTER;
const options = JSON.parse(process.env.OPTIONS || '{}');

/** @type {import('@sveltejs/kit').Config} */
const config = {
// Consult https://github.com/sveltejs/svelte-preprocess
// for more information about preprocessors
preprocess: preprocess(),

kit: {
adapter: adapter(),

// hydrate the <div id="svelte"> element in src/app.html
target: '#svelte'
}
};

if (adapter) {
config.kit.adapter = (await import(adapter)).default(options);
}

export default config;
7 changes: 2 additions & 5 deletions packages/create-svelte/templates/skeleton/svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import node from '@sveltejs/adapter-node';
import adapter from '@sveltejs/adapter-auto';

/** @type {import('@sveltejs/kit').Config} */
const config = {
kit: {
// By default, `npm run build` will create a standard Node app.
// You can create optimized builds for different platforms by
// specifying a different adapter
adapter: node(),
adapter: adapter(),

// hydrate the <div id="svelte"> element in src/app.html
target: '#svelte'
Expand Down
24 changes: 14 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.