the way towards webpack 5 typings (vercel#29105)

Co-authored-by: sokra <[email protected]>

.gitattributes

@@ -0,0 +1,2 @@
+packages/next/bundles/** -text
+packages/next/compiled/** -text

.github/workflows/build_test_deploy.yml

@@ -53,7 +53,9 @@ jobs:
       - uses: actions/cache@v2
         id: cache-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
   lint:
@@ -63,7 +65,9 @@ jobs:
       - uses: actions/cache@v2
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
       - run: ./scripts/check-manifests.js
       - run: yarn lint
@@ -75,29 +79,44 @@ jobs:
     env:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
+      - uses: actions/checkout@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v2
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
+
       - uses: actions/download-artifact@v2
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         with:
           name: next-swc-binaries
           path: packages/next/build/swc/dist
+
       # Only check linux build for now, mac builds can sometimes be different even with the same code
       - run: |
           mv ./packages/next/build/swc/dist/next-swc.linux-x64-gnu.node \
             ./packages/next/native/next-swc.linux-x64-gnu.node
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
       - run: ./scripts/check-pre-compiled.sh
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
+      - uses: EndBug/add-and-commit@v7
+        if: ${{ failure() }}
+        with:
+          add: 'packages/next/compiled packages/next/bundles --force'
+          message: '⚙ Update compiled files'
+
   testUnit:
     name: Test Unit
     runs-on: ubuntu-latest
@@ -110,7 +129,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: node run-tests.js --type unit
@@ -134,7 +155,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: npm i -g [email protected] && npx playwright install-deps
@@ -170,7 +193,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: npm i -g [email protected] && npx playwright install-deps
@@ -210,7 +235,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: npm i -g [email protected] && npx playwright install-deps
@@ -236,7 +263,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       # TODO: remove after we fix watchpack watching too much
@@ -260,7 +289,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: bash ./scripts/test-pnp.sh
@@ -272,6 +303,8 @@ jobs:
     needs:
       [
         lint,
+        check-examples,
+        test-native,
         checkPrecompiled,
         testIntegration,
         testUnit,
@@ -300,7 +333,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: npm i -g [email protected] && npx playwright install-deps
@@ -321,7 +356,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
       - run: npx playwright install-deps && npx playwright install firefox
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
@@ -348,7 +385,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       # TODO: use macos runner so that we can use playwright to test against
@@ -380,7 +419,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
 
       - run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || npm i -g [email protected]'
@@ -404,7 +445,9 @@ jobs:
       - uses: actions/cache@v2
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
       - uses: actions/download-artifact@v2
         with:
@@ -422,7 +465,9 @@ jobs:
       - uses: actions/cache@v2
         id: restore-build
         with:
-          path: ./*
+          path: |
+            ./*
+            !./.git
           key: ${{ github.sha }}
       - run: ./scripts/release-stats.sh
       - uses: ./.github/actions/next-stats-action

package.json

@@ -1,5 +1,6 @@
 {
   "name": "nextjs-project",
+  "version": "0.0.0",
   "private": true,
   "workspaces": [
     "packages/*"
@@ -61,14 +62,32 @@
     "@typescript-eslint/eslint-plugin": "4.29.1",
     "@typescript-eslint/parser": "4.29.1",
     "@vercel/fetch": "6.1.1",
+    "@webassemblyjs/ast": "1.11.1",
+    "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+    "@webassemblyjs/helper-api-error": "1.11.1",
+    "@webassemblyjs/helper-buffer": "1.11.1",
+    "@webassemblyjs/helper-code-frame": "npm:[email protected]",
+    "@webassemblyjs/helper-module-context": "npm:[email protected]",
+    "@webassemblyjs/helper-numbers": "1.11.1",
+    "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+    "@webassemblyjs/helper-wasm-section": "1.11.1",
+    "@webassemblyjs/ieee754": "1.11.1",
+    "@webassemblyjs/leb128": "1.11.1",
+    "@webassemblyjs/utf8": "1.11.1",
+    "@webassemblyjs/wasm-edit": "1.11.1",
+    "@webassemblyjs/wasm-gen": "1.11.1",
+    "@webassemblyjs/wasm-opt": "1.11.1",
+    "@webassemblyjs/wasm-parser": "1.11.1",
+    "@webassemblyjs/wast-parser": "npm:[email protected]",
+    "@webassemblyjs/wast-printer": "1.11.1",
     "@zeit/next-css": "1.0.2-canary.2",
     "@zeit/next-sass": "1.0.2-canary.2",
     "@zeit/next-typescript": "1.1.2-canary.0",
     "abort-controller": "3.0.0",
     "alex": "9.1.0",
     "amphtml-validator": "1.0.33",
     "async-sema": "3.0.1",
-    "browserslist": "^4.14.7",
+    "browserslist": "4.16.6",
     "cheerio": "0.22.0",
     "clone": "2.1.2",
     "cookie": "0.4.1",

packages/next/build/entries.ts

@@ -10,6 +10,7 @@ import { ClientPagesLoaderOptions } from './webpack/loaders/next-client-pages-lo
 import { ServerlessLoaderQuery } from './webpack/loaders/next-serverless-loader'
 import { LoadedEnvFiles } from '@next/env'
 import { NextConfigComplete } from '../server/config-shared'
+import type webpack5 from 'webpack5'
 
 type PagesMapping = {
   [page: string]: string
@@ -62,21 +63,9 @@ export function createPagesMapping(
   return pages
 }
 
-export type WebpackEntrypoints = {
-  [bundle: string]:
-    | string
-    | string[]
-    | {
-        import: string | string[]
-        dependOn?: string | string[]
-        publicPath?: string
-        runtime?: string
-      }
-}
-
 type Entrypoints = {
-  client: WebpackEntrypoints
-  server: WebpackEntrypoints
+  client: webpack5.EntryObject
+  server: webpack5.EntryObject
 }
 
 export function createEntrypoints(
@@ -87,8 +76,8 @@ export function createEntrypoints(
   config: NextConfigComplete,
   loadedEnvFiles: LoadedEnvFiles
 ): Entrypoints {
-  const client: WebpackEntrypoints = {}
-  const server: WebpackEntrypoints = {}
+  const client: webpack5.EntryObject = {}
+  const server: webpack5.EntryObject = {}
 
   const hasRuntimeConfig =
     Object.keys(config.publicRuntimeConfig).length > 0 ||

packages/next/build/utils.ts

@@ -840,22 +840,25 @@ export async function isPageStatic(
     try {
       require('../shared/lib/runtime-config').setConfig(runtimeEnvConfig)
       setHttpAgentOptions(httpAgentOptions)
-      const components = await loadComponents(distDir, page, serverless)
-      const mod = components.ComponentMod
-      const Comp = mod.default || mod
+      const mod = await loadComponents(distDir, page, serverless)
+      const Comp = mod.Component
 
       if (!Comp || !isValidElementType(Comp) || typeof Comp === 'string') {
         throw new Error('INVALID_DEFAULT_EXPORT')
       }
 
       const hasGetInitialProps = !!(Comp as any).getInitialProps
-      const hasStaticProps = !!(await mod.getStaticProps)
-      const hasStaticPaths = !!(await mod.getStaticPaths)
-      const hasServerProps = !!(await mod.getServerSideProps)
-      const hasLegacyServerProps = !!(await mod.unstable_getServerProps)
-      const hasLegacyStaticProps = !!(await mod.unstable_getStaticProps)
-      const hasLegacyStaticPaths = !!(await mod.unstable_getStaticPaths)
-      const hasLegacyStaticParams = !!(await mod.unstable_getStaticParams)
+      const hasStaticProps = !!mod.getStaticProps
+      const hasStaticPaths = !!mod.getStaticPaths
+      const hasServerProps = !!mod.getServerSideProps
+      const hasLegacyServerProps = !!(await mod.ComponentMod
+        .unstable_getServerProps)
+      const hasLegacyStaticProps = !!(await mod.ComponentMod
+        .unstable_getStaticProps)
+      const hasLegacyStaticPaths = !!(await mod.ComponentMod
+        .unstable_getStaticPaths)
+      const hasLegacyStaticParams = !!(await mod.ComponentMod
+        .unstable_getStaticParams)
 
       if (hasLegacyStaticParams) {
         throw new Error(
@@ -921,14 +924,14 @@ export async function isPageStatic(
           encodedPaths: encodedPrerenderRoutes,
         } = await buildStaticPaths(
           page,
-          mod.getStaticPaths,
+          mod.getStaticPaths!,
           locales,
           defaultLocale
         ))
       }
 
       const isNextImageImported = (global as any).__NEXT_IMAGE_IMPORTED
-      const config: PageConfig = mod.config || {}
+      const config: PageConfig = mod.pageConfig
       return {
         isStatic: !hasStaticProps && !hasGetInitialProps && !hasServerProps,
         isHybridAmp: config.amp === 'hybrid',