Skip to content

Commit

Permalink
Revert "Re-Enable Native url Module (#10530)" (#10623)
Browse files Browse the repository at this point in the history
This reverts commit b329f6a.
  • Loading branch information
Timer committed Feb 21, 2020
1 parent f5cb1a6 commit 40217b7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
5 changes: 3 additions & 2 deletions packages/next/build/webpack-config.ts
Expand Up @@ -88,8 +88,9 @@ function getOptimizedAliases(isServer: boolean): { [pkg: string]: string } {
'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 when `native-url` supports Safari 10
// // Replace: full URL polyfill with platform-based polyfill
// url: require.resolve('native-url'),
}
)
}
Expand Down
3 changes: 1 addition & 2 deletions packages/next/package.json
Expand Up @@ -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",
"ora": "3.4.0",
"path-to-regexp": "6.1.0",
Expand All @@ -141,7 +140,7 @@
"thread-loader": "2.1.3",
"unfetch": "4.1.0",
"url": "0.11.0",
"url-polyfill": "1.1.8",
"url-polyfill": "1.1.7",
"use-subscription": "1.1.1",
"watchpack": "2.0.0-beta.13",
"webpack": "4.41.2",
Expand Down
4 changes: 2 additions & 2 deletions test/integration/size-limit/test/index.test.js
Expand Up @@ -80,7 +80,7 @@ describe('Production response size', () => {
)

// These numbers are without gzip compression!
const delta = responseSizesBytes - 230 * 1024
const delta = responseSizesBytes - 238 * 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
})
Expand All @@ -100,7 +100,7 @@ describe('Production response size', () => {
)

// These numbers are without gzip compression!
const delta = responseSizesBytes - 163 * 1024
const delta = responseSizesBytes - 171 * 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
})
Expand Down
12 changes: 0 additions & 12 deletions yarn.lock
Expand Up @@ -10953,13 +10953,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"
Expand Down Expand Up @@ -16564,11 +16557,6 @@ url-polyfill@1.1.7:
resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.7.tgz#402ee84360eb549bbeb585f4c7971e79a31de9e3"
integrity sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA==

url-polyfill@1.1.8:
version "1.1.8"
resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.8.tgz#21eb58ad61192f52b77dcac8ab5293ae7bc67060"
integrity sha512-Ey61F4FEqhcu1vHSOMmjl0Vd/RPRLEjMj402qszD/dhMBrVfoUsnIj8KSZo2yj+eIlxJGKFdnm6ES+7UzMgZ3Q==

url-template@^2.0.8:
version "2.0.8"
resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
Expand Down

0 comments on commit 40217b7

Please sign in to comment.