diff --git a/assets/js/src/newsletter_editor/components/save.js b/assets/js/src/newsletter_editor/components/save.js index a1746a173d..e48d367dbf 100644 --- a/assets/js/src/newsletter_editor/components/save.js +++ b/assets/js/src/newsletter_editor/components/save.js @@ -7,7 +7,7 @@ define([ 'backbone.marionette', 'jquery', 'blob', - 'filesaver', + 'file-saver', 'html2canvas' ], function( App, diff --git a/package.json b/package.json index 37b08abd40..abb54a093a 100644 --- a/package.json +++ b/package.json @@ -1,26 +1,20 @@ { "private": true, - "scripts": { - "install": "napa" - }, - "napa": { - "blob": "eligrey/Blob.js.git", - "filesaver": "eligrey/FileSaver.js.git" - }, "dependencies": { "WP-JS-Hooks": "github:carldanley/WP-JS-Hooks", "backbone": "1.3.3", "backbone.marionette": "3.2.0", "backbone.radio": "2.0.0", "backbone.supermodel": "1.2.0", + "blob-tmp": "^1.0.0", "classnames": "^2.1.3", "codemirror": "^5.8.0", + "file-saver": "^1.3.3", "handlebars": "3.0.3", "history": "1.13.1", "html2canvas": "0.5.0-alpha2", "interact.js": "~1.2.8", "moment": "^2.10.3", - "napa": "^1.2.0", "papaparse": "4.1.1", "parsleyjs": "^2.1.2", "react": "~15.4.2", diff --git a/webpack.config.js b/webpack.config.js index d9d5c16645..d4fb12ecfb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,8 +28,7 @@ baseConfig = { 'interact$': 'interact.js/interact.js', 'spectrum$': 'spectrum-colorpicker/spectrum.js', 'wp-js-hooks': 'WP-JS-Hooks/src/event-manager.js', - 'blob$': 'blob/Blob.js', - 'filesaver$': 'filesaver/FileSaver.js', + 'blob$': 'blob-tmp/Blob.js', 'papaparse': 'papaparse/papaparse.min.js', 'helpscout': 'helpscout.js', 'html2canvas': 'html2canvas/dist/html2canvas.js', @@ -177,7 +176,7 @@ config.push(_.extend({}, baseConfig, { 'spectrum', 'sticky-kit', 'blob', - 'filesaver', + 'file-saver', 'velocity-animate', 'newsletter_editor/communicationsFix.js', 'newsletter_editor/App', @@ -265,7 +264,7 @@ config.push(_.extend({}, baseConfig, { 'backbone.radio', 'select2', 'blob', - 'filesaver', + 'file-saver', 'velocity-animate', 'mailpoet', @@ -338,8 +337,7 @@ config.push(_.extend({}, baseConfig, { 'sticky-kit': 'vendor/jquery.sticky-kit.js', 'backbone.marionette': 'backbone.marionette/lib/backbone.marionette', 'backbone.supermodel$': 'backbone.supermodel/build/backbone.supermodel.js', - 'blob$': 'blob/Blob.js', - 'filesaver$': 'filesaver/FileSaver.js' + 'blob$': 'blob-tmp/Blob.js' }, }, externals: {