Updating object.assign polyfill to fix aliasing

vercel · Oct 18, 2019 · f78f772 · f78f772
1 parent 7ca78a2
commit f78f772
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -176,6 +176,11 @@ export default async function getBaseWebpackConfig(
               'polyfills',
               'object-assign.js'
             ),
+            'object.assign$': path.join(
+              __dirname,
+              'polyfills',
+              'object-assign.js'
+            ),
             '@babel/runtime-corejs2/core-js/object/assign':
               'next/dist/build/polyfills/object-assign.js',
           }

diff --git a/packages/next/client/polyfill.js b/packages/next/client/polyfill.js
@@ -1,2 +1,2 @@
 import 'whatwg-fetch'
-Object.assign = require('object-assign')
+Object.assign = require('object.assign/polyfill')()
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -101,6 +101,7 @@
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
     "node-fetch": "2.6.0",
+    "object.assign": "4.1.0",
     "ora": "3.4.0",
     "path-to-regexp": "2.1.0",
     "pnp-webpack-plugin": "1.5.0",

diff --git a/yarn.lock b/yarn.lock
@@ -10330,7 +10330,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
+object.assign@4.1.0, object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==