Use ProvidePlugin to provide 6to5 runtime instead of imports-loader.

This is required because the runtime tries to export to the window rather than return the runtime as a module.
roman-haluska · Dec 30, 2014 · 86c42c6 · 86c42c6
1 parent 3fcfe76
commit 86c42c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "6to5": "^2.2.0",
     "6to5-loader": "^1.0.0",
     "css-loader": "^0.9.0",
+    "exports-loader": "^0.6.2",
     "imports-loader": "^0.6.3",
     "jsxhint": "^0.9.0",
     "lodash": "^2.4.1",

diff --git a/webpack.config.js b/webpack.config.js
@@ -14,8 +14,7 @@ module.exports = {
     },
     module: {
       loaders: [
-        {test: /\.jsx?$/, exclude: /node_modules/, loader: '6to5-loader?experimental=true&runtime=true'},
-        {test: /\.jsx?$/, exclude: /node_modules/, loader: 'imports-loader?to5Runtime=6to5/runtime'},
+        {test: /\.jsx?$/, exclude: /node_modules/, loader: '6to5-loader?experimental=true&runtime=true'}
       ]
     },
     plugins: [
@@ -27,7 +26,10 @@ module.exports = {
       new webpack.optimize.CommonsChunkPlugin(
         "commons", "commons.js"),
       new webpack.optimize.OccurenceOrderPlugin(),
-      new webpack.optimize.DedupePlugin()
+      new webpack.optimize.DedupePlugin(),
+      new webpack.ProvidePlugin({
+        to5Runtime: "imports?global=>{}!exports-loader?global.to5Runtime!6to5/runtime"
+      })
     ],
     resolve: {
       extensions: ["", ".webpack.js", ".web.js", ".js", ".jsx"],