Merge branch 'main' into pr/misaon/3331

.eslintrc

@@ -13,8 +13,10 @@
   ],
   "rules": {
     "no-console": "off",
+    "vue/multi-word-component-names": "off",
     "vue/one-component-per-file": "off",
     "vue/require-default-prop": "off",
+    "vue/no-multiple-template-root": "off",
     "jsdoc/require-jsdoc": "off",
     "jsdoc/require-param": "off",
     "jsdoc/require-returns": "off",

.github/ISSUE_TEMPLATE/bug-report-nuxt3.yml

@@ -8,7 +8,8 @@ body:
         Please carefully read the contribution docs before creating a bug report
         👉 https://v3.nuxtjs.org/community/reporting-bugs
 
-        Please use the code sandbox template below to create a minimal reproduction
+        Please use a template below to create a minimal reproduction
+        👉 https://stackblitz.com/github/nuxt/starter/tree/v3-stackblitz
         👉 https://codesandbox.io/s/github/nuxt/starter/tree/v3-codesandbox
   - type: textarea
     id: bug-env
@@ -46,4 +47,3 @@ body:
       description: |
         Optional if provided reproduction. Please try not to insert an image but copy paste the log text.
       render: shell
-

.github/workflows/ci.yml

@@ -2,24 +2,55 @@ name: CI
 
 on:
   push:
+    paths-ignore:
+      - 'docs/**'
     branches:
       - main
   pull_request:
+    paths-ignore:
+      - 'docs/**'
     branches:
       - main
 
 jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [16]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn --immutable
+
+      - name: Build
+        run: yarn build
+
+      - name: Cache dist
+        uses: actions/cache@v3
+        with:
+          path: packages/*/dist
+          key: ${{ matrix.os }}-node-v${{ matrix.node }}-${{ github.sha }}
+
   lint:
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [16]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
@@ -30,20 +61,17 @@ jobs:
       - name: Lint
         run: yarn lint
 
-      - name: Lint (docs)
-        run: yarn lint:docs
-
   test-fixtures:
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node: [14]
+        node: [16]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
@@ -66,11 +94,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node: [14]
+        node: [16]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
@@ -85,32 +113,43 @@ jobs:
         run: yarn test:fixtures:webpack
 
   test-types:
+    needs:
+      - build
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [16]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
 
-      - name: Build
-        run: yarn build
+      - name: Restore dist cache
+        uses: actions/cache@v3
+        with:
+          path: packages/*/dist
+          key: ${{ matrix.os }}-node-v${{ matrix.node }}-${{ github.sha }}
 
       - name: Test (types)
         run: yarn test:types
 
   build-release:
+    if: |
+      github.event_name == 'push' &&
+      !contains(github.event.head_commit.message, '[skip-release]') &&
+      !contains(github.event.head_commit.message, 'chore') &&
+      !contains(github.event.head_commit.message, 'docs')
     needs:
       - lint
+      - build
       - test-fixtures
       - test-fixtures-webpack
       - test-types
@@ -119,27 +158,25 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [16]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
 
-      - name: Build
-        run: yarn build
+      - name: Restore dist cache
+        uses: actions/cache@v3
+        with:
+          path: packages/*/dist
+          key: ${{ matrix.os }}-node-v${{ matrix.node }}-${{ github.sha }}
 
       - name: Release Edge
-        if: |
-          github.event_name == 'push' &&
-          !contains(github.event.head_commit.message, '[skip-release]') &&
-          !contains(github.event.head_commit.message, 'chore') &&
-          !contains(github.event.head_commit.message, 'docs')
         run: ./scripts/release-edge.sh
         env:
           NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}

.github/workflows/docs.yml

@@ -0,0 +1,37 @@
+name: Docs
+
+on:
+  push:
+    paths:
+      - 'docs/**'
+      - '.github/workflows/docs.yml'
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'docs/**'
+      - '.github/workflows/docs.yml'
+    branches:
+      - main
+
+jobs:
+  lint-docs:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [14]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn --immutable
+
+      - name: Lint (docs)
+        run: yarn lint:docs

.yarnrc.yml

@@ -8,4 +8,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.1.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

README.md

@@ -50,7 +50,7 @@ Welcome to Nuxt 3 repository ✨
 - Ensure you have the latest LTS version of Node.js installed
 - Install dependencies with `npx yarn install`
 - Run `npx yarn stub` to activate passive development
-- Open playground with `npx yarn play`
+- Open playground with `npx yarn dev`
 
 Learn more about in our documentation on [how to contribute to Nuxt](https://v3.nuxtjs.org/community/contribution).
 
@@ -60,6 +60,7 @@ We are using [Docus](https://nuxtlabs.com/docus) for documentation (*It is plann
 
 We recommend to install the [Docus extension](https://marketplace.visualstudio.com/items?itemName=NuxtLabs.docus) for VS Code.
 
+- Run `npx yarn stub` once in the root directory
 - Go into the docs directory: `cd docs`
 - Install docs dependencies with `npx yarn install`
 - Run `npx yarn dev` to start Docus in development mode

docs/.gitignore

@@ -1,2 +1,2 @@
 schema
-*.nuxt.config.md
+**/*.configuration/nuxt.config.md

docs/README.md

@@ -0,0 +1,4 @@
+# Nuxt 3 Docs
+
+- Website: https://v3.nuxtjs.org/
+- Setup and Contribution Guide: https://v3.nuxtjs.org/community/contribution#documentation-guide

docs/assets/nuxt.css

@@ -24,3 +24,7 @@ button:focus-visible, div:focus-visible, a:focus-visible {
   border-radius: 2px;
   box-shadow: 0 0 0 2px #00DC82;
 }
+
+h1 > code, h2 > code, h3 > code, h4 > code, h5 > code, h6 > code {
+  font-size: inherit !important;
+}

docs/components/app/AppLayout.vue

@@ -2,7 +2,7 @@
   <div class="relative w-full">
     <AppHeader :links="headerLinks" />
 
-    <div class="lg:flex" :class="{ 'd-container': layout.aside }">
+    <div class="lg:flex" :class="containerClass">
       <slot v-if="['xs', 'sm', 'md'].includes($mq) || layout.aside" name="aside">
         <AppAside :links="headerLinks" :class="layout.asideClass" />
       </slot>
@@ -33,6 +33,11 @@ export default defineComponent({
   computed: {
     layout () {
       return this.$docus.layout.value
+    },
+    containerClass () {
+      if (this.layout.aside && this.layout.fluid) { return 'd-container-fluid' }
+      if (this.layout.aside) { return 'd-container' }
+      return ''
     }
   }
 })