Skip to content

Commit

Permalink
v3.0.0-rc.2 (nuxt#4763)
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 authored May 2, 2022
1 parent 1f8e3e2 commit a8d42d5
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 41 deletions.
7 changes: 7 additions & 0 deletions changelog.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"github": "nuxt/framework",
"scopeMap": {
"nuxt3": "nuxt",
"nuxi": "cli"
}
}
3 changes: 0 additions & 3 deletions docs/content/2.guide/3.directory-structure/10.pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ If you place anything within square brackets, it will be turned into a [dynamic

If you want a parameter to be _optional_, you must enclose it in double square brackets - for example, `~/pages/[[slug]]/index.vue` or `~/pages/[[slug]].vue` will match both `/` and `/test`.

::StabilityEdge{title="Optional dynamic params with [[slug]] syntax"}
::

### Example

```bash
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
],
"scripts": {
"build": "FORCE_COLOR=1 lerna run prepack --stream --no-prefix",
"changelog": "changelogen",
"cleanup": "rimraf 'packages/**/node_modules' 'examples/**/node_modules' 'node_modules'",
"dev": "yarn run nuxi dev playground",
"dev:build": "yarn run nuxi build playground",
Expand All @@ -19,7 +20,6 @@
"lint": "eslint --ext .vue,.ts,.js,.mjs .",
"lint:docs": "markdownlint ./docs/content && case-police 'docs/content**/*.md'",
"lint:docs:fix": "markdownlint ./docs/content --fix && case-police 'docs/content**/*.md' --fix",
"typecheck": "tsc --noEmit",
"nuxi": "NUXT_TELEMETRY_DISABLED=1 node ./packages/nuxi/bin/nuxi.mjs",
"nuxt": "NUXT_TELEMETRY_DISABLED=1 node ./packages/nuxi/bin/nuxi.mjs",
"play": "echo use yarn dev && exit 1",
Expand All @@ -30,6 +30,7 @@
"test:fixtures:webpack": "NUXT_TELEMETRY_DISABLED=1 TEST_WITH_WEBPACK=1 yarn test:fixtures",
"test:types": "yarn run nuxi prepare test/fixtures/basic && cd test/fixtures/basic && npx vue-tsc --noEmit",
"test:unit": "JITI_ESM_RESOLVE=1 yarn vitest run --dir packages",
"typecheck": "tsc --noEmit",
"version": "yarn && git add yarn.lock"
},
"resolutions": {
Expand All @@ -49,6 +50,7 @@
"@types/rimraf": "^3",
"@unocss/reset": "^0.32.9",
"case-police": "^0.5.3",
"changelogen": "^0.0.3",
"eslint": "^8.14.0",
"eslint-plugin-jsdoc": "^39.2.9",
"execa": "^6.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/kit",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand All @@ -13,7 +13,7 @@
"prepack": "unbuild"
},
"dependencies": {
"@nuxt/schema": "^3.0.0-rc.1",
"@nuxt/schema": "^3.0.0-rc.2",
"c12": "^0.2.7",
"consola": "^2.15.3",
"defu": "^6.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/nuxi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxi",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand All @@ -17,8 +17,8 @@
"prepack": "unbuild"
},
"devDependencies": {
"@nuxt/kit": "^3.0.0-rc.1",
"@nuxt/schema": "^3.0.0-rc.1",
"@nuxt/kit": "^3.0.0-rc.2",
"@nuxt/schema": "^3.0.0-rc.2",
"@types/clear": "^0",
"@types/mri": "^1.1.1",
"@types/semver": "^7",
Expand Down
10 changes: 5 additions & 5 deletions packages/nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxt",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand Down Expand Up @@ -30,11 +30,11 @@
"prepack": "unbuild"
},
"dependencies": {
"@nuxt/kit": "^3.0.0-rc.1",
"@nuxt/schema": "^3.0.0-rc.1",
"@nuxt/kit": "^3.0.0-rc.2",
"@nuxt/schema": "^3.0.0-rc.2",
"@nuxt/telemetry": "^2.1.3",
"@nuxt/ui-templates": "^0.1.0",
"@nuxt/vite-builder": "^3.0.0-rc.1",
"@nuxt/vite-builder": "^3.0.0-rc.2",
"@vue/reactivity": "^3.2.33",
"@vue/shared": "^3.2.33",
"@vueuse/head": "^0.7.6",
Expand All @@ -52,7 +52,7 @@
"magic-string": "^0.26.1",
"mlly": "^0.5.2",
"nitropack": "^0.3.12",
"nuxi": "^3.0.0-rc.1",
"nuxi": "^3.0.0-rc.2",
"ohash": "^0.1.0",
"ohmyfetch": "^0.4.16",
"pathe": "^0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/schema",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand Down
6 changes: 3 additions & 3 deletions packages/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/test-utils",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand All @@ -13,8 +13,8 @@
"prepack": "unbuild"
},
"dependencies": {
"@nuxt/kit": "^3.0.0-rc.1",
"@nuxt/schema": "^3.0.0-rc.1",
"@nuxt/kit": "^3.0.0-rc.2",
"@nuxt/schema": "^3.0.0-rc.2",
"defu": "^6.0.0",
"execa": "^6.1.0",
"get-port-please": "^2.5.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/vite-builder",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand All @@ -13,13 +13,13 @@
"prepack": "unbuild"
},
"devDependencies": {
"@nuxt/schema": "^3.0.0-rc.1",
"@nuxt/schema": "^3.0.0-rc.2",
"@types/cssnano": "^5",
"unbuild": "latest",
"vue": "3.2.33"
},
"dependencies": {
"@nuxt/kit": "^3.0.0-rc.1",
"@nuxt/kit": "^3.0.0-rc.2",
"@vitejs/plugin-vue": "^2.3.1",
"@vitejs/plugin-vue-jsx": "^1.3.10",
"autoprefixer": "^10.4.7",
Expand Down
6 changes: 3 additions & 3 deletions packages/webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/webpack-builder",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"repository": "nuxt/framework",
"license": "MIT",
"type": "module",
Expand All @@ -18,7 +18,7 @@
"dependencies": {
"@babel/core": "^7.17.10",
"@nuxt/friendly-errors-webpack-plugin": "^2.5.2",
"@nuxt/kit": "^3.0.0-rc.1",
"@nuxt/kit": "^3.0.0-rc.2",
"autoprefixer": "^10.4.7",
"css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^3.4.1",
Expand Down Expand Up @@ -55,7 +55,7 @@
"webpackbar": "^5.0.2"
},
"devDependencies": {
"@nuxt/schema": "^3.0.0-rc.1",
"@nuxt/schema": "^3.0.0-rc.2",
"@types/pify": "^5.0.1",
"@types/webpack-bundle-analyzer": "^4.4.1",
"@types/webpack-dev-middleware": "^5.0.2",
Expand Down
9 changes: 9 additions & 0 deletions scripts/bump-rc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

set -e

# Restore all git changes
git restore -s@ -SW -- packages examples

# Bump versions
yarn lerna version --preid rc --no-changelog --no-git-tag-version --no-push -m "chore: release rc"
3 changes: 0 additions & 3 deletions scripts/release-rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ set -e
# Restore all git changes
git restore -s@ -SW -- packages examples

# Bump versions
yarn lerna version --preid rc --no-changelog --no-git-tag-version --no-push -m "chore: release rc"

# Build all once to ensure things are nice
yarn build

Expand Down
44 changes: 30 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@nuxt/kit@workspace:packages/kit"
dependencies:
"@nuxt/schema": ^3.0.0-rc.1
"@nuxt/schema": ^3.0.0-rc.2
"@types/lodash.template": ^4
"@types/semver": ^7
c12: ^0.2.7
Expand Down Expand Up @@ -1577,8 +1577,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@nuxt/test-utils@workspace:packages/test-utils"
dependencies:
"@nuxt/kit": ^3.0.0-rc.1
"@nuxt/schema": ^3.0.0-rc.1
"@nuxt/kit": ^3.0.0-rc.2
"@nuxt/schema": ^3.0.0-rc.2
defu: ^6.0.0
execa: ^6.1.0
get-port-please: ^2.5.0
Expand Down Expand Up @@ -1622,12 +1622,12 @@ __metadata:
languageName: node
linkType: hard

"@nuxt/vite-builder@^3.0.0-rc.1, @nuxt/vite-builder@workspace:packages/vite":
"@nuxt/vite-builder@^3.0.0-rc.2, @nuxt/vite-builder@workspace:packages/vite":
version: 0.0.0-use.local
resolution: "@nuxt/vite-builder@workspace:packages/vite"
dependencies:
"@nuxt/kit": ^3.0.0-rc.1
"@nuxt/schema": ^3.0.0-rc.1
"@nuxt/kit": ^3.0.0-rc.2
"@nuxt/schema": ^3.0.0-rc.2
"@types/cssnano": ^5
"@vitejs/plugin-vue": ^2.3.1
"@vitejs/plugin-vue-jsx": ^1.3.10
Expand Down Expand Up @@ -1669,8 +1669,8 @@ __metadata:
dependencies:
"@babel/core": ^7.17.10
"@nuxt/friendly-errors-webpack-plugin": ^2.5.2
"@nuxt/kit": ^3.0.0-rc.1
"@nuxt/schema": ^3.0.0-rc.1
"@nuxt/kit": ^3.0.0-rc.2
"@nuxt/schema": ^3.0.0-rc.2
"@types/pify": ^5.0.1
"@types/webpack-bundle-analyzer": ^4.4.1
"@types/webpack-dev-middleware": ^5.0.2
Expand Down Expand Up @@ -4100,6 +4100,21 @@ __metadata:
languageName: node
linkType: hard

"changelogen@npm:^0.0.3":
version: 0.0.3
resolution: "changelogen@npm:0.0.3"
dependencies:
c12: ^0.2.7
consola: ^2.15.3
execa: ^6.1.0
mri: ^1.2.0
scule: ^0.2.1
bin:
changelogen: dist/cli.mjs
checksum: 20d9f3a559874d0d56c0fe0c626938bf0d443838fabf0854aee8eccf6f1e3eb7cbbb11de204cb09da56ab61422965e9c3ad635ee75aa88893cb8e27511234733
languageName: node
linkType: hard

"chardet@npm:^0.7.0":
version: 0.7.0
resolution: "chardet@npm:0.7.0"
Expand Down Expand Up @@ -10051,8 +10066,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "nuxi@workspace:packages/nuxi"
dependencies:
"@nuxt/kit": ^3.0.0-rc.1
"@nuxt/schema": ^3.0.0-rc.1
"@nuxt/kit": ^3.0.0-rc.2
"@nuxt/schema": ^3.0.0-rc.2
"@types/clear": ^0
"@types/mri": ^1.1.1
"@types/semver": ^7
Expand Down Expand Up @@ -10096,6 +10111,7 @@ __metadata:
"@types/rimraf": ^3
"@unocss/reset": ^0.32.9
case-police: ^0.5.3
changelogen: ^0.0.3
eslint: ^8.14.0
eslint-plugin-jsdoc: ^39.2.9
execa: ^6.1.0
Expand Down Expand Up @@ -10131,11 +10147,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "nuxt@workspace:packages/nuxt"
dependencies:
"@nuxt/kit": ^3.0.0-rc.1
"@nuxt/schema": ^3.0.0-rc.1
"@nuxt/kit": ^3.0.0-rc.2
"@nuxt/schema": ^3.0.0-rc.2
"@nuxt/telemetry": ^2.1.3
"@nuxt/ui-templates": ^0.1.0
"@nuxt/vite-builder": ^3.0.0-rc.1
"@nuxt/vite-builder": ^3.0.0-rc.2
"@types/fs-extra": ^9.0.13
"@types/hash-sum": ^1.0.0
"@vue/reactivity": ^3.2.33
Expand All @@ -10155,7 +10171,7 @@ __metadata:
magic-string: ^0.26.1
mlly: ^0.5.2
nitropack: ^0.3.12
nuxi: ^3.0.0-rc.1
nuxi: ^3.0.0-rc.2
ohash: ^0.1.0
ohmyfetch: ^0.4.16
pathe: ^0.2.0
Expand Down

0 comments on commit a8d42d5

Please sign in to comment.