omit propsal-dynamic-import

Author: huozhi

packages/next/client/index.tsx

@@ -468,7 +468,7 @@ export function renderError(renderErrorProps: RenderErrorProps): Promise<any> {
     .loadPage('/_error')
     .then(({ page: ErrorComponent, styleSheets }) => {
       return lastAppProps?.Component === ErrorComponent
-        ? import('next/dist/pages/_error').then((m) => ({
+        ? import('../pages/_error').then((m) => ({
             ErrorComponent: m.default as React.ComponentType<{}>,
             styleSheets: [],
           }))

packages/next/taskfile-babel.js

@@ -6,8 +6,6 @@ const path = require('path')
 // eslint-disable-next-line import/no-extraneous-dependencies
 const transform = require('@babel/core').transform
 
-const clientPath = path.resolve(__dirname, 'client')
-
 const babelClientPresetEnvOptions = {
   modules: 'commonjs',
   targets: {
@@ -20,6 +18,7 @@ const babelClientPresetEnvOptions = {
     'transform-typeof-symbol',
     'transform-async-to-generator',
     'transform-spread',
+    'proposal-dynamic-import',
   ],
 }
 
@@ -41,15 +40,6 @@ const babelClientOpts = {
       // eslint-disable-next-line import/no-extraneous-dependencies
       plugins: [require('@babel/plugin-proposal-numeric-separator').default],
     },
-    {
-      test: (p) => p.startsWith(clientPath),
-      presets: [
-        [
-          '@babel/preset-env',
-          { ...babelClientPresetEnvOptions, modules: false },
-        ],
-      ],
-    },
   ],
 }
 

packages/next/types/misc.d.ts

@@ -45,8 +45,6 @@ declare module 'next/dist/compiled/arg/index.js' {
   export = arg
 }
 
-declare module 'next/dist/pages/_error'
-
 declare module 'next/dist/compiled/babel/code-frame' {
   export * from '@babel/code-frame'
 }

test/integration/build-output/test/index.test.js

@@ -123,16 +123,16 @@ describe('Build Output', () => {
           )
           expect(indexSize.endsWith('B')).toBe(true)
 
-          expect(parseFloat(indexFirstLoad)).toBeCloseTo(gz ? 64 : 196, 1)
+          expect(parseFloat(indexFirstLoad)).toBeCloseTo(gz ? 64.7 : 198, 1)
           expect(indexFirstLoad.endsWith('kB')).toBe(true)
 
           expect(parseFloat(err404Size)).toBeCloseTo(gz ? 3.17 : 8.51, 1)
           expect(err404Size.endsWith('kB')).toBe(true)
 
-          expect(parseFloat(err404FirstLoad)).toBeCloseTo(gz ? 66.9 : 205, 1)
+          expect(parseFloat(err404FirstLoad)).toBeCloseTo(gz ? 67.6 : 206, 1)
           expect(err404FirstLoad.endsWith('kB')).toBe(true)
 
-          expect(parseFloat(sharedByAll)).toBeCloseTo(gz ? 63.7 : 196, 1)
+          expect(parseFloat(sharedByAll)).toBeCloseTo(gz ? 64.5 : 198, 1)
           expect(sharedByAll.endsWith('kB')).toBe(true)
 
           const appSizeValue = _appSize.endsWith('kB')
@@ -144,12 +144,12 @@ describe('Build Output', () => {
           const webpackSizeValue = webpackSize.endsWith('kB')
             ? parseFloat(webpackSize)
             : parseFloat(webpackSize) / 1000
-          expect(webpackSizeValue).toBeCloseTo(gz ? 0.766 : 1.46, 2)
+          expect(webpackSizeValue).toBeCloseTo(gz ? 1.42 : 2.9, 2)
           expect(webpackSize.endsWith('kB') || webpackSize.endsWith(' B')).toBe(
             true
           )
 
-          expect(parseFloat(mainSize)).toBeCloseTo(gz ? 20.1 : 62.7, 1)
+          expect(parseFloat(mainSize)).toBeCloseTo(gz ? 20.2 : 63, 1)
           expect(mainSize.endsWith('kB')).toBe(true)
 
           expect(parseFloat(frameworkSize)).toBeCloseTo(gz ? 42.0 : 130, 1)