Skip to content

Commit 3192797

Browse files
Merge branch 'main' into elliott/init-tracing
2 parents 4b64316 + 6c13063 commit 3192797

File tree

127 files changed

+6211
-1112
lines changed

Some content is hidden

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

127 files changed

+6211
-1112
lines changed

.changeset/giant-dolphins-promise.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
This is a monorepo, meaning the repo holds multiple packages. It requires the use of [pnpm](https://pnpm.io/). You can [install pnpm](https://pnpm.io/installation) with:
66

7-
```bash
7+
```sh
88
npm i -g pnpm
99
```
1010

1111
`pnpm` commands run in the project's root directory will run on all sub-projects. You can checkout the code and install the dependencies with:
1212

13-
```bash
13+
```sh
1414
git clone [email protected]:sveltejs/kit.git
1515
cd kit
1616
pnpm install
@@ -124,7 +124,7 @@ There are a few guidelines we follow:
124124

125125
To use the git hooks in the repo, which will save you from waiting for CI to tell you that you forgot to lint, run this:
126126

127-
```bash
127+
```sh
128128
git config core.hookspath .githooks
129129
```
130130

@@ -142,6 +142,6 @@ The [Changesets GitHub action](https://github.com/changesets/action#with-publish
142142

143143
New packages will need to be published manually the first time if they are scoped to the `@sveltejs` organisation, by running this from the package directory:
144144

145-
```bash
145+
```sh
146146
npm publish --access=public
147147
```

documentation/docs/10-getting-started/20-creating-a-project.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ title: Creating a project
44

55
The easiest way to start building a SvelteKit app is to run `npx sv create`:
66

7-
```bash
7+
```sh
88
npx sv create my-app
99
cd my-app
10-
npm install
1110
npm run dev
1211
```
1312

14-
The first command will scaffold a new project in the `my-app` directory asking you if you'd like to set up some basic tooling such as TypeScript. See [integrations](./integrations) for pointers on setting up additional tooling. The subsequent commands will then install its dependencies and start a server on [localhost:5173](http://localhost:5173).
13+
The first command will scaffold a new project in the `my-app` directory asking if you'd like to set up some basic tooling such as TypeScript. See [the CLI docs](/docs/cli/overview) for information about these options and [the integrations page](./integrations) for pointers on setting up additional tooling. `npm run dev` will then start the development server on [localhost:5173](http://localhost:5173) - make sure you install dependencies before running this if you didn't do so during project creation.
1514

1615
There are two basic concepts:
1716

documentation/docs/20-core-concepts/20-load.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Conceptually, they're the same thing, but there are some important differences t
188188

189189
Server `load` functions _always_ run on the server.
190190

191-
By default, universal `load` functions run on the server during SSR when the user first visits your page. They will then run again during hydration, reusing any responses from [fetch requests](#Making-fetch-requests). All subsequent invocations of universal `load` functions happen in the browser. You can customize the behavior through [page options](page-options). If you disable [server side rendering](page-options#ssr), you'll get an SPA and universal `load` functions _always_ run on the client.
191+
By default, universal `load` functions run on the server during SSR when the user first visits your page. They will then run again during hydration, reusing any responses from [fetch requests](#Making-fetch-requests). All subsequent invocations of universal `load` functions happen in the browser. You can customize the behavior through [page options](page-options). If you disable [server-side rendering](page-options#ssr), you'll get an SPA and universal `load` functions _always_ run on the client.
192192

193193
If a route contains both universal and server `load` functions, the server `load` runs first.
194194

documentation/docs/20-core-concepts/40-page-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Since these routes cannot be dynamically server-rendered, this will cause errors
8888

8989
SvelteKit will discover pages to prerender automatically, by starting at _entry points_ and crawling them. By default, all your non-dynamic routes are considered entry points — for example, if you have these routes...
9090

91-
```bash
91+
```sh
9292
/ # non-dynamic
9393
/blog # non-dynamic
9494
/blog/[slug] # dynamic, because of `[slug]`

0 commit comments

Comments
 (0)