From a52d339573771b58480aa937950cbf2d426befdf Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Mon, 2 May 2022 21:44:52 +0200
Subject: [PATCH 1/5] add changelog config

---
 changelog.config.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog.config.json

diff --git a/changelog.config.json b/changelog.config.json
new file mode 100644
index 00000000000..e67d5e36fe9
--- /dev/null
+++ b/changelog.config.json
@@ -0,0 +1,7 @@
+{
+ "github": "nuxt/framework",
+ "scopeMap": {
+   "nuxt3": "nuxt",
+   "nuxi": "cli"
+  }
+}
\ No newline at end of file

From bc401fd1b1cdc3a8c7aa6af65878de1f6822204b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Mon, 2 May 2022 21:46:39 +0200
Subject: [PATCH 2/5] v3.0.0-rc.2

---
 packages/kit/package.json        |  4 ++--
 packages/nuxi/package.json       |  6 +++---
 packages/nuxt/package.json       | 10 +++++-----
 packages/schema/package.json     |  2 +-
 packages/test-utils/package.json |  6 +++---
 packages/vite/package.json       |  6 +++---
 packages/webpack/package.json    |  6 +++---
 scripts/bump-rc.sh               |  9 +++++++++
 scripts/release-rc.sh            |  3 ---
 yarn.lock                        | 28 ++++++++++++++--------------
 10 files changed, 43 insertions(+), 37 deletions(-)
 create mode 100755 scripts/bump-rc.sh

diff --git a/packages/kit/package.json b/packages/kit/package.json
index 0f08bf69e43..55b3eaee701 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -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",
@@ -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",
diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json
index e67f79a67ac..35e4ee7c5c7 100644
--- a/packages/nuxi/package.json
+++ b/packages/nuxi/package.json
@@ -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",
@@ -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",
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 5f31b9d4c9f..f34f2cd45aa 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -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",
@@ -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",
@@ -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",
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 728cc9f7e69..3edfb102392 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -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",
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 869091d9b5e..6a579e4f3ff 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -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",
@@ -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",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index b3d9920807c..9a0a54f031e 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -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",
@@ -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",
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 8a39e06fb98..7d4fdab55d3 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -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",
@@ -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",
@@ -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",
diff --git a/scripts/bump-rc.sh b/scripts/bump-rc.sh
new file mode 100755
index 00000000000..58c0a3fa450
--- /dev/null
+++ b/scripts/bump-rc.sh
@@ -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"
diff --git a/scripts/release-rc.sh b/scripts/release-rc.sh
index 767c27dd456..45040b65d03 100755
--- a/scripts/release-rc.sh
+++ b/scripts/release-rc.sh
@@ -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
 
diff --git a/yarn.lock b/yarn.lock
index 6deecde1c7b..9a9e4466340 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10051,8 +10051,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
@@ -10131,11 +10131,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
@@ -10155,7 +10155,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

From 5ec506a710798e0e0f2442881891344bb659e4dd Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Mon, 2 May 2022 21:48:18 +0200
Subject: [PATCH 3/5] add changelog dependency

---
 changelog.config.json |  2 +-
 package.json          |  4 +++-
 yarn.lock             | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/changelog.config.json b/changelog.config.json
index e67d5e36fe9..93514ab5534 100644
--- a/changelog.config.json
+++ b/changelog.config.json
@@ -4,4 +4,4 @@
    "nuxt3": "nuxt",
    "nuxi": "cli"
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 2114633fa1e..f7b6c47ca2b 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -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",
@@ -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": {
@@ -49,6 +50,7 @@
     "@types/rimraf": "^3",
     "@unocss/reset": "^0.32.9",
     "case-police": "^0.5.3",
+    "changelogen": "^0.0.2",
     "eslint": "^8.14.0",
     "eslint-plugin-jsdoc": "^39.2.9",
     "execa": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 9a9e4466340..81fba516646 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4100,6 +4100,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"changelogen@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "changelogen@npm:0.0.2"
+  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: 9721ec963ed42febc45c1ff9d57251fd7f96bac356cce6eb3cd8136dc3e6ab8d3a9c7e015bfde652416a1708cc450c14512f81dfd6eabcedddd9cf537a3ce1cd
+  languageName: node
+  linkType: hard
+
 "chardet@npm:^0.7.0":
   version: 0.7.0
   resolution: "chardet@npm:0.7.0"
@@ -10096,6 +10111,7 @@ __metadata:
     "@types/rimraf": ^3
     "@unocss/reset": ^0.32.9
     case-police: ^0.5.3
+    changelogen: ^0.0.2
     eslint: ^8.14.0
     eslint-plugin-jsdoc: ^39.2.9
     execa: ^6.1.0

From cbeeb4f9d1f1ba4cd5831320273e306c5661fdde Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Mon, 2 May 2022 21:51:48 +0200
Subject: [PATCH 4/5] docs: remove edge notice

---
 docs/content/2.guide/3.directory-structure/10.pages.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/content/2.guide/3.directory-structure/10.pages.md b/docs/content/2.guide/3.directory-structure/10.pages.md
index 126642dc22d..0bfa39e4b18 100644
--- a/docs/content/2.guide/3.directory-structure/10.pages.md
+++ b/docs/content/2.guide/3.directory-structure/10.pages.md
@@ -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

From 6d98012d421ecad7326794c67809d1ceff78abbf Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Mon, 2 May 2022 22:36:25 +0200
Subject: [PATCH 5/5] update changelog script

---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index f7b6c47ca2b..9712f635dec 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@types/rimraf": "^3",
     "@unocss/reset": "^0.32.9",
     "case-police": "^0.5.3",
-    "changelogen": "^0.0.2",
+    "changelogen": "^0.0.3",
     "eslint": "^8.14.0",
     "eslint-plugin-jsdoc": "^39.2.9",
     "execa": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 81fba516646..1e3416bc82b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4100,9 +4100,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"changelogen@npm:^0.0.2":
-  version: 0.0.2
-  resolution: "changelogen@npm:0.0.2"
+"changelogen@npm:^0.0.3":
+  version: 0.0.3
+  resolution: "changelogen@npm:0.0.3"
   dependencies:
     c12: ^0.2.7
     consola: ^2.15.3
@@ -4111,7 +4111,7 @@ __metadata:
     scule: ^0.2.1
   bin:
     changelogen: dist/cli.mjs
-  checksum: 9721ec963ed42febc45c1ff9d57251fd7f96bac356cce6eb3cd8136dc3e6ab8d3a9c7e015bfde652416a1708cc450c14512f81dfd6eabcedddd9cf537a3ce1cd
+  checksum: 20d9f3a559874d0d56c0fe0c626938bf0d443838fabf0854aee8eccf6f1e3eb7cbbb11de204cb09da56ab61422965e9c3ad635ee75aa88893cb8e27511234733
   languageName: node
   linkType: hard
 
@@ -10111,7 +10111,7 @@ __metadata:
     "@types/rimraf": ^3
     "@unocss/reset": ^0.32.9
     case-police: ^0.5.3
-    changelogen: ^0.0.2
+    changelogen: ^0.0.3
     eslint: ^8.14.0
     eslint-plugin-jsdoc: ^39.2.9
     execa: ^6.1.0