Commit f838f5d7 by Tyler Hallada Committed by GitHub

Merge pull request #719 from edx/EDUCATOR-1184

EDUCATOR-1184 Polyfill ES2015 Promise for IE11
parents 2ccd08de d08673fc
/**
* Load scripts needed across the application.
*/
require('babel-polyfill'); // EDUCATOR-1184: this defines Promise for IE11
require('sass/style-application.scss');
require(process.env.THEME_SCSS);
......
......@@ -10,6 +10,7 @@
"babel-plugin-dynamic-import-node": "^1.0.2",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.0",
"babel-preset-es2015": "^6.24.1",
"babel-runtime": "^6.25.0",
......
......@@ -6,13 +6,6 @@ var Merge = require('webpack-merge'),
djangoDevServer = process.env.DJANGO_DEV_SERVER || 'http://localhost:8110';
module.exports = Merge.smart(commonConfig, {
entry: {
// Bundle the client for the webpack-dev-server and specify url to the server
devServer: 'webpack-dev-server/client?http://localhost:8080',
// Bundle the client for hot reloading. 'only-' means to only hot reload for successful updates.
hotReload: 'webpack/hot/only-dev-server'
},
output: {
// Tells clients to load bundles from the dev-server
publicPath: 'http://localhost:8080/static/bundles/',
......@@ -83,7 +76,6 @@ module.exports = Merge.smart(commonConfig, {
devServer: {
compress: true,
hot: true, // enable hot reloading on the server
// Since the dev-server runs on a different port, browsers will complain about CORS violations unless we
// explicitly tell them it's okay with this header.
headers: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment