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.

Sign up for GitHub

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

Jump to bottom

Revert #5012 #5121

Merged
merged 9 commits into from
May 30, 2022
Merged

Revert #5012 #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d13bf34
revert #5012
Rich-Harris May 30, 2022
7f81340
include packaging test changes from #5120
Rich-Harris May 30, 2022
26efc9e
update deps
Rich-Harris May 30, 2022
663101e
update lockfile
Rich-Harris May 30, 2022
7d0f282
changeset
Rich-Harris May 30, 2022
e1bca0b
lint
Rich-Harris May 30, 2022
9eac99f
Merge branch 'master' into revert-root-devdeps
Rich-Harris May 30, 2022
6a6d531
ffs try this
Rich-Harris May 30, 2022
1508d27
include indirect dependencies in duplicates check
Rich-Harris May 30, 2022
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
12 changes: 12 additions & 0 deletions .changeset/hot-books-march.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
'@sveltejs/adapter-auto': patch
'@sveltejs/adapter-cloudflare': 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
---

Update dependencies
34 changes: 11 additions & 23 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,24 @@
},
"homepage": "https://github.com/sveltejs/kit#readme",
"devDependencies": {
"@changesets/cli": "^2.18.1",
"@playwright/test": "^1.21.0",
"@rollup/plugin-commonjs": "^21.0.1",
"@changesets/cli": "^2.22.0",
"@rollup/plugin-commonjs": "^21.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.6",
"@rollup/plugin-replace": "^4.0.0",
"@rollup/plugin-node-resolve": "^13.3.0",
"@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
"@svitejs/changesets-changelog-github-compact": "^0.1.1",
"@types/node": "^16.11.36",
"@typescript-eslint/eslint-plugin": "^5.5.0",
"@typescript-eslint/parser": "^5.5.0",
"cross-env": "^7.0.3",
"eslint": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"@typescript-eslint/eslint-plugin": "^5.27.0",
"@typescript-eslint/parser": "^5.27.0",
"eslint": "^8.16.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-svelte3": "^4.0.0",
"port-authority": "^2.0.0",
"prettier": "^2.5.0",
"prettier-plugin-svelte": "^2.5.0",
"rimraf": "^3.0.2",
"rollup": "^2.60.2",
"sirv": "^2.0.0",
"prettier": "^2.6.2",
"rollup": "^2.75.3",
"svelte": "^3.48.0",
"svelte-check": "^2.5.0",
"svelte-preprocess": "^4.9.8",
"svelte2tsx": "~0.5.0",
"tiny-glob": "^0.2.9",
"turbo": "^1.2.12",
"typescript": "~4.7.2",
"uvu": "^0.5.2"
"turbo": "^1.2.14",
"typescript": "^4.7.2"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
4 changes: 4 additions & 0 deletions packages/adapter-auto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,9 @@
"@sveltejs/adapter-cloudflare": "workspace:*",
"@sveltejs/adapter-netlify": "workspace:*",
"@sveltejs/adapter-vercel": "workspace:*"
},
"devDependencies": {
"@types/node": "^16.11.36",
"typescript": "^4.7.2"
}
}
6 changes: 4 additions & 2 deletions packages/adapter-cloudflare-workers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
},
"dependencies": {
"@iarna/toml": "^2.2.5",
"esbuild": "^0.14.29"
"esbuild": "^0.14.42"
},
"devDependencies": {
"@cloudflare/kv-asset-handler": "^0.2.0"
"@cloudflare/kv-asset-handler": "^0.2.0",
"@types/node": "^16.11.36",
"typescript": "^4.7.2"
}
}
6 changes: 4 additions & 2 deletions packages/adapter-cloudflare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@
"prepublishOnly": "npm run build"
},
"dependencies": {
"esbuild": "^0.14.29",
"esbuild": "^0.14.42",
"worktop": "0.8.0-next.14"
},
"devDependencies": {
"@types/ws": "^8.5.3"
"@types/node": "^16.11.36",
"@types/ws": "^8.5.3",
"typescript": "^4.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
14 changes: 11 additions & 3 deletions packages/adapter-netlify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,21 @@
},
"dependencies": {
"@iarna/toml": "^2.2.5",
"esbuild": "^0.14.29",
"esbuild": "^0.14.42",
"set-cookie-parser": "^2.4.8",
"tiny-glob": "^0.2.9"
},
"devDependencies": {
"@types/set-cookie-parser": "^2.4.2",
"@netlify/functions": "^1.0.0",
"@sveltejs/kit": "workspace:*"
"@rollup/plugin-commonjs": "^21.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.3.0",
"@sveltejs/kit": "workspace:*",
"@types/node": "^16.11.36",
"@types/set-cookie-parser": "^2.4.2",
"rimraf": "^3.0.2",
"rollup": "^2.75.3",
"typescript": "^4.7.2",
"uvu": "^0.5.3"
}
}
12 changes: 10 additions & 2 deletions packages/adapter-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,18 @@
"tiny-glob": "^0.2.9"
},
"devDependencies": {
"@rollup/plugin-json": "^4.1.0",
"@sveltejs/kit": "workspace:*",
"@types/compression": "^1.7.2",
"c8": "^7.10.0",
"@types/node": "^16.11.36",
"c8": "^7.11.3",
"compression": "^1.7.4",
"polka": "^1.0.0-next.22"
"node-fetch": "^3.2.4",
"polka": "^1.0.0-next.22",
"rimraf": "^3.0.2",
"rollup": "^2.75.3",
"sirv": "^2.0.2",
"typescript": "^4.7.2",
"uvu": "^0.5.3"
}
}
9 changes: 8 additions & 1 deletion packages/adapter-static/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
"tiny-glob": "^0.2.9"
},
"devDependencies": {
"@sveltejs/kit": "workspace:*"
"@sveltejs/kit": "workspace:*",
"@types/node": "^16.11.36",
"playwright-chromium": "^1.22.2",
"port-authority": "^1.2.0",
"sirv": "^2.0.2",
"svelte": "^3.48.0",
"typescript": "^4.7.2",
"uvu": "^0.5.3"
}
}
3 changes: 2 additions & 1 deletion packages/adapter-static/test/apps/prerendered/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"start": "../../../../kit/svelte-kit.js start"
},
"devDependencies": {
"@sveltejs/kit": "next"
"@sveltejs/kit": "next",
"svelte": "^3.48.0"
},
"type": "module"
}
3 changes: 2 additions & 1 deletion packages/adapter-static/test/apps/spa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"devDependencies": {
"@sveltejs/adapter-node": "next",
"@sveltejs/kit": "next",
"sirv-cli": "^2.0.2"
"sirv-cli": "^2.0.2",
"svelte": "^3.48.0"
},
"type": "module"
}
2 changes: 1 addition & 1 deletion packages/adapter-static/test/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import http from 'http';
import { fileURLToPath } from 'url';
import * as ports from 'port-authority';
import sirv from 'sirv';
import { chromium } from '@playwright/test';
import { chromium } from 'playwright-chromium';
import * as uvu from 'uvu';

/**
Expand Down
8 changes: 5 additions & 3 deletions packages/adapter-vercel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
"check": "tsc"
},
"dependencies": {
"@vercel/nft": "^0.19.0",
"esbuild": "^0.14.29"
"@vercel/nft": "^0.19.1",
"esbuild": "^0.14.42"
},
"devDependencies": {
"@sveltejs/kit": "workspace:*"
"@sveltejs/kit": "workspace:*",
"@types/node": "^16.11.36",
"typescript": "^4.7.2"
}
}
10 changes: 8 additions & 2 deletions packages/create-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@
"prompts": "^2.4.2"
},
"devDependencies": {
"@playwright/test": "^1.22.2",
"@sveltejs/kit": "workspace:*",
"@types/gitignore-parser": "^0.0.0",
"@types/prettier": "^2.4.2",
"@types/prettier": "^2.6.3",
"@types/prompts": "^2.0.14",
"gitignore-parser": "^0.0.2",
"sucrase": "^3.20.3"
"prettier": "^2.6.2",
"prettier-plugin-svelte": "^2.7.0",
"sucrase": "^3.21.0",
"svelte": "^3.48.0",
"svelte-preprocess": "^4.10.6",
"tiny-glob": "^0.2.9"
},
"scripts": {
"build": "node scripts/build-templates",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-svelte/shared/+checkjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"check:watch": "svelte-check --tsconfig ./jsconfig.json --watch"
},
"devDependencies": {
"typescript": "~4.6.2",
"svelte-check": "^2.2.6"
"typescript": "^4.7.2",
"svelte-check": "^2.7.1"
}
}
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+default+checkjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"devDependencies": {
"@types/cookie": "^0.4.1"
"@types/cookie": "^0.5.1"
}
}
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+default+typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"devDependencies": {
"@types/cookie": "^0.4.1"
"@types/cookie": "^0.5.1"
}
}
4 changes: 2 additions & 2 deletions packages/create-svelte/shared/+eslint+typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.10.1",
"@typescript-eslint/parser": "^5.10.1"
"@typescript-eslint/eslint-plugin": "^5.27.0",
"@typescript-eslint/parser": "^5.27.0"
}
}
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+eslint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"eslint": "^8.12.0",
"eslint": "^8.16.0",
"eslint-plugin-svelte3": "^4.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+playwright/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@playwright/test": "^1.21.0"
"@playwright/test": "^1.22.2"
},
"scripts": {
"test": "playwright test"
Expand Down
4 changes: 2 additions & 2 deletions packages/create-svelte/shared/+prettier/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"prettier": "^2.5.1",
"prettier-plugin-svelte": "^2.5.0"
"prettier": "^2.6.2",
"prettier-plugin-svelte": "^2.7.0"
}
}
6 changes: 3 additions & 3 deletions packages/create-svelte/shared/+typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
"typescript": "~4.6.2",
"typescript": "^4.7.2",
"tslib": "^2.3.1",
"svelte-check": "^2.2.6",
"svelte-preprocess": "^4.10.1"
"svelte-check": "^2.7.1",
"svelte-preprocess": "^4.10.6"
}
}
8 changes: 4 additions & 4 deletions packages/create-svelte/templates/default/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"devDependencies": {
"@sveltejs/adapter-auto": "workspace:*",
"@sveltejs/kit": "workspace:*",
"svelte": "^3.44.0",
"svelte-preprocess": "^4.9.8",
"typescript": "~4.6.2"
"svelte": "^3.48.0",
"svelte-preprocess": "^4.10.6",
"typescript": "^4.7.2"
},
"type": "module",
"dependencies": {
"@fontsource/fira-mono": "^4.5.0",
"@fontsource/fira-mono": "^4.5.8",
"@lukeed/uuid": "^2.0.0",
"cookie": "^0.5.0"
}
Expand Down
29 changes: 22 additions & 7 deletions packages/kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,40 @@
"dependencies": {
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.46",
"chokidar": "^3.5.3",
"sade": "^1.7.4",
"sade": "^1.8.1",
"vite": "^2.9.9"
},
"devDependencies": {
"@playwright/test": "^1.22.2",
"@rollup/plugin-replace": "^4.0.0",
"@types/connect": "^3.4.35",
"@types/cookie": "^0.5.0",
"@types/marked": "^4.0.1",
"@types/cookie": "^0.5.1",
"@types/marked": "^4.0.3",
"@types/mime": "^2.0.3",
"@types/sade": "^1.7.3",
"@types/node": "^16.11.36",
"@types/sade": "^1.7.4",
"@types/set-cookie-parser": "^2.4.2",
"cookie": "^0.5.0",
"cross-env": "^7.0.3",
"devalue": "^2.0.1",
"eslint": "^8.16.0",
"kleur": "^4.1.4",
"locate-character": "^2.0.5",
"marked": "^4.0.16",
"mime": "^3.0.0",
"node-fetch": "^3.1.0",
"selfsigned": "^2.0.0",
"node-fetch": "^3.2.4",
"port-authority": "^1.2.0",
"rollup": "^2.75.3",
"selfsigned": "^2.0.1",
"set-cookie-parser": "^2.4.8",
"svelte": "^3.48.0"
"sirv": "^2.0.2",
"svelte": "^3.48.0",
"svelte-check": "^2.7.1",
"svelte-preprocess": "^4.10.6",
"svelte2tsx": "~0.5.10",
"tiny-glob": "^0.2.9",
"typescript": "^4.7.2",
"uvu": "^0.5.3"
},
"peerDependencies": {
"svelte": "^3.44.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/src/core/config/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ const options = object(

// TODO: remove this for the 1.0 release
force: validate(undefined, (input, keypath) => {
if (typeof input !== undefined) {
if (typeof input !== 'undefined') {
const newSetting = input ? 'continue' : 'fail';
const needsSetting = newSetting === 'continue';
throw new Error(
Expand Down
14 changes: 7 additions & 7 deletions packages/kit/src/packaging/test/fixtures/emitTypes-false/expected/Test.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<script>
import { createEventDispatcher } from 'svelte';
/**
* @type {string}
*/
export const astring;
import { createEventDispatcher } from 'svelte';
/**
* @type {string}
*/
export const astring = 'potato';

const dispatch = createEventDispatcher();
dispatch('event', true);
const dispatch = createEventDispatcher();
dispatch('event', true);
</script>

<slot {astring} />
Loading