Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe authored Jun 28, 2024
2 parents 240fd33 + 3cf969a commit 97877dc
Show file tree
Hide file tree
Showing 12 changed files with 1,820 additions and 1,599 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// https://code.visualstudio.com/docs/devcontainers/containers
// https://containers.dev/implementors/json_reference/
{
"image": "node:20",
"image": "node:20.15.0",
"features": {},
"customizations": {
"vscode": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
autofix:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- run: corepack enable
- uses: actions/setup-node@v4
with:
Expand All @@ -21,4 +21,4 @@ jobs:
- run: pnpm install
- name: Fix lint issues
run: pnpm run lint:fix
- uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84
- uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# permissions:
# id-token: write
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 0
- run: corepack enable
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
# Changelog


## v3.12.0

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

### 🩹 Fixes

- **prepare:** Respect `--dotenv` ([#377](https://github.com/nuxt/cli/pull/377))
- Add '@nuxt/kit' to nuxt module verification ([#386](https://github.com/nuxt/cli/pull/386), [#387](https://github.com/nuxt/cli/pull/387))
- Check`nitropack-nightly` when resolving nitro version ([bfaf128](https://github.com/nuxt/cli/commit/bfaf128))
- **dev:** Set `hmr.server` earlier in lifecycle ([#420](https://github.com/nuxt/cli/pull/420))
- **preview:** Correct path with custom `nitro.output.dir` ([#376](https://github.com/nuxt/cli/pull/376))

### 🏡 Chore

- **release:** V3.11.1 ([8e1bd03](https://github.com/nuxt/cli/commit/8e1bd03))
- Migrate to eslint v9 ([#412](https://github.com/nuxt/cli/pull/412))
- **add:** Change order of `setup` attr in templates ([#378](https://github.com/nuxt/cli/pull/378))

### ❤️ Contributors

- Xjccc ([@xjccc](http://github.com/xjccc))
- Daniel Roe ([@danielroe](http://github.com/danielroe))
- Dale Weaver ([@daleweaver777](http://github.com/daleweaver777))
- 你好怪凡 <[email protected]>
- Damian Głowala ([@DamianGlowala](http://github.com/DamianGlowala))
- Pooya Parsa ([@pi0](http://github.com/pi0))

## v3.11.1

[compare changes](https://github.com/nuxt/cli/compare/v3.11.0...v3.11.1)
Expand Down
10 changes: 10 additions & 0 deletions build.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
import { defineBuildConfig } from 'unbuild'
import type { InputPluginOption } from 'rollup'
import { purgePolyfills } from 'unplugin-purge-polyfills'

export default defineBuildConfig({
declaration: true,
hooks: {
'rollup:options'(_, options) {
const plugins = (options.plugins ||= []) as InputPluginOption[]
plugins.push(purgePolyfills.rollup({
logLevel: 'verbose',
}))
},
},
rollup: {
inlineDependencies: true,
resolve: {
Expand Down
39 changes: 20 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxi",
"version": "3.11.1",
"version": "3.12.0",
"description": "⚡️ Nuxt Generation CLI Experience",
"repository": "nuxt/cli",
"license": "MIT",
Expand Down Expand Up @@ -37,54 +37,55 @@
"test:types": "tsc --noEmit"
},
"devDependencies": {
"@nuxt/eslint-config": "^0.3.12",
"@nuxt/kit": "^3.11.2",
"@nuxt/schema": "^3.11.2",
"@nuxt/eslint-config": "^0.3.13",
"@nuxt/kit": "^3.12.2",
"@nuxt/schema": "^3.12.2",
"@nuxt/test-utils": "^3.13.1",
"@types/http-proxy": "^1.17.14",
"@types/node": "^20.12.7",
"@types/node": "^20.14.9",
"@types/semver": "^7.5.8",
"@types/ws": "^8.5.10",
"c12": "^1.10.0",
"c12": "^1.11.1",
"changelogen": "^0.5.5",
"chokidar": "^3.6.0",
"citty": "^0.1.6",
"clipboardy": "^4.0.0",
"colorette": "^2.0.20",
"consola": "^3.2.3",
"destr": "^2.0.3",
"eslint": "^9.2.0",
"eslint": "^9.5.0",
"execa": "^8.0.1",
"fuse.js": "^7.0.0",
"giget": "^1.2.3",
"h3": "^1.11.1",
"h3": "^1.12.0",
"httpxy": "^0.1.5",
"jiti": "^1.21.0",
"jiti": "^1.21.6",
"listhen": "^1.7.2",
"magicast": "^0.3.3",
"mlly": "^1.6.1",
"nuxt": "^3.11.2",
"magicast": "^0.3.4",
"mlly": "^1.7.1",
"nuxt": "^3.12.2",
"nypm": "^0.3.8",
"ofetch": "^1.3.4",
"pathe": "^1.1.2",
"perfect-debounce": "^1.0.0",
"pkg-types": "^1.0.3",
"pkg-types": "^1.1.1",
"scule": "^1.3.0",
"semver": "^7.6.0",
"semver": "^7.6.2",
"unbuild": "^2.0.0",
"unplugin-purge-polyfills": "^0.0.4",
"unws": "^0.2.4",
"vue-tsc": "^2.0.12",
"ws": "^8.16.0"
"vue-tsc": "^2.0.22",
"ws": "^8.17.1"
},
"optionalDependencies": {
"fsevents": "~2.3.3"
},
"resolutions": {
"nitropack": "npm:nitropack-nightly",
"nuxt": "^3.11.2",
"h3": "^1.11.1"
"nuxt": "^3.12.2",
"h3": "^1.12.0"
},
"packageManager": "pnpm@9.1.1",
"packageManager": "pnpm@9.4.0",
"engines": {
"node": "^16.10.0 || >=18.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nuxt-cli-playground",
"private": true,
"version": "1.0.0",
"packageManager": "pnpm@9.1.1",
"packageManager": "pnpm@9.4.0",
"scripts": {
"nuxi": "node ../bin/nuxi.mjs"
},
Expand Down
Loading

0 comments on commit 97877dc

Please sign in to comment.