Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris committed May 23, 2022
2 parents 0239107 + eb2ab91 commit 91f27b5
Show file tree
Hide file tree
Showing 83 changed files with 514 additions and 917 deletions.
5 changes: 5 additions & 0 deletions .changeset/curly-doors-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-svelte": patch
---

correct default package.json format
5 changes: 5 additions & 0 deletions .changeset/empty-fishes-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'create-svelte': patch
---

Use separate ignore files for prettier and eslint
5 changes: 5 additions & 0 deletions .changeset/few-cobras-switch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

Allow symlinked directories in the routes folder
5 changes: 5 additions & 0 deletions .changeset/few-scissors-agree.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/adapter-vercel': patch
---

Revert to cjs mode when building for lambda
5 changes: 5 additions & 0 deletions .changeset/forty-lions-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[breaking] resolve relative urls from the target page when using load's fetch
5 changes: 5 additions & 0 deletions .changeset/forty-worms-deliver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] `svelte-kit sync` gracefully handles a nonexistent routes folder
6 changes: 6 additions & 0 deletions .changeset/olive-lies-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'create-svelte': patch
'@sveltejs/kit': patch
---

[breaking] Replace `%svelte.body%` with `%sveltekit.body%`, etc.
6 changes: 6 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
"cuddly-knives-learn",
"cuddly-pens-buy",
"cuddly-ravens-carry",
"curly-doors-type",
"curly-pets-vanish",
"curvy-dots-join",
"curvy-eggs-sip",
Expand Down Expand Up @@ -188,6 +189,7 @@
"eleven-dots-reply",
"empty-donuts-smell",
"empty-falcons-run",
"empty-fishes-design",
"empty-grapes-own",
"empty-islands-lie",
"empty-lamps-matter",
Expand All @@ -210,6 +212,7 @@
"few-points-taste",
"few-rockets-sort",
"few-rockets-think",
"few-scissors-agree",
"few-singers-pump",
"few-suits-drive",
"few-suits-flash",
Expand All @@ -236,9 +239,11 @@
"fluffy-cheetahs-remain",
"fluffy-dryers-jump",
"forty-cycles-punch",
"forty-lions-give",
"forty-months-prove",
"forty-seahorses-rest",
"forty-terms-peel",
"forty-worms-deliver",
"four-apes-attack",
"four-cheetahs-yawn",
"four-news-turn",
Expand Down Expand Up @@ -525,6 +530,7 @@
"old-years-march",
"olive-frogs-add",
"olive-frogs-drive",
"olive-lies-train",
"olive-maps-join",
"olive-mayflies-retire",
"olive-socks-thank",
Expand Down
3 changes: 1 addition & 2 deletions documentation/docs/80-migrating.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ This file has no equivalent in SvelteKit. Any custom logic (beyond `sapper.start

When using `adapter-node` the equivalent is a [custom server](https://github.com/sveltejs/kit/tree/master/packages/adapter-node#custom-server). Otherwise, this file has no direct equivalent, since SvelteKit apps can run in serverless environments. You can, however, use the [hooks module](/docs/hooks) to implement session logic.


#### src/service-worker.js

Most imports from `@sapper/service-worker` have equivalents in [`$service-worker`](/docs/modules#$service-worker):
Expand All @@ -65,7 +64,7 @@ Most imports from `@sapper/service-worker` have equivalents in [`$service-worker

The `src/template.html` file should be renamed `src/app.html`.

Remove `%sapper.base%`, `%sapper.scripts%` and `%sapper.styles%`. Replace `%sapper.head%` with `%svelte.head%` and `%sapper.html%` with `%svelte.body%`. The `<div id="sapper">` is no longer necessary.
Remove `%sapper.base%`, `%sapper.scripts%` and `%sapper.styles%`. Replace `%sapper.head%` with `%sveltekit.head%` and `%sapper.html%` with `%sveltekit.body%`. The `<div id="sapper">` is no longer necessary.

#### src/node_modules

Expand Down
18 changes: 16 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"check": "turbo run check",
"lint": "turbo run lint",
"format": "turbo run format",
"precommit": "turbo run precommit",
"release": "changeset publish"
},
"repository": {
Expand All @@ -23,24 +24,37 @@
"homepage": "https://github.com/sveltejs/kit#readme",
"devDependencies": {
"@changesets/cli": "^2.18.1",
"@playwright/test": "^1.21.0",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.6",
"@rollup/plugin-replace": "^4.0.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",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-svelte3": "^4.0.0",
"port-authority": "^1.1.2",
"prettier": "^2.5.0",
"prettier-plugin-svelte": "^2.5.0",
"rimraf": "^3.0.2",
"rollup": "^2.74.1",
"sirv": "^2.0.0",
"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.6",
"typescript": "~4.6.2"
"typescript": "~4.6.2",
"uvu": "^0.5.2"
},
"packageManager": "[email protected].2",
"packageManager": "[email protected].3",
"engines": {
"pnpm": "^7.0.0"
},
Expand Down
7 changes: 7 additions & 0 deletions packages/adapter-auto/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @sveltejs/adapter-auto

## 1.0.0-next.44

### Patch Changes

- Updated dependencies [[`a452bd83`](https://github.com/sveltejs/kit/commit/a452bd83ac5feb27040a1cb364395c9ae5c04107)]:
- @sveltejs/adapter-vercel@1.0.0-next.53

## 1.0.0-next.43

### Patch Changes
Expand Down
6 changes: 1 addition & 5 deletions packages/adapter-auto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sveltejs/adapter-auto",
"version": "1.0.0-next.43",
"version": "1.0.0-next.44",
"repository": {
"type": "git",
"url": "https://github.com/sveltejs/kit",
Expand Down Expand Up @@ -33,9 +33,5 @@
"@sveltejs/adapter-cloudflare": "workspace:*",
"@sveltejs/adapter-netlify": "workspace:*",
"@sveltejs/adapter-vercel": "workspace:*"
},
"devDependencies": {
"@types/node": "^14.14.20",
"typescript": "^4.6.2"
}
}
5 changes: 0 additions & 5 deletions packages/adapter-begin/.gitignore

This file was deleted.

141 changes: 0 additions & 141 deletions packages/adapter-begin/CHANGELOG.md

This file was deleted.

3 changes: 0 additions & 3 deletions packages/adapter-begin/README.md

This file was deleted.

1 change: 0 additions & 1 deletion packages/adapter-begin/index.d.ts

This file was deleted.

12 changes: 0 additions & 12 deletions packages/adapter-begin/index.js

This file was deleted.

37 changes: 0 additions & 37 deletions packages/adapter-begin/package.json

This file was deleted.

Loading

0 comments on commit 91f27b5

Please sign in to comment.