Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update dev env to work in IE11 #853

Merged
merged 1 commit into from
Jun 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions demo/polyfills/devenv.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
// Polyfill for dev env UI based on `carbon-components-react`
/* eslint-disable import/no-extraneous-dependencies */
/* eslint-disable import/no-extraneous-dependencies, global-require */
import 'core-js/modules/es6.string.includes';
import 'core-js/modules/es7.object.values';
/* eslint-enable import/no-extraneous-dependencies */
import 'whatwg-fetch';

if (typeof Promise === 'undefined') {
// Rejection tracking prevents a common issue where React gets into an
// inconsistent state due to an error, but it gets swallowed by a Promise,
// and the user has no idea what causes React's erratic future behavior.
require('promise/lib/rejection-tracking').enable();
window.Promise = require('promise/lib/es6-extensions.js');
}
/* eslint-enable import/no-extraneous-dependencies, global-require */
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"nodemon": "1.9.1",
"postcss-loader": "^2.1.0",
"prettier": "^1.7.0",
"promise": "^8.0.1",
"prop-types": "^15.6.0",
"pump": "^1.0.2",
"react": "^16.2.0",
Expand All @@ -141,7 +142,7 @@
"webpack": "^3.10.0",
"webpack-dev-middleware": "^2.0.0",
"webpack-hot-middleware": "^2.21.0",
"whatwg-fetch": "^2.0.0"
"whatwg-fetch": "^2.0.4"
},
"resolutions": {
"freshy": ">= 1.0.3"
Expand Down
8 changes: 7 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9059,6 +9059,12 @@ promise@^7.0.0, promise@^7.1.1:
dependencies:
asap "~2.0.3"

promise@^8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450"
dependencies:
asap "~2.0.3"

promised-handlebars@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/promised-handlebars/-/promised-handlebars-2.0.1.tgz#a662a4278895b4c13f815ecf223691ac3ca7fdca"
Expand Down Expand Up @@ -11637,7 +11643,7 @@ weinre@^2.0.0-pre-I0Z7U9OV:
nopt "3.0.x"
underscore "1.7.x"

whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"

Expand Down