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

Feat: async load config esm #35

Merged
merged 8 commits into from
Apr 27, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/blue-schools-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': minor
---

Feature: Support esm in svelte.config.js and svelte.config.mjs
5 changes: 5 additions & 0 deletions .changeset/little-plums-grab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': minor
---

Feature: add configFile option
2 changes: 1 addition & 1 deletion .ncurc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
packageFile: ['package.json', 'packages/**/package.json'],
reject: ['husky']
reject: ['husky', 'esbuild', 'slash']
};
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@
"release": "pnpm run build && pnpx --no changeset publish"
},
"devDependencies": {
"@changesets/changelog-github": "^0.3.0",
"@changesets/cli": "^2.15.0",
"@microsoft/api-extractor": "^7.13.2",
"@types/fs-extra": "^9.0.10",
"@changesets/changelog-github": "^0.4.0",
"@changesets/cli": "^2.16.0",
"@microsoft/api-extractor": "^7.14.0",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.37",
"@types/semver": "^7.3.4",
"@typescript-eslint/eslint-plugin": "^4.20.0",
"@typescript-eslint/parser": "^4.20.0",
"chalk": "^4.1.0",
"@types/node": "^14.14.41",
"@types/semver": "^7.3.5",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"chalk": "^4.1.1",
"cross-env": "^7.0.3",
"enquirer": "^2.3.6",
"esbuild": "~0.9.7",
"eslint": "^7.23.0",
"eslint-config-prettier": "^8.1.0",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-html": "^6.1.2",
"eslint-plugin-jest": "^24.3.3",
"eslint-plugin-markdown": "^2.0.0",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-markdown": "^2.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-svelte3": "^3.1.2",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-svelte3": "^3.2.0",
"execa": "^5.0.0",
"fs-extra": "^9.1.0",
"husky": "^4.3.8",
Expand All @@ -57,23 +57,23 @@
"lint-staged": "^10.5.4",
"minimist": "^1.2.5",
"node-fetch": "^2.6.1",
"npm-check-updates": "^11.3.0",
"npm-check-updates": "^11.5.1",
"npm-run-all": "^4.1.5",
"playwright-core": "^1.10.0",
"pnpm": "^6.0.1",
"pnpm": "^6.2.1",
"prettier": "^2.2.1",
"prettier-plugin-svelte": "^2.2.0",
"rimraf": "^3.0.2",
"semver": "^7.3.5",
"sirv": "^1.0.11",
"slash": "^3.0.0",
"stylelint": "^13.12.0",
"stylelint": "^13.13.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-recommended": "^4.0.0",
"stylelint-config-recommended": "^5.0.0",
"svelte": "^3.37.0",
"ts-jest": "^26.5.4",
"typescript": "^4.2.3",
"vite": "^2.1.5"
"ts-jest": "^26.5.5",
"typescript": "^4.2.4",
"vite": "^2.2.3"
},
"husky": {
"hooks": {
Expand Down
8 changes: 4 additions & 4 deletions packages/playground/autoprefixer-browerslist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"autoprefixer": "^10.2.5",
"postcss": "^8.2.9",
"postcss": "^8.2.12",
"postcss-load-config": "^3.0.1",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.0",
"svelte-preprocess": "^4.7.0",
"vite": "^2.1.5"
"svelte-hmr": "^0.14.2",
"svelte-preprocess": "^4.7.2",
"vite": "^2.2.3"
}
}
4 changes: 2 additions & 2 deletions packages/playground/big/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.0",
"vite": "^2.1.5"
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3"
}
}
4 changes: 4 additions & 0 deletions packages/playground/configfile-custom/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/node_modules/
/public/build/

.DS_Store
10 changes: 10 additions & 0 deletions packages/playground/configfile-custom/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# default svelte app template

Created with `npx degit sveltejs/template`

adapted to vite by moving index.html to root and replacing rollup config with vite

use pnpm

`pnpm dev` starts dev server
`pnpm build` builds for production
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
it('should load config and work', async () => {
expect(await page.textContent('h1')).toMatch('Hello world!');
});
13 changes: 13 additions & 0 deletions packages/playground/configfile-custom/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />

<title>Svelte app</title>

<script type="module" src="/src/main.js"></script>
</head>

<body></body>
</html>
19 changes: 19 additions & 0 deletions packages/playground/configfile-custom/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "playground-configfile-custom",
"private": true,
"version": "1.0.0",
"scripts": {
"build": "vite build",
"dev": "vite"
},
"dependencies": {
"playground-hmr-test-dependency": "workspace:*"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"svelte-preprocess": "^4.7.2",
"vite": "^2.2.3"
}
}
12 changes: 12 additions & 0 deletions packages/playground/configfile-custom/src/App.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<script>
import Dependency from 'playground-hmr-test-dependency';
</script>

<h1>Hello world!</h1>
<Dependency />

<style>
h1 {
color: #ff3e00;
}
</style>
7 changes: 7 additions & 0 deletions packages/playground/configfile-custom/src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import App from './App.svelte';

const app = new App({
target: document.body
});

export default app;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const sveltePreprocess = require('svelte-preprocess');

module.exports = {
preprocess: sveltePreprocess()
};
10 changes: 10 additions & 0 deletions packages/playground/configfile-custom/svelte.config.custom.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
const sveltePreprocess = require('svelte-preprocess');

module.exports = {
preprocess: sveltePreprocess()
};
*/
export default {
emitCss: true
}
12 changes: 12 additions & 0 deletions packages/playground/configfile-custom/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const svelte = require('@sveltejs/vite-plugin-svelte');
const { defineConfig } = require('vite');

module.exports = defineConfig(({ command, mode }) => {
const isProduction = mode === 'production';
return {
plugins: [svelte({ configFile: 'svelte.config.custom.cjs' })],
build: {
minify: isProduction
}
};
});
4 changes: 4 additions & 0 deletions packages/playground/configfile-esm/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/node_modules/
/public/build/

.DS_Store
10 changes: 10 additions & 0 deletions packages/playground/configfile-esm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# default svelte app template

Created with `npx degit sveltejs/template`

adapted to vite by moving index.html to root and replacing rollup config with vite

use pnpm

`pnpm dev` starts dev server
`pnpm build` builds for production
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// unfortunately this test does not work as jest is not fully compatible with esm
// wait for jest 27 and see https://github.com/facebook/jest/issues/9430
it('should load config and work', async () => {
expect(await page.textContent('h1')).toMatch('Hello world!');
});
13 changes: 13 additions & 0 deletions packages/playground/configfile-esm/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />

<title>Svelte app</title>

<script type="module" src="/src/main.js"></script>
</head>

<body></body>
</html>
20 changes: 20 additions & 0 deletions packages/playground/configfile-esm/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "playground-configfile-esm",
"private": true,
"version": "1.0.0",
"scripts": {
"build": "vite build",
"dev": "vite"
},
"dependencies": {
"playground-hmr-test-dependency": "workspace:*"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"svelte-preprocess": "^4.7.2",
"vite": "^2.2.3"
},
"type": "module"
}
12 changes: 12 additions & 0 deletions packages/playground/configfile-esm/src/App.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<script>
import Dependency from 'playground-hmr-test-dependency';
</script>

<h1>Hello world!</h1>
<Dependency />

<style>
h1 {
color: #ff3e00;
}
</style>
7 changes: 7 additions & 0 deletions packages/playground/configfile-esm/src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import App from './App.svelte';

const app = new App({
target: document.body
});

export default app;
5 changes: 5 additions & 0 deletions packages/playground/configfile-esm/svelte.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import sveltePreprocess from 'svelte-preprocess';

export default {
preprocess: sveltePreprocess()
};
12 changes: 12 additions & 0 deletions packages/playground/configfile-esm/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import svelte from '@sveltejs/vite-plugin-svelte';
import { defineConfig } from 'vite';

export default defineConfig(({ command, mode }) => {
const isProduction = mode === 'production';
return {
plugins: [svelte()],
build: {
minify: isProduction
}
};
});
12 changes: 6 additions & 6 deletions packages/playground/default-svelte-template-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"@sveltejs/vite-plugin-svelte": "workspace:*",
"@tsconfig/svelte": "^1.0.10",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.0",
"vite": "^2.1.5",
"svelte-check": "^1.3.0",
"svelte-preprocess": "^4.7.0",
"typescript": "^4.2.3",
"tslib": "^2.1.0"
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3",
"svelte-check": "^1.5.1",
"svelte-preprocess": "^4.7.2",
"typescript": "^4.2.4",
"tslib": "^2.2.0"
}
}
4 changes: 2 additions & 2 deletions packages/playground/default-svelte-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.0",
"vite": "^2.1.5"
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3"
}
}
4 changes: 2 additions & 2 deletions packages/playground/hmr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.0",
"vite": "^2.1.5",
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3",
"node-fetch": "^2.6.1"
}
}
2 changes: 1 addition & 1 deletion packages/playground/kit-node/__tests__/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports.serve = async function serve(root, isProd) {
try {
const serverProcess = execa(
'svelte-kit',
[isProd ? 'start' : 'dev', '--port', isProd ? '3200' : '3201'],
[isProd ? 'preview' : 'dev', '--port', isProd ? '3200' : '3201'],
{
preferLocal: true,
cwd: root,
Expand Down
10 changes: 5 additions & 5 deletions packages/playground/kit-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"scripts": {
"dev": "svelte-kit dev",
"build": "svelte-kit build",
"start": "svelte-kit start"
"preview": "svelte-kit preview"
},
"devDependencies": {
"@sveltejs/adapter-node": "^1.0.0-next.12",
"@sveltejs/kit": "^1.0.0-next.71",
"svelte": "^3.29.0",
"vite": "^2.1.0"
"@sveltejs/adapter-node": "^1.0.0-next.16",
"@sveltejs/kit": "^1.0.0-next.88",
"svelte": "^3.37.0",
"vite": "^2.2.3"
},
"type": "module",
"engines": {
Expand Down