Merge branch 'canary' into JanKaifer-patch-1

vercel · Dec 19, 2022 · fd173ea · fd173ea
2 parents cc54d8d + ae5502e
commit fd173ea
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 79 deletions.
diff --git a/docs/api-reference/data-fetching/get-static-props.md b/docs/api-reference/data-fetching/get-static-props.md
@@ -233,8 +233,7 @@ export const getStaticProps: GetStaticProps<{ posts: Post[] }> = async (
 If you want to get inferred typings for your props, you can use `InferGetStaticPropsType<typeof getStaticProps>`:
 
 ```tsx
-import { InferGetStaticPropsType } from 'next'
-import { GetStaticProps } from 'next'
+import type { InferGetStaticPropsType, GetStaticProps } from 'next'
 
 type Post = {
   author: string

diff --git a/packages/next/build/webpack/plugins/flight-client-entry-plugin.ts b/packages/next/build/webpack/plugins/flight-client-entry-plugin.ts
@@ -345,14 +345,18 @@ export class FlightClientEntryPlugin {
         stage: webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH,
       },
       (assets: webpack.Compilation['assets']) => {
-        const manifest = JSON.stringify({
-          ...serverCSSManifest,
-          ...edgeServerCSSManifest,
-          __entry_css__: {
-            ...serverCSSManifest.__entry_css__,
-            ...edgeServerCSSManifest.__entry_css__,
+        const manifest = JSON.stringify(
+          {
+            ...serverCSSManifest,
+            ...edgeServerCSSManifest,
+            __entry_css__: {
+              ...serverCSSManifest.__entry_css__,
+              ...edgeServerCSSManifest.__entry_css__,
+            },
           },
-        })
+          null,
+          this.dev ? 2 : undefined
+        )
         assets[FLIGHT_SERVER_CSS_MANIFEST + '.json'] = new sources.RawSource(
           manifest
         ) as unknown as webpack.sources.RawSource

diff --git a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
@@ -191,7 +191,9 @@ export class FlightManifestPlugin {
           ssrNamedModuleId = `./${ssrNamedModuleId.replace(/\\/g, '/')}`
 
         if (isCSSModule) {
-          const chunks = [...chunk.files].filter((f) => f.endsWith('.css'))
+          const chunks = [...chunk.files].filter(
+            (f) => !f.startsWith('static/css/pages/') && f.endsWith('.css')
+          )
           if (!manifest[resource]) {
             manifest[resource] = {
               default: {
@@ -350,7 +352,7 @@ export class FlightManifestPlugin {
     })
 
     const file = 'server/' + FLIGHT_MANIFEST
-    const json = JSON.stringify(manifest)
+    const json = JSON.stringify(manifest, null, this.dev ? 2 : undefined)
 
     ASYNC_CLIENT_MODULES.clear()
 

diff --git a/test/e2e/app-dir/app-alias.test.ts b/test/e2e/app-dir/app-alias.test.ts
@@ -5,13 +5,6 @@ createNextDescribe(
   'app-dir alias handling',
   {
     files: path.join(__dirname, 'app-alias'),
-    dependencies: {
-      react: 'latest',
-      'react-dom': 'latest',
-      typescript: 'latest',
-      '@types/react': 'latest',
-      '@types/node': 'latest',
-    },
     packageJson: {
       type: 'module',
     },

diff --git a/test/e2e/app-dir/app-edge-global.test.ts b/test/e2e/app-dir/app-edge-global.test.ts
@@ -5,13 +5,6 @@ createNextDescribe(
   'app-dir global edge configuration',
   {
     files: path.join(__dirname, 'app-edge-global'),
-    dependencies: {
-      react: 'latest',
-      'react-dom': 'latest',
-      typescript: 'latest',
-      '@types/react': 'latest',
-      '@types/node': 'latest',
-    },
     skipDeployment: true,
   },
   ({ next }) => {

diff --git a/test/e2e/app-dir/app-edge.test.ts b/test/e2e/app-dir/app-edge.test.ts
@@ -6,13 +6,6 @@ createNextDescribe(
   'app-dir edge SSR',
   {
     files: path.join(__dirname, 'app-edge'),
-    dependencies: {
-      react: 'latest',
-      'react-dom': 'latest',
-      typescript: 'latest',
-      '@types/react': 'latest',
-      '@types/node': 'latest',
-    },
     skipDeployment: true,
   },
   ({ next }) => {

diff --git a/test/e2e/app-dir/create-root-layout.test.ts b/test/e2e/app-dir/create-root-layout.test.ts
@@ -218,13 +218,6 @@ describe('app-dir create root layout', () => {
               path.join(__dirname, 'create-root-layout/next.config.js')
             ),
           },
-          dependencies: {
-            react: 'latest',
-            'react-dom': 'latest',
-            typescript: 'latest',
-            '@types/react': 'latest',
-            '@types/node': 'latest',
-          },
         })
       })
       afterAll(() => next.destroy())

diff --git a/test/e2e/app-dir/import.test.ts b/test/e2e/app-dir/import.test.ts
@@ -5,13 +5,6 @@ createNextDescribe(
   'app dir imports',
   {
     files: path.join(__dirname, 'import'),
-    dependencies: {
-      react: 'latest',
-      'react-dom': 'latest',
-      typescript: 'latest',
-      '@types/react': 'latest',
-      '@types/node': 'latest',
-    },
   },
   ({ next }) => {
     ;['js', 'jsx', 'ts', 'tsx'].forEach((ext) => {

diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
@@ -1315,6 +1315,11 @@ createNextDescribe(
           ).toBe('rgb(0, 0, 255)')
         })
 
+        it('should not contain pages css in app dir page', async () => {
+          const html = await next.render('/css/css-page')
+          expect(html).not.toContain('/pages/_app.css')
+        })
+
         if (!isDev) {
           it('should not include unused css modules in the page in prod', async () => {
             const browser = await next.browser('/css/css-page/unused')

diff --git a/test/e2e/app-dir/layout-params.test.ts b/test/e2e/app-dir/layout-params.test.ts
@@ -5,13 +5,6 @@ createNextDescribe(
   'app dir - layout params',
   {
     files: path.join(__dirname, './layout-params'),
-    dependencies: {
-      react: 'latest',
-      'react-dom': 'latest',
-      typescript: 'latest',
-      '@types/react': 'latest',
-      '@types/node': 'latest',
-    },
   },
   ({ next }) => {
     describe('basic params', () => {

diff --git a/test/e2e/app-dir/navigation-and-querystring/navigation-and-querystring.test.ts b/test/e2e/app-dir/navigation-and-querystring/navigation-and-querystring.test.ts
@@ -9,13 +9,6 @@ describe('app-dir navigation and querystring', () => {
   beforeAll(async () => {
     next = await createNext({
       files: new FileRef(__dirname),
-      dependencies: {
-        react: 'latest',
-        'react-dom': 'latest',
-        typescript: 'latest',
-        '@types/react': 'latest',
-        '@types/node': 'latest',
-      },
     })
   })
   afterAll(() => next.destroy())

diff --git a/test/e2e/app-dir/use-selected-layout-segment-s/use-selected-layout-segment-s.test.ts b/test/e2e/app-dir/use-selected-layout-segment-s/use-selected-layout-segment-s.test.ts
@@ -9,13 +9,6 @@ describe('useSelectedLayoutSegment(s)', () => {
   beforeAll(async () => {
     next = await createNext({
       files: new FileRef(__dirname),
-      dependencies: {
-        react: 'latest',
-        'react-dom': 'latest',
-        typescript: 'latest',
-        '@types/react': 'latest',
-        '@types/node': 'latest',
-      },
     })
   })
   afterAll(() => next.destroy())

diff --git a/test/e2e/new-link-behavior/typescript.test.ts b/test/e2e/new-link-behavior/typescript.test.ts
@@ -17,11 +17,6 @@ describe('New Link Behavior', () => {
         'tsconfig.json': new FileRef(path.join(appDir, 'tsconfig.json')),
         'next.config.js': new FileRef(path.join(appDir, 'next.config.js')),
       },
-      dependencies: {
-        typescript: '*',
-        '@types/react': '*',
-        '@types/node': '*',
-      },
     })
   })
   afterAll(() => next.destroy())

diff --git a/test/e2e/test-utils-tests/basic/basic.test.ts b/test/e2e/test-utils-tests/basic/basic.test.ts
@@ -1,4 +1,4 @@
-import { createNext, FileRef } from 'e2e-utils'
+import { createNext } from 'e2e-utils'
 import { NextInstance } from 'test/lib/next-modes/base'
 import { fetchViaHTTP } from 'next-test-utils'
 
@@ -7,12 +7,7 @@ describe('createNext', () => {
 
   beforeAll(async () => {
     next = await createNext({
-      files: new FileRef(__dirname),
-      dependencies: {
-        typescript: 'latest',
-        '@types/react': 'latest',
-        '@types/node': 'latest',
-      },
+      files: __dirname,
     })
   })
   afterAll(() => next.destroy())

diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts
@@ -129,6 +129,9 @@ export class NextInstance {
         const finalDependencies = {
           react: reactVersion,
           'react-dom': reactVersion,
+          '@types/react': reactVersion,
+          typescript: 'latest',
+          '@types/node': 'latest',
           ...this.dependencies,
           ...this.packageJson?.dependencies,
         }

diff --git a/test/production/ci-missing-typescript-deps/index.test.ts b/test/production/ci-missing-typescript-deps/index.test.ts
@@ -14,6 +14,9 @@ describe('ci-missing-typescript-deps', () => {
         CI: '1',
       },
       skipStart: true,
+      dependencies: {
+        typescript: undefined,
+      },
     })
     try {
       let error