[Experimental] Nomodule polyfills chunk

packages/next-polyfill-nomodule/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@next/polyfill-nomodule",
+  "version": "0.0.0",
+  "description": "A polyfill for non-dead, nomodule browsers.",
+  "main": "dist/polyfill-nomodule.js",
+  "license": "MIT",
+  "scripts": {
+    "prepublish": "microbundle src/index.js -f iife --no-sourcemap --external none",
+    "build": "microbundle watch src/index.js -f iife --no-sourcemap --external none"
+  },
+  "devDependencies": {
+    "core-js": "3.6.4",
+    "microbundle": "0.11.0",
+    "object-assign": "4.1.1",
+    "promise-polyfill": "8.1.3",
+    "url-polyfill": "1.1.7",
+    "whatwg-fetch": "3.0.0"
+  }
+}

packages/next-polyfill-nomodule/src/index.js

@@ -0,0 +1,67 @@
+import 'core-js/modules/es6.array.copy-within'
+import 'core-js/modules/es6.array.fill'
+import 'core-js/modules/es6.array.find'
+import 'core-js/modules/es6.array.find-index'
+import 'core-js/modules/es7.array.flat-map'
+import 'core-js/modules/es6.array.from'
+import 'core-js/modules/es7.array.includes'
+import 'core-js/modules/es6.array.iterator'
+import 'core-js/modules/es6.array.of'
+import 'core-js/modules/es6.array.species'
+import 'core-js/modules/es6.function.has-instance'
+import 'core-js/modules/es6.map'
+import 'core-js/modules/es6.number.constructor'
+import 'core-js/modules/es6.number.epsilon'
+import 'core-js/modules/es6.number.is-finite'
+import 'core-js/modules/es6.number.is-integer'
+import 'core-js/modules/es6.number.is-nan'
+import 'core-js/modules/es6.number.is-safe-integer'
+import 'core-js/modules/es6.number.max-safe-integer'
+import 'core-js/modules/es6.number.min-safe-integer'
+import 'core-js/modules/es7.object.entries'
+import 'core-js/modules/es7.object.get-own-property-descriptors'
+import 'core-js/modules/es6.object.is'
+import 'core-js/modules/es7.object.values'
+import 'core-js/modules/es6.reflect.apply'
+import 'core-js/modules/es6.reflect.construct'
+import 'core-js/modules/es6.reflect.define-property'
+import 'core-js/modules/es6.reflect.delete-property'
+import 'core-js/modules/es6.reflect.get'
+import 'core-js/modules/es6.reflect.get-own-property-descriptor'
+import 'core-js/modules/es6.reflect.get-prototype-of'
+import 'core-js/modules/es6.reflect.has'
+import 'core-js/modules/es6.reflect.is-extensible'
+import 'core-js/modules/es6.reflect.own-keys'
+import 'core-js/modules/es6.reflect.prevent-extensions'
+import 'core-js/modules/es6.reflect.set'
+import 'core-js/modules/es6.reflect.set-prototype-of'
+import 'core-js/modules/es6.regexp.constructor'
+import 'core-js/modules/es6.regexp.flags'
+import 'core-js/modules/es6.regexp.match'
+import 'core-js/modules/es6.regexp.replace'
+import 'core-js/modules/es6.regexp.split'
+import 'core-js/modules/es6.regexp.search'
+import 'core-js/modules/es6.set'
+import 'core-js/modules/es6.symbol'
+import 'core-js/modules/es7.symbol.async-iterator'
+import 'core-js/modules/es6.string.code-point-at'
+import 'core-js/modules/es6.string.ends-with'
+import 'core-js/modules/es6.string.from-code-point'
+import 'core-js/modules/es6.string.includes'
+import 'core-js/modules/es6.string.iterator'
+import 'core-js/modules/es7.string.pad-start'
+import 'core-js/modules/es7.string.pad-end'
+import 'core-js/modules/es6.string.raw'
+import 'core-js/modules/es6.string.repeat'
+import 'core-js/modules/es6.string.starts-with'
+import 'core-js/modules/es7.string.trim-left'
+import 'core-js/modules/es7.string.trim-right'
+import 'core-js/modules/es6.weak-map'
+import 'core-js/modules/es6.weak-set'
+
+// Specialized Packages:
+import 'promise-polyfill/src/polyfill'
+import 'whatwg-fetch'
+import 'url-polyfill'
+import assign from 'object-assign'
+Object.assign = assign

packages/next/build/babel/preset.ts

@@ -152,7 +152,7 @@ module.exports = (
       !isServer && [
         require('@babel/plugin-transform-runtime'),
         {
-          corejs: 2,
+          corejs: false,
           helpers: true,
           regenerator: true,
           useESModules: supportsESM && presetEnvConfig.modules !== 'commonjs',

packages/next/build/index.ts

@@ -368,10 +368,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
     console.error(error)
     console.error()
 
-    if (
-      error.indexOf('private-next-pages') > -1 ||
-      error.indexOf('__next_polyfill__') > -1
-    ) {
+    if (error.indexOf('private-next-pages') > -1) {
       throw new Error(
         '> webpack config.resolve.alias was incorrectly overriden. https://err.sh/zeit/next.js/invalid-resolve-alias'
       )

packages/next/build/webpack-config.ts

@@ -66,8 +66,6 @@ function getOptimizedAliases(isServer: boolean): { [pkg: string]: string } {
 
   const shimAssign = path.join(__dirname, 'polyfills', 'object.assign')
   return {
-    // Polyfill: Window#fetch
-    __next_polyfill__fetch: require.resolve('whatwg-fetch'),
     unfetch$: stubWindowFetch,
     'isomorphic-unfetch$': stubWindowFetch,
     'whatwg-fetch$': path.join(
@@ -78,9 +76,7 @@ function getOptimizedAliases(isServer: boolean): { [pkg: string]: string } {
     ),
 
     // Polyfill: Object.assign
-    __next_polyfill__object_assign: require.resolve('object-assign'),
     'object-assign$': stubObjectAssign,
-    '@babel/runtime-corejs2/core-js/object/assign': stubObjectAssign,
 
     // Stub Package: object.assign
     'object.assign/auto': path.join(shimAssign, 'auto.js'),
@@ -485,8 +481,7 @@ export default async function getBaseWebpackConfig(
             if (
               !res.match(/next[/\\]dist[/\\]next-server[/\\]/) &&
               (res.match(/[/\\]next[/\\]dist[/\\]/) ||
-                res.match(/node_modules[/\\]@babel[/\\]runtime[/\\]/) ||
-                res.match(/node_modules[/\\]@babel[/\\]runtime-corejs2[/\\]/))
+                res.match(/node_modules[/\\]@babel[/\\]runtime[/\\]/))
             ) {
               return callback()
             }

packages/next/build/webpack/loaders/next-babel-loader.js

@@ -4,7 +4,7 @@ import hash from 'string-hash'
 
 // increment 'e' to invalidate cache
 // eslint-disable-next-line no-useless-concat
-const cacheKey = 'babel-cache-' + 'h' + '-'
+const cacheKey = 'babel-cache-' + 'i' + '-'
 const nextBabelPreset = require('../../babel/preset')
 
 const getModernOptions = (babelOptions = {}) => {

packages/next/client/index.js

@@ -14,13 +14,10 @@ import { isDynamicRoute } from '../next-server/lib/router/utils/is-dynamic'
 
 /// <reference types="react-dom/experimental" />
 
-// Polyfill Promise globally
-// This is needed because Webpack's dynamic loading(common chunks) code
-// depends on Promise.
-// So, we need to polyfill it.
-// See: https://webpack.js.org/guides/code-splitting/#dynamic-imports
-if (!window.Promise) {
-  window.Promise = require('@babel/runtime-corejs2/core-js/promise')
+// Polyfill finally only as Promise is polyfilled in the polyfills chunk
+// Finally is not supported in all module browsers
+if (!window.Promise.prototype.finally) {
+  window.Promise.prototype.finally = require('finally-polyfill')
 }
 
 const data = JSON.parse(document.getElementById('__NEXT_DATA__').textContent)

packages/next/client/polyfills.js

@@ -1,3 +1 @@
-import '__next_polyfill__fetch'
-import 'url-polyfill'
-Object.assign = require('__next_polyfill__object_assign')
+import '@next/polyfill-nomodule'

packages/next/package.json

@@ -72,7 +72,7 @@
     "@babel/preset-react": "7.7.0",
     "@babel/preset-typescript": "7.7.2",
     "@babel/runtime": "7.7.2",
-    "@babel/runtime-corejs2": "7.7.2",
+    "@next/polyfill-nomodule": "0.0.0",
     "amphtml-validator": "1.0.23",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
@@ -96,6 +96,7 @@
     "escape-string-regexp": "2.0.0",
     "etag": "1.8.1",
     "file-loader": "4.2.0",
+    "finally-polyfill": "0.1.0",
     "find-up": "4.0.0",
     "fork-ts-checker-webpack-plugin": "3.1.1",
     "fresh": "0.5.2",
@@ -112,7 +113,6 @@
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
     "node-fetch": "2.6.0",
-    "object-assign": "4.1.1",
     "ora": "3.4.0",
     "path-to-regexp": "6.1.0",
     "pnp-webpack-plugin": "1.5.0",
@@ -137,14 +137,12 @@
     "thread-loader": "2.1.3",
     "unfetch": "4.1.0",
     "url": "0.11.0",
-    "url-polyfill": "1.1.7",
     "use-subscription": "1.1.1",
     "watchpack": "2.0.0-beta.5",
     "webpack": "4.41.2",
     "webpack-dev-middleware": "3.7.0",
     "webpack-hot-middleware": "2.25.0",
-    "webpack-sources": "1.4.3",
-    "whatwg-fetch": "3.0.0"
+    "webpack-sources": "1.4.3"
   },
   "peerDependencies": {
     "react": "^16.6.0",

packages/next/taskfile-babel.js

@@ -95,11 +95,6 @@ module.exports = function(task) {
     const output = transform(file.data, options)
     const ext = extname(file.base)
 
-    output.code = output.code.replace(
-      /@babel\/runtime\//g,
-      '@babel/runtime-corejs2/'
-    )
-
     // Replace `.ts|.tsx` with `.js` in files with an extension
     if (ext) {
       const extRegex = new RegExp(ext.replace('.', '\\.') + '$', 'i')

test/integration/size-limit/test/index.test.js

@@ -81,7 +81,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizeKilobytes - 233
+    const delta = responseSizeKilobytes - 235
     expect(delta).toBeLessThanOrEqual(0) // don't increase size
     expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target
   })
@@ -101,7 +101,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizeKilobytes - 202
+    const delta = responseSizeKilobytes - 195
     expect(delta).toBeLessThanOrEqual(0) // don't increase size
     expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target
   })

yarn.lock

@@ -6614,6 +6614,11 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+[email protected]:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/finally-polyfill/-/finally-polyfill-0.1.0.tgz#2a17b16581d9477db16a703c7b79a898ac0b7d50"
+  integrity sha512-J1LEcZ5VXe1l3sEO+S//WqL5wcJ/ep7QeKJA6HhNZrcEEFj0eyC8IW3DEZhxySI2bx3r85dwAXz+vYPGuHx5UA==
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"