Skip to content

Commit fdbcbe7

Browse files
Merge branch 'main' into feat/rolldown-vite
2 parents 255f967 + ca2dff2 commit fdbcbe7

File tree

85 files changed

+2006
-2128
lines changed

Some content is hidden

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

85 files changed

+2006
-2128
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body:
1515
id: bug-env
1616
attributes:
1717
label: Environment
18-
description: You can use `npx nuxi info` to fill this section
18+
description: You can use `npx nuxt info` to fill this section
1919
placeholder: Environment
2020
validations:
2121
required: true

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8181

8282
- name: Initialize CodeQL
83-
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
83+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
8484
with:
8585
config: |
8686
paths:
@@ -97,7 +97,7 @@ jobs:
9797
languages: ${{ matrix.language }}
9898

9999
- name: Perform CodeQL Analysis
100-
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
100+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
101101
with:
102102
category: "/language:${{ matrix.language }}"
103103

@@ -312,7 +312,7 @@ jobs:
312312
SKIP_BUNDLE_SIZE: true
313313
NITRO_NO_UNIX_SOCKET: ${{ matrix.env == 'dev' && '1' || '' }}
314314

315-
- uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
315+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
316316
if: github.event_name != 'push' && matrix.env == 'built' && matrix.builder == 'vite' && matrix.context == 'default' && matrix.os == 'ubuntu-latest' && matrix.manifest == 'manifest-on'
317317
with:
318318
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: 'Checkout Repository'
2222
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
- name: 'Dependency Review'
24-
uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0
24+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
71+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
7272
if: github.repository == 'nuxt/nuxt' && success()
7373
with:
7474
sarif_file: results.sarif

.github/workflows/semantic-pull-requests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ jobs:
2525
scopes: |
2626
docs
2727
kit
28-
nuxi
2928
nuxt
3029
rspack
3130
schema
32-
test-utils
3331
ui-templates
3432
vite
3533
webpack

.github/workflows/stackblitz-link.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15-
- uses: huang-julien/reproduire-sur-stackblitz@9ceccbfbb0f2f9a9a8db2d1f0dd909cf5cfe67aa # v1.0.2
15+
- uses: huang-julien/reproduire-sur-stackblitz@edd77eee0ffdae795c9dfd4e5b3b745740672439 # v1.0.3
1616
with:
1717
reproduction-heading: '### Reproduction'

docs/1.getting-started/01.introduction.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ A module system allows to extend Nuxt with custom features and integrations with
7272

7373
Nuxt is composed of different [core packages](https://github.com/nuxt/nuxt/tree/main/packages):
7474

75-
- Core Engine: [nuxt](https://github.com/nuxt/nuxt/tree/main/packages/nuxt)
76-
- Bundlers: [@nuxt/vite-builder](https://github.com/nuxt/nuxt/tree/main/packages/vite) and [@nuxt/webpack-builder](https://github.com/nuxt/nuxt/tree/main/packages/webpack)
77-
- Command line interface: [nuxi](https://github.com/nuxt/nuxt/tree/main/packages/nuxi)
75+
- Core engine: [nuxt](https://github.com/nuxt/nuxt/tree/main/packages/nuxt)
76+
- Bundlers: [@nuxt/vite-builder](https://github.com/nuxt/nuxt/tree/main/packages/vite), [@nuxt/rspack-builder](https://github.com/nuxt/nuxt/tree/main/packages/rspack) and [@nuxt/webpack-builder](https://github.com/nuxt/nuxt/tree/main/packages/webpack)
77+
- Command line interface: [@nuxt/cli](https://github.com/nuxt/cli)
7878
- Server engine: [nitro](https://github.com/nitrojs/nitro)
7979
- Development kit: [@nuxt/kit](https://github.com/nuxt/nuxt/tree/main/packages/kit)
8080

docs/1.getting-started/03.configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default defineNuxtConfig({
5050
})
5151
```
5252

53-
To select an environment when running a Nuxt CLI command, simply pass the name to the `--envName` flag, like so: `nuxi build --envName staging`.
53+
To select an environment when running a Nuxt CLI command, simply pass the name to the `--envName` flag, like so: `nuxt build --envName staging`.
5454

5555
To learn more about the mechanism behind these overrides, please refer to the `c12` documentation on [environment-specific configuration](https://github.com/unjs/c12?tab=readme-ov-file#environment-specific-configuration).
5656

docs/1.getting-started/07.routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ There are three kinds of route middleware:
9494

9595
1. Anonymous (or inline) route middleware, which are defined directly in the pages where they are used.
9696
2. Named route middleware, which are placed in the [`middleware/`](/docs/guide/directory-structure/middleware) directory and will be automatically loaded via asynchronous import when used on a page. (**Note**: The route middleware name is normalized to kebab-case, so `someMiddleware` becomes `some-middleware`.)
97-
3. Global route middleware, which are placed in the [`middleware/` directory](/docs/guide/directory-structure/middleware) (with a `.global` suffix) and will be automatically run on every route change.
97+
3. Global route middleware, which are placed in the [`middleware/`](/docs/guide/directory-structure/middleware) directory (with a `.global` suffix) and will be automatically run on every route change.
9898

9999
Example of an `auth` middleware protecting the `/dashboard` page:
100100

docs/1.getting-started/11.state-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ This is similar to the [`nuxtServerInit` action](https://v2.nuxt.com/docs/direct
8484
In this example, we leverage the [Pinia module](/modules/pinia) to create a global store and use it across the app.
8585

8686
::important
87-
Make sure to install the Pinia module with `npx nuxi@latest module add pinia` or follow the [module's installation steps](https://pinia.vuejs.org/ssr/nuxt.html#Installation).
87+
Make sure to install the Pinia module with `npx nuxt module add pinia` or follow the [module's installation steps](https://pinia.vuejs.org/ssr/nuxt.html#Installation).
8888
::
8989

9090
::code-group

0 commit comments

Comments
 (0)