Update jszip version and remove code conflict with webpack

Author: hohiep102

README.md

@@ -1,22 +1,15 @@
-![bounties received](https://www.bountysource.com/badge/team?team_id=59027&style=bounties_received)
-
-No longer maintained
-====================
-
-Sob story of the day. For the first time in months, I had time to sit down and work on this project. So, I did. Tweaked a couple things, added stuff to the 'new' website.. then realized that I'd prefer to be spending time with my family. So, this project is no longer maintained. Thank you to those who sent encouraging emails over the years. This was an interesting project. Goodbye.
-
-excel-builder.js
+excel-builder-webpack.js
 ================
+An excel-builder version which support webpack
+This is a fork from excel-builder which wasn't maintained.
 
-A way to build excel files with javascript
-
-Documentation at http://excelbuilderjs.com/. This is slightly outdated, but includes a 'cookbook' and some 
+Documentation at http://excelbuilderjs.com/. This is slightly outdated, but includes a 'cookbook' and some
 API documentation. New site coming soon with up-to-date documentation, and ability to contribute - see [https://github.com/stephenliberty/excel-builder-site](https://github.com/stephenliberty/excel-builder-site)
 
 Installing via NPM
 ------------------
 
-	npm install excel-builder
+	npm install excel-builder-webpack
 
 
 Building for web
@@ -43,6 +36,6 @@ excel-builder.dist.js -> All files in the EB package. Requires lodash and jszip
 Contributing
 -------------
 
-Originally this project was sort of sponsored by a previous company I worked for. Unfortunately now it has no backing, and my time is very limited while I work on side projects to help make ends meet. If you use bountysource or contribute via paypal (to [email protected]) to open up bounties on issues, it is very, very likely that I will add features and fix issues sooner than later. 
+Originally this project was sort of sponsored by a previous company I worked for. Unfortunately now it has no backing, and my time is very limited while I work on side projects to help make ends meet. If you use bountysource or contribute via paypal (to [email protected]) to open up bounties on issues, it is very, very likely that I will add features and fix issues sooner than later.
 
-Otherwise, if you have the ability to contribute yourself, please just do so as normal - I'll review and pull changes as they come in as quickly as I can. 
+Otherwise, if you have the ability to contribute yourself, please just do so as normal - I'll review and pull changes as they come in as quickly as I can.

package.json

@@ -1,25 +1,25 @@
 {
-  "name": "excel-builder",
-  "version": "2.0.3",
-  "description": "An easy way of building Excel files with javascript",
+  "name": "excel-builder-webpack",
+  "version": "1.0.2",
+  "description": "Customized version of excel-builder that can be run with webpack",
   "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/stephenliberty/excel-builder.js.git"
+    "url": "https://github.com/hohiep102/excel-builder.js.git"
   },
   "keywords": [
     "excel",
     "javascript",
     "xlsx",
     "spreadsheet"
   ],
-  "author": "Stephen Liberty",
+  "author": "Hiep Ho",
   "license": "GPLv3",
   "bugs": {
-    "url": "https://github.com/stephenliberty/excel-builder.js/issues"
+    "url": "https://github.com/hohiep102/excel-builder.js/issues"
   },
   "homepage": "http://excelbuilderjs.com/",
   "devDependencies": {
@@ -38,7 +38,7 @@
   "dependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-watch": "^0.6.1",
-    "jszip": "^2.1.1",
+    "jszip": "3.1.3",
     "lodash": "^3.10.1",
     "q": "^1.4.1"
   },

src/Excel/WorksheetExportWorker.js

@@ -4,11 +4,11 @@
 var requireConfig;
 var worksheet;
 var start = function(data) {
-    require(['Worksheet'], function(Worksheet) {
+    require(['./Worksheet'], function(Worksheet) {
         worksheet = new Worksheet();
         worksheet.importData(data);
         postMessage({status: 'sharedStrings', data: worksheet.collectSharedStrings()});
-        
+
     });
 };
 
@@ -22,7 +22,7 @@ var onmessage = function(event) {
                 require.config(requireConfig);
                 postMessage({status: "ready"});
                 break;
-            case "start": 
+            case "start":
                 start(data.data);
                 break;
             case "export":
@@ -34,6 +34,3 @@ var onmessage = function(event) {
         }
     }
 };
-
-
-

src/excel-builder.js

@@ -25,39 +25,6 @@ var Factory = {
         forceUIThread: false
     },
 
-    /**
-     * Turns a workbook into a downloadable file.
-     * @param {Excel/Workbook} workbook The workbook that is being converted
-     * @param {Object} options
-     * @param {Boolean} options.base64 Whether to 'return' the generated file as a base64 string
-     * @param {Function} options.success The callback function to run after workbook creation is successful.
-     * @param {Function} options.error The callback function to run if there is an error creating the workbook.
-     * @param {String} options.requireJsPath (Optional) The path to requirejs. Will use the id 'requirejs' to look up the script if not specified.
-     */
-    createFileAsync: function (workbook, options) {
-
-
-        workbook.generateFilesAsync({
-            success: function (files) {
-
-                var worker = new Worker(require.toUrl('./Excel/ZipWorker.js'));
-                worker.addEventListener('message', function(event) {
-                    if(event.data.status === 'done') {
-                        options.success(event.data.data);
-                    }
-                });
-                worker.postMessage({
-                    files: files,
-                    ziplib: require.toUrl('JSZip'),
-                    base64: (!options || options.base64 !== false)
-                });
-            },
-            error: function () {
-                options.error();
-            }
-        });
-    },
-
     /**
      * Turns a workbook into a downloadable file.
      * @param {Excel/Workbook} workbook The workbook that is being converted
@@ -83,4 +50,4 @@ var Factory = {
 };
 
 
-module.exports = Factory;
+module.exports = Factory;