Skip to content

Commit

Permalink
Merge branch 'main' into deep-merge-IIS-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Ariesly authored Apr 23, 2024
2 parents 339a262 + ce58d82 commit 6f9c0af
Show file tree
Hide file tree
Showing 81 changed files with 773 additions and 618 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ body:
validations:
required: true
- type: textarea
id: additonal
id: additional
attributes:
label: Additional context
description: If applicable, add any other context about the problem here
Expand Down
40 changes: 20 additions & 20 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ To report a vulnerability, please send an email to [security+nitro@unjs.io](mail

All security vulnerabilities will be promptly verified and addressed.

We recommend to regulary upgrade and publish with the latest versions of used packages and sub-dependencies by maintaining lock files (`yarn.lock`, `package-lock.json` and `pnpm-lock.yaml`) in order to ensure your application remains as secure as possible.
We recommend to regularly upgrade and publish with the latest versions of used packages and sub-dependencies by maintaining lock files (`yarn.lock`, `package-lock.json` and `pnpm-lock.yaml`) in order to ensure your application remains as secure as possible.
2 changes: 1 addition & 1 deletion docs/1.guide/0.index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Nitro automatically makes your code compatible with any [deployment](/deploy) pr
## Quick start

> [!TIP]
> Instead of setting up a local development envirionment, you can use the [online playground](https://stackblitz.com/github/unjs/nitro/tree/main/examples/hello-world).
> Instead of setting up a local development environment, you can use the [online playground](https://stackblitz.com/github/unjs/nitro/tree/main/examples/hello-world).
::note
Make sure you have installed the recommended setup:
Expand Down
4 changes: 2 additions & 2 deletions docs/1.guide/2.routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ An [event handler](https://h3.unjs.io/guide/event) is a function that will be bi

## Filesystem routing

Nitro supports file-based routing for your API routes (file are atomatically mapped to [h3 routes](https://h3.unjs.io/guide/router). Defining a route is as simple as creating a file inside the `api/` or `routes/` directory.
Nitro supports file-based routing for your API routes (file are automatically mapped to [h3 routes](https://h3.unjs.io/guide/router). Defining a route is as simple as creating a file inside the `api/` or `routes/` directory.

You can only define one handler per files and you can [append the HTTP method](#specific-request-method) to the filename to define a specific request method.

Expand Down Expand Up @@ -212,7 +212,7 @@ export default defineEventHandler(() => "OK");
```

::read-more{to="https://swagger.io/specification/v3/"}
This feature is currntly usable to specify OpenAPI meta. See swagger specification for available OpenAPI options.
This feature is currently usable to specify OpenAPI meta. See swagger specification for available OpenAPI options.
::

### Execution order
Expand Down
2 changes: 1 addition & 1 deletion docs/2.deploy/10.runtimes/1.node.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ You can customize server behavior using following environment variables:
- `NITRO_HOST` or `HOST`
- `NITRO_UNIX_SOCKET` - if provided (a path to the desired socket file) the service will be served over the provided UNIX socket.
- `NITRO_SSL_CERT` and `NITRO_SSL_KEY` - if both are present, this will launch the server in HTTPS mode. In the vast majority of cases, this should not be used other than for testing, and the Nitro server should be run behind a reverse proxy like nginx or Cloudflare which terminates SSL.
- `NITRO_SHUTDOWN` - Enables the graceful shutdown feature when set to `'true'`. If it's set to `'false'`, the graceful shutdown is bypassed to speed up the development process. Defaults to `'false'`.
- `NITRO_SHUTDOWN_DISABLED` - Disables the graceful shutdown feature when set to `'true'`. If it's set to `'true'`, the graceful shutdown is bypassed to speed up the development process. Defaults to `'false'`.
- `NITRO_SHUTDOWN_SIGNALS` - Allows you to specify which signals should be handled. Each signal should be separated with a space. Defaults to `'SIGINT SIGTERM'`.
- `NITRO_SHUTDOWN_TIMEOUT` - Sets the amount of time (in milliseconds) before a forced shutdown occurs. Defaults to `'30000'` milliseconds.
- `NITRO_SHUTDOWN_FORCE` - When set to true, it triggers `process.exit()` at the end of the shutdown process. If it's set to `'false'`, the process will simply let the event loop clear. Defaults to `'true'`.
Expand Down
2 changes: 1 addition & 1 deletion docs/2.deploy/20.providers/edgio.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ npm i -g @edgio/cli

## Testing production build locally with Edgio

You can use Nitropack to test your app's developement experience locally:
You can use Nitropack to test your app's development experience locally:

```bash
NITRO_PRESET=edgio npx nitropack build
Expand Down
2 changes: 1 addition & 1 deletion docs/2.deploy/20.providers/github-pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
**Preset:** `github_pages`

:read-more{title="Github Pages" to="https://pages.github.com/"}
:read-more{title="GitHub Pages" to="https://pages.github.com/"}

## Setup

Expand Down
2 changes: 1 addition & 1 deletion docs/3.config/0.index.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Serve `public/` assets in production.

- Default: `false`{lang=ts}

If enabled, disabled `.output/public` directory creation. Skipping to copy `public/` dir and also disables pre-renderering.
If enabled, disabled `.output/public` directory creation. Skipping to copy `public/` dir and also disables pre-rendering.

### `publicAssets`

Expand Down
27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"resolutions": {
"nitropack": "link:.",
"undici": "^6.13.0"
"undici": "^6.14.0"
},
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.3.1",
Expand All @@ -80,7 +80,7 @@
"chalk": "^5.3.0",
"chokidar": "^3.6.0",
"citty": "^0.1.6",
"confbox": "^0.1.6",
"confbox": "^0.1.7",
"consola": "^3.2.3",
"cookie-es": "^1.1.0",
"croner": "^8.0.2",
Expand All @@ -98,13 +98,13 @@
"h3": "^1.11.1",
"hookable": "^5.5.3",
"httpxy": "^0.1.5",
"ioredis": "^5.4.0",
"ioredis": "^5.4.1",
"is-primitive": "^3.0.1",
"jiti": "^1.21.0",
"klona": "^2.0.6",
"knitwork": "^1.1.0",
"listhen": "^1.7.2",
"magic-string": "^0.30.9",
"magic-string": "^0.30.10",
"mime": "^4.0.1",
"mlly": "^1.6.1",
"mri": "^1.2.0",
Expand All @@ -114,10 +114,10 @@
"openapi-typescript": "^6.7.5",
"pathe": "^1.1.2",
"perfect-debounce": "^1.0.0",
"pkg-types": "^1.0.3",
"pkg-types": "^1.1.0",
"pretty-bytes": "^6.1.1",
"radix3": "^1.1.2",
"rollup": "^4.14.3",
"rollup": "^4.16.2",
"rollup-plugin-visualizer": "^5.12.0",
"scule": "^1.3.0",
"semver": "^7.6.0",
Expand All @@ -136,8 +136,10 @@
"devDependencies": {
"@azure/functions": "^3.5.1",
"@azure/static-web-apps-cli": "^1.1.7",
"@cloudflare/workers-types": "^4.20240405.0",
"@scalar/api-reference": "^1.21.2",
"@cloudflare/workers-types": "^4.20240419.0",
"@deno/types": "^0.0.1",
"@scalar/api-reference": "^1.22.5",
"@types/archiver": "^6.0.2",
"@types/aws-lambda": "^8.10.137",
"@types/bun": "^1.1.0",
"@types/estree": "^1.0.5",
Expand All @@ -146,23 +148,24 @@
"@types/node-fetch": "^2.6.11",
"@types/semver": "^7.5.8",
"@types/serve-static": "^1.15.7",
"@types/xml2js": "^0.4.14",
"@vitest/coverage-v8": "^1.5.0",
"automd": "^0.3.7",
"better-sqlite3": "^9.5.0",
"changelogen": "^0.5.5",
"edge-runtime": "^2.5.9",
"eslint": "^9.0.0",
"eslint": "^9.1.1",
"eslint-config-unjs": "0.3.0-rc.6",
"execa": "^8.0.1",
"expect-type": "^0.19.0",
"firebase-admin": "^12.1.0",
"firebase-functions": "^4.9.0",
"get-port-please": "^3.1.2",
"miniflare": "^3.20240405.1",
"miniflare": "^3.20240405.2",
"prettier": "^3.2.5",
"typescript": "^5.4.5",
"unbuild": "^2.0.0",
"undici": "^6.13.0",
"undici": "^6.14.0",
"vitest": "^1.5.0",
"xml2js": "^0.6.2"
},
Expand All @@ -174,7 +177,7 @@
"optional": true
}
},
"packageManager": "pnpm@9.0.1",
"packageManager": "pnpm@9.0.5",
"engines": {
"node": "^16.11.0 || >=17.0.0"
},
Expand Down
Loading

0 comments on commit 6f9c0af

Please sign in to comment.