From 5c6611d31422276d5cf5db12a74bdae150b76cc2 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 13 Feb 2020 17:35:02 -0500 Subject: [PATCH 1/3] Remove `native-url` Again --- packages/next/build/webpack-config.ts | 5 +++-- packages/next/package.json | 1 - yarn.lock | 7 ------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts index 46b587c59f057..4c2e50c0263fa 100644 --- a/packages/next/build/webpack-config.ts +++ b/packages/next/build/webpack-config.ts @@ -106,8 +106,9 @@ function getOptimizedAliases( 'object.assign/polyfill': path.join(shimAssign, 'polyfill.js'), 'object.assign/shim': path.join(shimAssign, 'shim.js'), - // Replace: full URL polyfill with platform-based polyfill - url: require.resolve('native-url'), + // TODO: re-enable + // // Replace: full URL polyfill with platform-based polyfill + // url: require.resolve('native-url'), } ) } diff --git a/packages/next/package.json b/packages/next/package.json index ec45e800681d5..d585860b2b660 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -115,7 +115,6 @@ "lru-cache": "5.1.1", "mini-css-extract-plugin": "0.8.0", "mkdirp": "0.5.1", - "native-url": "0.2.6", "node-fetch": "2.6.0", "object-assign": "4.1.1", "ora": "3.4.0", diff --git a/yarn.lock b/yarn.lock index b1b8104edc20c..87e1fcbeaa82d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10918,13 +10918,6 @@ native-or-bluebird@^1.2.0: resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9" integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck= -native-url@0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae" - integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA== - dependencies: - querystring "^0.2.0" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" From 0322dde0447f64eac81bfe0ecc3388726df41f85 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 13 Feb 2020 17:36:01 -0500 Subject: [PATCH 2/3] update comment --- packages/next/build/webpack-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts index 4c2e50c0263fa..606a31b3adbc6 100644 --- a/packages/next/build/webpack-config.ts +++ b/packages/next/build/webpack-config.ts @@ -106,7 +106,7 @@ function getOptimizedAliases( 'object.assign/polyfill': path.join(shimAssign, 'polyfill.js'), 'object.assign/shim': path.join(shimAssign, 'shim.js'), - // TODO: re-enable + // TODO: re-enable when `native-url` supports Safari 10 // // Replace: full URL polyfill with platform-based polyfill // url: require.resolve('native-url'), } From 4224369043190957fbf902adc856c0f9ef048723 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 13 Feb 2020 17:41:46 -0500 Subject: [PATCH 3/3] update sizes --- test/integration/size-limit/test/index.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js index a156295d8ea01..5cec5c5e90726 100644 --- a/test/integration/size-limit/test/index.test.js +++ b/test/integration/size-limit/test/index.test.js @@ -80,7 +80,7 @@ describe('Production response size', () => { ) // These numbers are without gzip compression! - const delta = responseSizesBytes - 226 * 1024 + const delta = responseSizesBytes - 233 * 1024 expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target }) @@ -100,7 +100,7 @@ describe('Production response size', () => { ) // These numbers are without gzip compression! - const delta = responseSizesBytes - 195 * 1024 + const delta = responseSizesBytes - 201 * 1024 expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target })