From 756a32aefd36c23c3b96227cdff58507cde21133 Mon Sep 17 00:00:00 2001 From: Arunoda Susiripala Date: Sun, 26 Feb 2017 08:26:55 +0530 Subject: [PATCH] Remove unfetch because of production build errors. (#1288) See https://github.com/zeit/next.js/pull/1278#issuecomment-282528628 --- lib/router/router.js | 2 +- package.json | 2 +- yarn.lock | 133 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 107 insertions(+), 30 deletions(-) diff --git a/lib/router/router.js b/lib/router/router.js index a830726a..e3141a35 100644 --- a/lib/router/router.js +++ b/lib/router/router.js @@ -10,7 +10,7 @@ import { _notifyBuildIdMismatch } from './' // Add "fetch" polyfill for older browsers if (typeof window !== 'undefined') { - require('unfetch/polyfill') + require('whatwg-fetch') } export default class Router extends EventEmitter { diff --git a/package.json b/package.json index 92712955..04479de4 100644 --- a/package.json +++ b/package.json @@ -79,12 +79,12 @@ "source-map-support": "0.4.11", "strip-ansi": "3.0.1", "styled-jsx": "0.5.7", - "unfetch": "2.0.1", "url": "0.11.0", "uuid": "3.0.1", "webpack": "2.2.1", "webpack-dev-middleware": "1.10.1", "webpack-hot-middleware": "2.17.1", + "whatwg-fetch": "2.0.2", "write-file-webpack-plugin": "3.4.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 13c55aa6..0dd93ce5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -71,10 +71,6 @@ ansi-escapes@^1.1.0, ansi-escapes@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" -ansi-html@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.6.tgz#bda8e33dd2ee1c20f54c08eb405713cbfc0ed80e" - ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" @@ -2782,9 +2778,9 @@ jest-changed-files@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-19.0.0.tgz#8c1a43a4ffccbcb8ae12e819104585adf2ed93a6" -jest-cli@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-19.0.0.tgz#327398717a583bd5d5d97564eb3d762c514e97ff" +jest-cli@19.0.1: + version "19.0.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-19.0.1.tgz#79630200c3a33a0b15e81b369cf60c35552722c8" dependencies: ansi-escapes "^1.4.0" callsites "^2.0.0" @@ -2795,25 +2791,26 @@ jest-cli@19.0.0: istanbul-lib-coverage "^1.0.0" istanbul-lib-instrument "^1.1.1" jest-changed-files "^19.0.0" - jest-config "^19.0.0" - jest-environment-jsdom "^19.0.0" + jest-config "^19.0.1" + jest-environment-jsdom "^19.0.1" jest-haste-map "^19.0.0" - jest-jasmine2 "^19.0.0" + jest-jasmine2 "^19.0.1" jest-message-util "^19.0.0" jest-regex-util "^19.0.0" jest-resolve-dependencies "^19.0.0" - jest-runtime "^19.0.0" - jest-snapshot "^19.0.0" - jest-util "^19.0.0" + jest-runtime "^19.0.1" + jest-snapshot "^19.0.1" + jest-util "^19.0.1" micromatch "^2.3.11" node-notifier "^5.0.1" + slash "^1.0.0" string-length "^1.0.1" throat "^3.0.0" which "^1.1.1" worker-farm "^1.3.1" yargs "^6.3.0" -jest-config@^19.0.0, jest-config@^19.0.1: +jest-config@^19.0.1: version "19.0.1" resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-19.0.1.tgz#a50698aca3b70949ff4e3898d339a13e166d8fb8" dependencies: @@ -2826,6 +2823,19 @@ jest-config@^19.0.0, jest-config@^19.0.1: jest-validate "^19.0.0" pretty-format "^19.0.0" +jest-config@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-19.0.2.tgz#1b9bd2db0ddd16df61c2b10a54009e1768da6411" + dependencies: + chalk "^1.1.1" + jest-environment-jsdom "^19.0.2" + jest-environment-node "^19.0.2" + jest-jasmine2 "^19.0.2" + jest-regex-util "^19.0.0" + jest-resolve "^19.0.2" + jest-validate "^19.0.2" + pretty-format "^19.0.0" + jest-diff@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c" @@ -2835,7 +2845,7 @@ jest-diff@^19.0.0: jest-matcher-utils "^19.0.0" pretty-format "^19.0.0" -jest-environment-jsdom@^19.0.0, jest-environment-jsdom@^19.0.1: +jest-environment-jsdom@^19.0.1: version "19.0.1" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-19.0.1.tgz#baf16bb10cbd54f3b9a3edb8fd88d11282b11f99" dependencies: @@ -2843,6 +2853,14 @@ jest-environment-jsdom@^19.0.0, jest-environment-jsdom@^19.0.1: jest-util "^19.0.1" jsdom "^9.11.0" +jest-environment-jsdom@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-19.0.2.tgz#ceda859c4a4b94ab35e4de7dab54b926f293e4a3" + dependencies: + jest-mock "^19.0.0" + jest-util "^19.0.2" + jsdom "^9.11.0" + jest-environment-node@^19.0.1: version "19.0.1" resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-19.0.1.tgz#5a9170437bb8b99da139d79f01de20e8e37a3e34" @@ -2850,6 +2868,13 @@ jest-environment-node@^19.0.1: jest-mock "^19.0.0" jest-util "^19.0.1" +jest-environment-node@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-19.0.2.tgz#6e84079db87ed21d0c05e1f9669f207b116fe99b" + dependencies: + jest-mock "^19.0.0" + jest-util "^19.0.2" + jest-file-exists@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8" @@ -2864,7 +2889,7 @@ jest-haste-map@^19.0.0: sane "~1.5.0" worker-farm "^1.3.1" -jest-jasmine2@^19.0.0, jest-jasmine2@^19.0.1: +jest-jasmine2@^19.0.1: version "19.0.1" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-19.0.1.tgz#9a9ee34573fc15c4856ec32e65a0865ee878756e" dependencies: @@ -2874,6 +2899,16 @@ jest-jasmine2@^19.0.0, jest-jasmine2@^19.0.1: jest-message-util "^19.0.0" jest-snapshot "^19.0.1" +jest-jasmine2@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-19.0.2.tgz#167991ac825981fb1a800af126e83afcca832c73" + dependencies: + graceful-fs "^4.1.6" + jest-matcher-utils "^19.0.0" + jest-matchers "^19.0.0" + jest-message-util "^19.0.0" + jest-snapshot "^19.0.2" + jest-matcher-utils@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d" @@ -2919,27 +2954,35 @@ jest-resolve@^19.0.0: jest-haste-map "^19.0.0" resolve "^1.2.0" -jest-runtime@^19.0.0: - version "19.0.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-19.0.1.tgz#7b584cbc690a500d9da148aba6a109bc9266a6b1" +jest-resolve@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-19.0.2.tgz#5793575de4f07aec32f7d7ff0c6c181963eefb3c" + dependencies: + browser-resolve "^1.11.2" + jest-haste-map "^19.0.0" + resolve "^1.2.0" + +jest-runtime@^19.0.1: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-19.0.2.tgz#d9a43e72de416d27d196fd9c7940d98fe6685407" dependencies: babel-core "^6.0.0" babel-jest "^19.0.0" babel-plugin-istanbul "^4.0.0" chalk "^1.1.3" graceful-fs "^4.1.6" - jest-config "^19.0.1" + jest-config "^19.0.2" jest-file-exists "^19.0.0" jest-haste-map "^19.0.0" jest-regex-util "^19.0.0" - jest-resolve "^19.0.0" - jest-util "^19.0.1" + jest-resolve "^19.0.2" + jest-util "^19.0.2" json-stable-stringify "^1.0.1" micromatch "^2.3.11" strip-bom "3.0.0" yargs "^6.3.0" -jest-snapshot@^19.0.0, jest-snapshot@^19.0.1: +jest-snapshot@^19.0.1: version "19.0.1" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.1.tgz#5b8161f737b63b6973f7e6e222b473970b5a69d1" dependencies: @@ -2951,7 +2994,19 @@ jest-snapshot@^19.0.0, jest-snapshot@^19.0.1: natural-compare "^1.4.0" pretty-format "^19.0.0" -jest-util@^19.0.0, jest-util@^19.0.1: +jest-snapshot@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b" + dependencies: + chalk "^1.1.3" + jest-diff "^19.0.0" + jest-file-exists "^19.0.0" + jest-matcher-utils "^19.0.0" + jest-util "^19.0.2" + natural-compare "^1.4.0" + pretty-format "^19.0.0" + +jest-util@^19.0.1: version "19.0.1" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.1.tgz#27235211a21280b42bc7c84d8f69e4e07c72cf9f" dependencies: @@ -2964,6 +3019,19 @@ jest-util@^19.0.0, jest-util@^19.0.1: leven "^2.0.0" mkdirp "^0.5.1" +jest-util@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41" + dependencies: + chalk "^1.1.1" + graceful-fs "^4.1.6" + jest-file-exists "^19.0.0" + jest-message-util "^19.0.0" + jest-mock "^19.0.0" + jest-validate "^19.0.2" + leven "^2.0.0" + mkdirp "^0.5.1" + jest-validate@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173" @@ -2973,6 +3041,15 @@ jest-validate@^19.0.0: leven "^2.0.0" pretty-format "^19.0.0" +jest-validate@^19.0.2: + version "19.0.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c" + dependencies: + chalk "^1.1.1" + jest-matcher-utils "^19.0.0" + leven "^2.0.0" + pretty-format "^19.0.0" + jodid25519@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967" @@ -4758,11 +4835,11 @@ webpack-dev-middleware@1.10.1: path-is-absolute "^1.0.0" range-parser "^1.0.3" -webpack-hot-middleware@2.17.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.17.0.tgz#5af55fd2bc2f9a4392edd553f2a0fbebd4d75e78" +webpack-hot-middleware@2.17.1: + version "2.17.1" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz#0c8fbf6f93ff29c095d684b07ab6d6c0f2f951d7" dependencies: - ansi-html "0.0.6" + ansi-html "0.0.7" html-entities "^1.2.0" querystring "^0.2.0" strip-ansi "^3.0.0"