Skip to content

Commit 97877dc

Browse files
authored
Merge branch 'main' into main
2 parents 240fd33 + 3cf969a commit 97877dc

File tree

12 files changed

+1820
-1599
lines changed

12 files changed

+1820
-1599
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// https://code.visualstudio.com/docs/devcontainers/containers
22
// https://containers.dev/implementors/json_reference/
33
{
4-
"image": "node:20",
4+
"image": "node:20.15.0",
55
"features": {},
66
"customizations": {
77
"vscode": {

.github/workflows/autofix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
autofix:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
15+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
1616
- run: corepack enable
1717
- uses: actions/setup-node@v4
1818
with:
@@ -21,4 +21,4 @@ jobs:
2121
- run: pnpm install
2222
- name: Fix lint issues
2323
run: pnpm run lint:fix
24-
- uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84
24+
- uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# permissions:
1515
# id-token: write
1616
steps:
17-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
17+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
1818
with:
1919
fetch-depth: 0
2020
- run: corepack enable

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
# Changelog
22

33

4+
## v3.12.0
5+
6+
[compare changes](https://github.com/nuxt/cli/compare/v3.11.1...v3.12.0)
7+
8+
### 🩹 Fixes
9+
10+
- **prepare:** Respect `--dotenv` ([#377](https://github.com/nuxt/cli/pull/377))
11+
- Add '@nuxt/kit' to nuxt module verification ([#386](https://github.com/nuxt/cli/pull/386), [#387](https://github.com/nuxt/cli/pull/387))
12+
- Check`nitropack-nightly` when resolving nitro version ([bfaf128](https://github.com/nuxt/cli/commit/bfaf128))
13+
- **dev:** Set `hmr.server` earlier in lifecycle ([#420](https://github.com/nuxt/cli/pull/420))
14+
- **preview:** Correct path with custom `nitro.output.dir` ([#376](https://github.com/nuxt/cli/pull/376))
15+
16+
### 🏡 Chore
17+
18+
- **release:** V3.11.1 ([8e1bd03](https://github.com/nuxt/cli/commit/8e1bd03))
19+
- Migrate to eslint v9 ([#412](https://github.com/nuxt/cli/pull/412))
20+
- **add:** Change order of `setup` attr in templates ([#378](https://github.com/nuxt/cli/pull/378))
21+
22+
### ❤️ Contributors
23+
24+
- Xjccc ([@xjccc](http://github.com/xjccc))
25+
- Daniel Roe ([@danielroe](http://github.com/danielroe))
26+
- Dale Weaver ([@daleweaver777](http://github.com/daleweaver777))
27+
- 你好怪凡 <[email protected]>
28+
- Damian Głowala ([@DamianGlowala](http://github.com/DamianGlowala))
29+
- Pooya Parsa ([@pi0](http://github.com/pi0))
30+
431
## v3.11.1
532

633
[compare changes](https://github.com/nuxt/cli/compare/v3.11.0...v3.11.1)

build.config.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
import { defineBuildConfig } from 'unbuild'
2+
import type { InputPluginOption } from 'rollup'
3+
import { purgePolyfills } from 'unplugin-purge-polyfills'
24

35
export default defineBuildConfig({
46
declaration: true,
7+
hooks: {
8+
'rollup:options'(_, options) {
9+
const plugins = (options.plugins ||= []) as InputPluginOption[]
10+
plugins.push(purgePolyfills.rollup({
11+
logLevel: 'verbose',
12+
}))
13+
},
14+
},
515
rollup: {
616
inlineDependencies: true,
717
resolve: {

package.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nuxi",
3-
"version": "3.11.1",
3+
"version": "3.12.0",
44
"description": "⚡️ Nuxt Generation CLI Experience",
55
"repository": "nuxt/cli",
66
"license": "MIT",
@@ -37,54 +37,55 @@
3737
"test:types": "tsc --noEmit"
3838
},
3939
"devDependencies": {
40-
"@nuxt/eslint-config": "^0.3.12",
41-
"@nuxt/kit": "^3.11.2",
42-
"@nuxt/schema": "^3.11.2",
40+
"@nuxt/eslint-config": "^0.3.13",
41+
"@nuxt/kit": "^3.12.2",
42+
"@nuxt/schema": "^3.12.2",
4343
"@nuxt/test-utils": "^3.13.1",
4444
"@types/http-proxy": "^1.17.14",
45-
"@types/node": "^20.12.7",
45+
"@types/node": "^20.14.9",
4646
"@types/semver": "^7.5.8",
4747
"@types/ws": "^8.5.10",
48-
"c12": "^1.10.0",
48+
"c12": "^1.11.1",
4949
"changelogen": "^0.5.5",
5050
"chokidar": "^3.6.0",
5151
"citty": "^0.1.6",
5252
"clipboardy": "^4.0.0",
5353
"colorette": "^2.0.20",
5454
"consola": "^3.2.3",
5555
"destr": "^2.0.3",
56-
"eslint": "^9.2.0",
56+
"eslint": "^9.5.0",
5757
"execa": "^8.0.1",
5858
"fuse.js": "^7.0.0",
5959
"giget": "^1.2.3",
60-
"h3": "^1.11.1",
60+
"h3": "^1.12.0",
6161
"httpxy": "^0.1.5",
62-
"jiti": "^1.21.0",
62+
"jiti": "^1.21.6",
6363
"listhen": "^1.7.2",
64-
"magicast": "^0.3.3",
65-
"mlly": "^1.6.1",
66-
"nuxt": "^3.11.2",
64+
"magicast": "^0.3.4",
65+
"mlly": "^1.7.1",
66+
"nuxt": "^3.12.2",
6767
"nypm": "^0.3.8",
6868
"ofetch": "^1.3.4",
6969
"pathe": "^1.1.2",
7070
"perfect-debounce": "^1.0.0",
71-
"pkg-types": "^1.0.3",
71+
"pkg-types": "^1.1.1",
7272
"scule": "^1.3.0",
73-
"semver": "^7.6.0",
73+
"semver": "^7.6.2",
7474
"unbuild": "^2.0.0",
75+
"unplugin-purge-polyfills": "^0.0.4",
7576
"unws": "^0.2.4",
76-
"vue-tsc": "^2.0.12",
77-
"ws": "^8.16.0"
77+
"vue-tsc": "^2.0.22",
78+
"ws": "^8.17.1"
7879
},
7980
"optionalDependencies": {
8081
"fsevents": "~2.3.3"
8182
},
8283
"resolutions": {
8384
"nitropack": "npm:nitropack-nightly",
84-
"nuxt": "^3.11.2",
85-
"h3": "^1.11.1"
85+
"nuxt": "^3.12.2",
86+
"h3": "^1.12.0"
8687
},
87-
"packageManager": "pnpm@9.1.1",
88+
"packageManager": "pnpm@9.4.0",
8889
"engines": {
8990
"node": "^16.10.0 || >=18.0.0"
9091
}

playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nuxt-cli-playground",
33
"private": true,
44
"version": "1.0.0",
5-
"packageManager": "pnpm@9.1.1",
5+
"packageManager": "pnpm@9.4.0",
66
"scripts": {
77
"nuxi": "node ../bin/nuxi.mjs"
88
},

0 commit comments

Comments
 (0)