Merge pull request #29 from AllenFang/master

alex35mil · alex35mil · commit 614d28f05594 · 2016-02-08T10:24:52.000+03:00
Avoid multiple babel-polyfill loaded
diff --git a/src/bootstrap.loader.js b/src/bootstrap.loader.js
@@ -16,11 +16,12 @@ if (semver.lt(process.version, '4.0.0')) {
       Make sure it's installed in your 'node_modules/' directory.
     `);
   }
-
-  if (isBabelLatest) {
-    require(babelLatest);
-  } else {
-    require(babelPrev);
+  if (!global._babelPolyfill) {
+    if (isBabelLatest) {
+      require(babelLatest);
+    } else {
+      require(babelPrev);
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,12 @@ if (semver.lt(process.version, '4.0.0')) {`
`16`	`16`	`Make sure it's installed in your 'node_modules/' directory.`
`17`	`17`	`);
`18`	`18`	`}`
`19`		`-`
`20`		`- if (isBabelLatest) {`
`21`		`- require(babelLatest);`
`22`		`- } else {`
`23`		`- require(babelPrev);`
	`19`	`+ if (!global._babelPolyfill) {`
	`20`	`+ if (isBabelLatest) {`
	`21`	`+ require(babelLatest);`
	`22`	`+ } else {`
	`23`	`+ require(babelPrev);`
	`24`	`+ }`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`