Skip to content

Commit 09c51e9

Browse files
bluwybluwy
committed
chore: merge main
2 parents 417a6fb + 85fc8e6 commit 09c51e9

File tree

49 files changed

+540
-438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+540
-438
lines changed

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"prepare": "husky install"
1919
},
2020
"devDependencies": {
21-
"@changesets/cli": "^2.23.0",
21+
"@changesets/cli": "^2.23.1",
2222
"@svitejs/changesets-changelog-github-compact": "^0.1.1",
2323
"@types/fs-extra": "^9.0.13",
2424
"@types/node": "^17.0.36",
2525
"@types/semver": "^7.3.10",
26-
"@typescript-eslint/eslint-plugin": "^5.30.4",
27-
"@typescript-eslint/parser": "^5.30.4",
26+
"@typescript-eslint/eslint-plugin": "^5.30.5",
27+
"@typescript-eslint/parser": "^5.30.5",
2828
"cross-env": "^7.0.3",
29-
"esbuild": "^0.14.48",
29+
"esbuild": "^0.14.49",
3030
"eslint": "^8.19.0",
3131
"eslint-config-prettier": "^8.5.0",
3232
"eslint-plugin-html": "^6.2.0",
@@ -40,14 +40,14 @@
4040
"lint-staged": "^13.0.3",
4141
"node-fetch": "^3.2.4",
4242
"npm-run-all": "^4.1.5",
43-
"playwright-core": "^1.23.1",
43+
"playwright-core": "^1.23.2",
4444
"prettier": "^2.7.1",
4545
"prettier-plugin-svelte": "^2.7.0",
4646
"rimraf": "^3.0.2",
47-
"svelte": "^3.48.0",
47+
"svelte": "^3.49.0",
4848
"typescript": "^4.7.4",
4949
"vite": "^3.0.0-beta.9",
50-
"vitest": "^0.17.0"
50+
"vitest": "^0.18.0"
5151
},
5252
"lint-staged": {
5353
"*.{js,ts,svelte,html,md,svx}": "eslint --fix",

‎packages/e2e-tests/autoprefixer-browerslist/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"autoprefixer": "^10.4.7",
1616
"postcss": "^8.4.14",
1717
"postcss-load-config": "^4.0.1",
18-
"svelte": "^3.48.0",
18+
"svelte": "^3.49.0",
1919
"svelte-preprocess": "^4.10.7",
2020
"vite": "^3.0.0-beta.9"
2121
},

‎packages/e2e-tests/configfile-custom/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
15-
"svelte": "^3.48.0",
15+
"svelte": "^3.49.0",
1616
"vite": "^3.0.0-beta.9"
1717
},
1818
"type": "module"

‎packages/e2e-tests/configfile-esm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
15-
"svelte": "^3.48.0",
15+
"svelte": "^3.49.0",
1616
"svelte-preprocess": "^4.10.7",
1717
"vite": "^3.0.0-beta.9"
1818
},

‎packages/e2e-tests/custom-extensions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
12-
"svelte": "^3.48.0",
12+
"svelte": "^3.9.0",
1313
"vite": "^3.0.0-beta.9"
1414
},
1515
"type": "module"

‎packages/e2e-tests/env/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
12-
"svelte": "^3.48.0",
12+
"svelte": "^3.49.0",
1313
"vite": "^3.0.0-beta.9"
1414
},
1515
"type": "module"

‎packages/e2e-tests/hmr/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
1515
"e2e-test-dep-vite-plugins": "workspace:*",
1616
"node-fetch": "^3.2.4",
17-
"svelte": "^3.48.0",
17+
"svelte": "^3.49.0",
1818
"vite": "^3.0.0-beta.9"
1919
},
2020
"type": "module"

‎packages/e2e-tests/inspector-kit/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
"private": true,
44
"version": "0.0.0",
55
"scripts": {
6-
"dev": "svelte-kit dev",
7-
"build": "svelte-kit build",
6+
"dev": "svelte-kit sync && vite dev",
7+
"build": "svelte-kit sync && vite build",
88
"package": "svelte-kit package",
9-
"preview": "svelte-kit preview"
9+
"preview": "vite preview"
1010
},
1111
"devDependencies": {
12-
"@sveltejs/kit": "^1.0.0-next.357",
13-
"svelte": "^3.48.0"
12+
"@sveltejs/kit": "^1.0.0-next.370",
13+
"svelte": "^3.49.0",
14+
"vite": "^2.9.14"
1415
},
1516
"type": "module"
1617
}

‎packages/e2e-tests/inspector-kit/vite.config.js

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// eslint-disable-next-line node/no-missing-import
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
server: {
7+
watch: {
8+
// During tests we edit the files too fast and sometimes chokidar
9+
// misses change events, so enforce polling for consistency
10+
usePolling: true,
11+
interval: 100
12+
}
13+
},
14+
plugins: [sveltekit()]
15+
};
16+
17+
export default config;

‎packages/e2e-tests/inspector-vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:*",
13-
"svelte": "^3.48.0",
13+
"svelte": "^3.49.0",
1414
"vite": "^3.0.0-beta.9"
1515
}
1616
}

‎packages/e2e-tests/kit-node/.gitignore

+8-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
!.env
1+
.DS_Store
2+
node_modules
3+
/build
4+
/.svelte-kit
5+
/package
6+
#.env
7+
.env.*
8+
!.env.example

‎packages/e2e-tests/kit-node/__tests__/kit.spec.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('kit-node', () => {
3232
expect(await page.$eval('#mount', (e) => e['__initialNode'])).toBe(true);
3333

3434
// also get page as text to confirm
35-
const html = await fetchPageText();
35+
const html = await fetchPageText(true);
3636
expect(html).toMatch('Hello world!');
3737
expect(html).toMatch('SERVER_LOADED');
3838
expect(html).toMatch('BEFORE_MOUNT');
@@ -101,9 +101,7 @@ describe('kit-node', () => {
101101
});
102102
it('should include dynamic import from onmount in client output', async () => {
103103
const clientManifest = JSON.parse(
104-
readFileContent(
105-
path.join('.svelte-kit', 'output', 'client', '_app', 'immutable', 'manifest.json')
106-
)
104+
readFileContent(path.join('.svelte-kit', 'output', 'client', '_app', 'manifest.json'))
107105
);
108106
const includesClientOnlyModule = Object.keys(clientManifest).some((key: string) =>
109107
key.includes('client-only-module')

‎packages/e2e-tests/kit-node/package.json

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
{
22
"name": "e2e-tests-kit-node",
3-
"private": true,
43
"version": "0.0.0",
4+
"private": true,
55
"scripts": {
6-
"dev": "svelte-kit dev",
7-
"build": "svelte-kit build",
6+
"dev": "svelte-kit sync && vite dev",
7+
"build": "svelte-kit sync && vite build",
88
"package": "svelte-kit package",
9-
"preview": "svelte-kit preview",
9+
"preview": "vite preview",
1010
"prepare": "svelte-kit sync",
1111
"check": "svelte-check --tsconfig ./jsconfig.json",
1212
"check:watch": "svelte-check --tsconfig ./jsconfig.json --watch"
1313
},
1414
"devDependencies": {
15-
"@sveltejs/adapter-node": "^1.0.0-next.78",
16-
"@sveltejs/kit": "^1.0.0-next.357",
15+
"@sveltejs/adapter-node": "^1.0.0-next.79",
16+
"@sveltejs/kit": "^1.0.0-next.370",
1717
"e2e-test-dep-svelte-api-only": "workspace:*",
1818
"e2e-test-dep-vite-plugins": "workspace:*",
19-
"svelte": "^3.48.0",
20-
"svelte-check": "^2.8.0",
19+
"svelte": "^3.49.0",
20+
"svelte-check": "^2.7.1",
2121
"svelte-i18n": "^3.4.0",
22-
"typescript": "^4.7.4"
22+
"typescript": "^4.7.4",
23+
"vite": "^2.9.14"
2324
},
24-
"type": "module",
25-
"engines": {
26-
"node": "^14.13.1 || >= 16"
27-
}
25+
"type": "module"
2826
}

‎packages/e2e-tests/kit-node/src/app.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="icon" href="/favicon.ico" />
5+
<link rel="icon" href="/favicon.png" />
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77
%sveltekit.head%
88
</head>

‎packages/e2e-tests/kit-node/src/routes/index.svelte

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* @type {import('@sveltejs/kit').Load}
44
*/
55
export async function load() {
6-
if (globalThis.window) {
6+
// eslint-disable-next-line node/no-unsupported-features/es-builtins
7+
if (globalThis?.window) {
78
// delay load on client so we can test hydration with playwright
89
return new Promise((resolve) =>
910
setTimeout(() => {

‎packages/e2e-tests/kit-node/static/favicon.ico

-1.12 KB
Binary file not shown.

‎packages/e2e-tests/kit-node/static/favicon.png

1.53 KB
Loading

‎packages/e2e-tests/kit-node/static/robots.txt

-3
This file was deleted.

‎packages/e2e-tests/kit-node/svelte.config.js

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,10 @@
11
import node from '@sveltejs/adapter-node';
2-
import { transformValidation } from 'e2e-test-dep-vite-plugins';
32

43
/** @type {import('@sveltejs/kit').Config} */
54
const config = {
65
kit: {
7-
// By default, `npm run build` will create a standard Node app.
8-
// You can create optimized builds for different platforms by
9-
// specifying a different adapter
10-
adapter: node(),
11-
12-
vite: {
13-
ssr: {
14-
// TODO this is needed otherwise tests fail. investigate
15-
noExternal: ['e2e-test-dep-svelte-api-only']
16-
},
17-
server: {
18-
watch: {
19-
// During tests we edit the files too fast and sometimes chokidar
20-
// misses change events, so enforce polling for consistency
21-
usePolling: true,
22-
interval: 100
23-
}
24-
},
25-
plugins: [transformValidation()]
26-
}
6+
adapter: node()
277
}
288
};
9+
2910
export default config;

‎packages/e2e-tests/kit-node/vite.config.js

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// eslint-disable-next-line node/no-missing-import
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
import { transformValidation } from 'e2e-test-dep-vite-plugins';
4+
5+
/** @type {import('vite').UserConfig} */
6+
const config = {
7+
server: {
8+
watch: {
9+
// During tests we edit the files too fast and sometimes chokidar
10+
// misses change events, so enforce polling for consistency
11+
usePolling: true,
12+
interval: 100
13+
}
14+
},
15+
ssr: {
16+
// TODO this is needed otherwise tests fail. investigate
17+
noExternal: ['e2e-test-dep-svelte-api-only']
18+
},
19+
plugins: [transformValidation(), sveltekit()]
20+
};
21+
22+
export default config;

‎packages/e2e-tests/package-json-svelte-field/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@sveltejs/vite-plugin-svelte": "workspace:*",
16-
"svelte": "^3.48.0",
16+
"svelte": "^3.49.0",
1717
"vite": "^3.0.0-beta.9"
1818
},
1919
"type": "module"

‎packages/e2e-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"devDependencies": {
66
"css-color-names": "^1.0.1",
77
"tree-kill": "^1.2.2",
8-
"vitest": "^0.17.0"
8+
"vitest": "^0.18.0"
99
},
1010
"type": "module"
1111
}

‎packages/e2e-tests/preprocess-with-vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
1212
"sass": "^1.53.0",
1313
"stylus": "^0.58.1",
14-
"svelte": "^3.48.0",
14+
"svelte": "^3.49.0",
1515
"vite": "^3.0.0-beta.9"
1616
},
1717
"type": "commonjs"

‎packages/e2e-tests/svelte-preprocess/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
1212
"sass": "^1.52.3",
13-
"svelte": "^3.48.0",
13+
"svelte": "^3.49.0",
1414
"svelte-preprocess": "^4.10.7",
1515
"typescript": "^4.7.4",
1616
"vite": "^3.0.0-beta.9"

‎packages/e2e-tests/ts-type-import/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
1212
"@tsconfig/svelte": "^3.0.0",
1313
"@types/node": "^17.0.36",
14-
"svelte": "^3.48.0",
14+
"svelte": "^3.49.0",
1515
"svelte-preprocess": "^4.10.7",
1616
"vite": "^3.0.0-beta.9"
1717
},

‎packages/e2e-tests/vite-ssr-esm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"express": "^4.18.1",
2121
"npm-run-all": "^4.1.5",
2222
"serve-static": "^1.15.0",
23-
"svelte": "^3.48.0",
23+
"svelte": "^3.9.0",
2424
"vite": "^3.0.0-beta.9"
2525
}
2626
}

‎packages/e2e-tests/vite-ssr-esm/vite.config.js

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ export default defineConfig(({ command, mode }) => {
2727
usePolling: true,
2828
interval: 100
2929
}
30-
},
31-
// manually externalize until https://github.com/vitejs/vite/pull/5197 released
32-
ssr: {
33-
external: ['decamelize']
3430
}
3531
};
3632
});

‎packages/e2e-tests/vite-ssr/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"e2e-test-dep-esm-only": "workspace:*",
1818
"express": "^4.18.1",
1919
"serve-static": "^1.15.0",
20-
"svelte": "^3.48.0",
20+
"svelte": "^3.49.0",
2121
"vite": "^3.0.0-beta.9"
2222
}
2323
}

‎packages/playground/big-component-library/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:*",
1313
"carbon-components-svelte": "^0.67.0",
14-
"svelte": "^3.48.0",
14+
"svelte": "^3.49.0",
1515
"vite": "^3.0.0-beta.9"
1616
},
1717
"dependencies": {

‎packages/playground/big/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
12-
"svelte": "^3.48.0",
12+
"svelte": "^3.49.0",
1313
"vite": "^3.0.0-beta.9"
1414
}
1515
}

‎packages/playground/kit-demo-app/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ If you're seeing this, you've probably already done this step. Congrats!
88

99
```bash
1010
# create a new project in the current directory
11-
npm init svelte@next
11+
npm init svelte
1212

1313
# create a new project in my-app
14-
npm init svelte@next my-app
14+
npm init svelte my-app
1515
```
1616

17-
> Note: the `@next` is temporary
18-
1917
## Developing
2018

2119
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:

0 commit comments

Comments
 (0)