Merge branch 'lk/next/vsc/409' of https://github.com/lubakravche/next.js

 into lk/next/vsc/409

.github/CODEOWNERS

@@ -1,11 +1,36 @@
 # Learn how to add code owners here:
 # https://help.github.com/en/articles/about-code-owners
 
-# Codeowners now use Vercel Spaces
-# Search .vercel.approvers for all files
+
+*                                             @timneutkens @ijjk @shuding @huozhi @feedthejim
+/.git*                                        @vercel/next-js @vercel/devex
+/docs/                                        @vercel/next-js @vercel/devex
+/errors/                                      @vercel/next-js @vercel/devex
+/examples/                                    @vercel/next-js @vercel/devex
+/scripts/                                     @vercel/next-js
+/.alex*                                       @vercel/next-js @leerob
+/.eslint*                                     @vercel/next-js @leerob
+/.prettier*                                   @vercel/next-js @leerob
+/*.md                                         @vercel/next-js @vercel/devex
+/*.mdx                                        @vercel/next-js @vercel/devex
+/packages/create-next-app/                    @vercel/next-js
+/pnpm-lock.yaml                               @vercel/next-js @vercel/web-tooling
 
 # Image Component (@styfle)
 
 /**/*image*                                   @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
 /**/*image*/**                                @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
+/packages/next/client/use-intersection.tsx    @timneutkens @ijjk @shuding @styfle
+/packages/next/server/lib/squoosh/            @timneutkens @ijjk @shuding @styfle
+/packages/next/server/serve-static.ts         @timneutkens @ijjk @shuding @styfle @huozhi
+/packages/next/server/config.ts               @timneutkens @ijjk @shuding @styfle @huozhi
+
+# Tooling & Telemetry
 
+/packages/next/src/build/                     @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/packages/next/src/telemetry/                 @timneutkens @ijjk @shuding @padmaia
+/packages/next-swc/                           @timneutkens @ijjk @shuding @vercel/web-tooling
+Cargo.toml                                    @timneutkens @ijjk @shuding @vercel/web-tooling
+Cargo.lock                                    @timneutkens @ijjk @shuding @vercel/web-tooling
+/.cargo/config.toml                           @timneutkens @ijjk @shuding @vercel/web-tooling
+/.config/nextest.toml                         @timneutkens @ijjk @shuding @vercel/web-tooling

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -27,7 +27,7 @@ body:
       label: Which area(s) of Next.js are affected? (leave empty if unsure)
       multiple: true
       options:
-        - 'App directory (appDir: true)'
+        - 'App Router'
         - 'CLI (create-next-app)'
         - 'Data fetching (gS(S)P, getInitialProps)'
         - 'Dynamic imports (next/dynamic)'