Skip to content

Commit

Permalink
Merge branch 'sveltejs:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hyunbinseo authored Mar 5, 2024
2 parents 03081a8 + 41bb2c0 commit a67886b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 3 deletions.
2 changes: 2 additions & 0 deletions documentation/docs/20-core-concepts/10-routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ We can create a layout that only applies to pages below `/settings` (while inher
<slot></slot>
```

You can see how `data` is populated by looking at the `+layout.js` example in the next section just below.

By default, each layout inherits the layout above it. Sometimes that isn't what you want - in this case, [advanced layouts](advanced-routing#advanced-layouts) can help you.

### +layout.js
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"eslint-plugin-unicorn": "^51.0.1",
"playwright": "^1.41.0"
},
"packageManager": "pnpm@8.15.3",
"packageManager": "pnpm@8.15.4",
"engines": {
"pnpm": "^8.0.0"
}
Expand Down
6 changes: 6 additions & 0 deletions packages/kit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @sveltejs/kit

## 2.5.2

### Patch Changes

- fix: tsconfig includes should cover svelte.config.js ([#11886](https://github.com/sveltejs/kit/pull/11886))

## 2.5.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sveltejs/kit",
"version": "2.5.1",
"version": "2.5.2",
"description": "The fastest way to build Svelte apps",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/kit/src/core/sync/write_tsconfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export function get_tsconfig(kit) {
'ambient.d.ts',
'non-ambient.d.ts',
'./types/**/$types.d.ts',
config_relative('svelte.config.js'),
config_relative('vite.config.js'),
config_relative('vite.config.ts')
]);
Expand Down
1 change: 1 addition & 0 deletions packages/kit/src/core/sync/write_tsconfig.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ test('Creates tsconfig include from kit.files', () => {
'ambient.d.ts',
'non-ambient.d.ts',
'./types/**/$types.d.ts',
'../svelte.config.js',
'../vite.config.js',
'../vite.config.ts',
'../app/**/*.js',
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/src/version.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// generated during release, do not modify

/** @type {string} */
export const VERSION = '2.5.1';
export const VERSION = '2.5.2';

0 comments on commit a67886b

Please sign in to comment.