Skip to content

Commit

Permalink
Merge branch 'v2' into pr/cjpearson/2611
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 committed Oct 10, 2024
2 parents 4b3438c + a399e18 commit a4e4089
Show file tree
Hide file tree
Showing 119 changed files with 4,062 additions and 4,396 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "nitro-devcontainer",
"forwardPorts": [3000],
"image": "node:20.14.0",
"image": "node:20.17.0",
"features": {},
"customizations": {
"vscode": {
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @pi0
2 changes: 1 addition & 1 deletion .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
- run: pnpm gen-presets
- name: Fix lint issues
run: npm run lint:fix
- uses: autofix-ci/action@2891949f3779a1cafafae1523058501de3d4e944
- uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
with:
commit-message: "chore: apply automated updates"
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
*.md
**/*.gen.ts
node_modules
pnpm-lock.yaml
**/.docs
**/dist/**
49 changes: 0 additions & 49 deletions biome.json

This file was deleted.

15 changes: 0 additions & 15 deletions docs/.docs/components/global/Ellipsis.vue

This file was deleted.

3 changes: 0 additions & 3 deletions docs/.docs/components/global/IconNitro.vue

This file was deleted.

32 changes: 0 additions & 32 deletions docs/.docs/components/global/IconUnJS.vue

This file was deleted.

16 changes: 0 additions & 16 deletions docs/.docs/components/global/Logo.vue

This file was deleted.

Binary file removed docs/.docs/public/favicon.ico
Binary file not shown.
Binary file removed docs/.docs/public/icon.png
Binary file not shown.
38 changes: 0 additions & 38 deletions docs/.docs/public/nitro-dark.svg

This file was deleted.

38 changes: 0 additions & 38 deletions docs/.docs/public/nitro-light.svg

This file was deleted.

2 changes: 1 addition & 1 deletion docs/1.guide/0.index.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ The `routes/` directory contains your application handlers. You can create subdi

### `api/`

The `api/` directory is similar to `routes/` with only difference that routes inside it will be prefixed with `/api/` for convenience.
The `api/` directory is similar to `routes/` with the only difference that routes inside it will be prefixed with `/api/` for convenience.

:read-more{to="/guide/routing"}

Expand Down
4 changes: 2 additions & 2 deletions docs/1.guide/1.utils.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ Nitro also exposes several built-in utils:
- `nitroPlugin(plugin)`{lang=ts}
- `getRouteRules(event)`{lang=ts}

::read-more{to="https://github.com/unjs/nitro/blob/main/src/imports.ts"}
Check [the source code](https://github.com/unjs/nitro/blob/main/src/imports.ts) for list of available Nitro auto imports.
::read-more{to="https://github.com/unjs/nitro/blob/v2/src/core/config/resolvers/imports.ts#L58"}
Check [the source code](https://github.com/unjs/nitro/blob/v2/src/core/config/resolvers/imports.ts#L58) for list of available Nitro auto imports.
::

::read-more{to="/guide/typescript"}
Expand Down
2 changes: 1 addition & 1 deletion docs/1.guide/10.tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ nitro task run db:migrate --payload "{}"

### Concurrency

Each task can have **one running instance**. Calling a task of same name multiple times in parallel, results to calling it once and all callers will get the same return value.
Each task can have **one running instance**. Calling a task of same name multiple times in parallel, results in calling it once and all callers will get the same return value.

> [!NOTE]
> Nitro tasks can be running multiple times and in parallel.
Loading

0 comments on commit a4e4089

Please sign in to comment.