Merge pull request eKoopmans#238 from oschwede/fix/sandbox-promises

Fix/sandbox promises
yifanzheng · Jul 8, 2019 · db15497 · db15497
2 parents d87c258 + 263f54f
commit db15497
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/rollup.config.js b/rollup.config.js
@@ -33,9 +33,9 @@ export default [
     external: [
       'jspdf',
       'html2canvas',
-      'es6-promise/auto'
     ],
     globals: {
+      'es6-promise': 'es6promise',
       jspdf: 'jsPDF',
       html2canvas: 'html2canvas'
     },
@@ -57,9 +57,9 @@ export default [
     external: [
       'jspdf',
       'html2canvas',
-      'es6-promise/auto'
     ],
     globals: {
+      'es6-promise': 'es6promise',
       jspdf: 'jsPDF',
       html2canvas: 'html2canvas'
     },
@@ -81,6 +81,7 @@ export default [
       { file: pkg.browser.replace(/js$/, 'bundle.js'), format: 'umd' }
     ],
     globals: {
+      'es6-promise': 'es6promise',
       jspdf: 'jsPDF',
       html2canvas: 'html2canvas'
     },
@@ -100,6 +101,7 @@ export default [
       { file: pkg.browser.replace(/js$/, 'bundle.min.js'), format: 'umd' }
     ],
     globals: {
+      'es6-promise': 'es6promise',
       jspdf: 'jsPDF',
       html2canvas: 'html2canvas'
     },

diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,3 @@
-import 'es6-promise/auto';
-
 import Worker from './worker.js';
 import './plugin/jspdf-plugin.js';
 import './plugin/pagebreaks.js';

diff --git a/src/worker.js b/src/worker.js
@@ -1,6 +1,8 @@
 import jsPDF from 'jspdf';
 import html2canvas from 'html2canvas';
 import { objType, createElement, cloneNode, toPx } from './utils.js';
+import es6promise from 'es6-promise';
+var Promise = es6promise.Promise;
 
 /* ----- CONSTRUCTOR ----- */