.gitignore

@@ -1,4 +1,5 @@
 *~
+.c9revisions
+.DS_Store
 node_modules
-sauce_connect.log
-.c9revisions
+sauce_connect.log

.jshintrc

@@ -13,7 +13,8 @@
 
     "globals": {
         "TextEncoder": false,
-        "TextDecoder": false
+        "TextDecoder": false,
+        "self": true
     },
     "browser": true,
     "node": true

.travis.yml

@@ -4,11 +4,7 @@ matrix:
   include:
     - node_js: "stable"
       env: COMMAND=lint
-    - node_js: "0.10"
-      env: COMMAND=test-node
-    - node_js: "0.12"
-      env: COMMAND=test-node
-    - node_js: "4.4"
+    - node_js: "lts/*"
       env: COMMAND=test-node
     - node_js: "stable"
       env: COMMAND=test-node

CHANGES.md

@@ -4,6 +4,60 @@ layout: default
 section: main
 ---
 
+### v3.7.1 2021-08-05
+
+- Fix build of `dist` files.
+    + Note: this version ensures the changes from 3.7.0 are actually included in the `dist` files. Thanks to Evan W for reporting. 
+
+### v3.7.0 2021-07-23
+
+- Fix: Use a null prototype object for this.files  (see [#766](https://github.com/Stuk/jszip/pull/766))
+    + This change might break existing code if it uses prototype methods on the `.files` property of a zip object, for example `zip.files.toString()`. This approach is taken to prevent files in the zip overriding object methods that would exist on a normal object.
+
+### v3.6.0 2021-02-09
+
+- Fix: redirect main to dist on browsers (see [#742](https://github.com/Stuk/jszip/pull/742))
+- Fix duplicate require DataLengthProbe, utils (see [#734](https://github.com/Stuk/jszip/pull/734))
+- Fix small error in read_zip.md (see [#703](https://github.com/Stuk/jszip/pull/703))
+
+### v3.5.0 2020-05-31
+
+- Fix 'End of data reached' error when file extra field is invalid (see [#544](https://github.com/Stuk/jszip/pull/544)).
+- Typescript definitions: Add null to return types of functions that may return null (see [#669](https://github.com/Stuk/jszip/pull/669)).
+- Typescript definitions: Correct nodeStream's type (see [#682](https://github.com/Stuk/jszip/pull/682))
+- Typescript definitions: Add string output type (see [#666](https://github.com/Stuk/jszip/pull/666))
+
+### v3.4.0 2020-04-19
+
+- Add Typescript type definitions (see [#601](https://github.com/Stuk/jszip/pull/601)).
+
+### v3.3.0 2020-04-1
+
+- Change browser module resolution to support Angular packager (see [#614](https://github.com/Stuk/jszip/pull/614)).
+
+### v3.2.2 2019-07-04
+- No public changes, but a number of testing dependencies have been updated.
+- Tested browsers are now: Internet Explorer 11, Chrome (most recent) and Firefox (most recent). Other browsers (specifically Safari) are still supported however testing them on Saucelabs is broken and so they were removed from the test matrix.
+
+### v3.2.1 2019-03-22
+- Corrected built dist files
+
+### v3.2.0 2019-02-21
+- Update dependencies to reduce bundle size (see [#532](https://github.com/Stuk/jszip/pull/532)).
+- Fix deprecated Buffer constructor usage and add safeguards (see [#506](https://github.com/Stuk/jszip/pull/506)).
+
+### v3.1.5 2017-11-09
+- Fix IE11 memory leak (see [#429](https://github.com/Stuk/jszip/pull/429)).
+- Handle 2 nodejs deprecations (see [#459](https://github.com/Stuk/jszip/pull/459)).
+- Improve the "unsupported format" error message (see [#461](https://github.com/Stuk/jszip/pull/461)).
+- Improve webworker compatibility (see [#468](https://github.com/Stuk/jszip/pull/468)).
+- Fix nodejs 0.10 compatibility (see [#480](https://github.com/Stuk/jszip/pull/480)).
+- Improve the error without type in async() (see [#481](https://github.com/Stuk/jszip/pull/481)).
+
+### v3.1.4 2017-08-24
+- consistently use our own utils object for inheritance (see [#395](https://github.com/Stuk/jszip/pull/395)).
+- lower the memory consumption in `generate*` with a lot of files (see [#449](https://github.com/Stuk/jszip/pull/449)).
+
 ### v3.1.3 2016-10-06
 - instanceof failing in window / iframe contexts (see [#350](https://github.com/Stuk/jszip/pull/350)).
 - remove a copy with blob output (see [#357](https://github.com/Stuk/jszip/pull/357)).

Gruntfile.js

@@ -1,80 +1,16 @@
 /*jshint node: true */
-'use strict';
+"use strict";
+
 module.exports = function(grunt) {
-  // see https://saucelabs.com/rest/v1/info/browsers/webdriver
-  var browsers = [{
-      browserName: "iphone",
-      version: "7.0"
-  }, {
-      browserName: "iphone",
-      version: "9.2"
-  }, {
-      browserName: "android",
-      platform: "Linux",
-      version: "4.0"
-  }, {
-      browserName: "android",
-      platform: "Linux",
-      version: "4.4"
-  }, {
-      browserName: "android",
-      platform: "Linux",
-      version: "5.1"
-  }, {
-      browserName: "firefox",
-      platform: "Windows 10"
-  }, {
-      browserName: "chrome",
-      platform: "Windows 10"
-  }, {
-      browserName: "internet explorer",
-      platform: "XP",
-      version: "6"
-  }, {
-      browserName: "internet explorer",
-      platform: "XP",
-      version: "7"
-  }, {
-      browserName: "internet explorer",
-      platform: "Windows 7",
-      version: "8"
-  }, {
-      browserName: "internet explorer",
-      platform: "Windows 7",
-      version: "9"
-  }, {
-      browserName: "internet explorer",
-      platform: "Windows 8",
-      version: "10"
-  }, {
-      browserName: "internet explorer",
-      platform: "Windows 10",
-      version: "11"
-  }, {
-      browserName: "MicrosoftEdge",
-      platform: "Windows 10",
-      version: "13"
-  }, {
-      browserName: "opera",
-      platform: "Windows 2008",
-      version: "12"
-  }, {
-      browserName: "safari",
-      platform: "OS X 10.8",
-      version: "6"
-  }, {
-      browserName: "safari",
-      platform: "OS X 10.9",
-      version: "7"
-  }, {
-      browserName: "safari",
-      platform: "OS X 10.10",
-      version: "8"
-  }, {
-      browserName: "safari",
-      platform: "OS X 10.11",
-      version: "9"
-  }];
+  // https://wiki.saucelabs.com/display/DOCS/Platform+Configurator
+  // A lot of the browsers seem to time out with Saucelab's unit testing
+  // framework. Here are the browsers that work and get enough coverage for our
+  // needs.
+  var browsers = [
+    {browserName: "chrome"},
+    {browserName: "firefox", platform: "Linux"},
+    {browserName: "internet explorer"}
+  ];
 
   var tags = [];
   if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST != "false") {
@@ -86,49 +22,52 @@ module.exports = function(grunt) {
   var version = require("./package.json").version;
 
   grunt.initConfig({
-      connect: {
-          server: {
-              options: {
-                  base: "",
-                  port: 9999
-              }
-          }
-      },
-      'saucelabs-qunit': {
-          all: {
-              options: {
-                  urls: ["http://127.0.0.1:9999/test/index.html?hidepassed"],
-                  build: process.env.TRAVIS_JOB_ID,
-                  throttled: 3,
-                  "max-duration" : 600, // seconds, IE6 is slow
-                  browsers: browsers,
-                  testname: "qunit tests",
-                  tags: tags
-              }
-          }
-      },
-      jshint: {
-          // see https://github.com/gruntjs/grunt-contrib-jshint/issues/198
-          // we can't override the options using the jshintrc path
-          options: grunt.file.readJSON('.jshintrc'),
-          production: ['./lib/**/*.js'],
-          test: ['./test/helpers/**/*.js', './test/asserts/**/*.js'],
-          documentation: {
-              options: {
-                  globals: {
-                      jQuery: false,
-                      JSZip: false,
-                      JSZipUtils: false,
-                      saveAs: false
-                  },
-                  // implied still give false positives in our case
-                  strict: false
-              },
-              files: {
-                  src: ['./documentation/**/*.js']
-              }
-          }
-      },
+    connect: {
+      server: {
+        options: {
+          base: "",
+          port: 8080
+        }
+      }
+    },
+    'saucelabs-qunit': {
+      all: {
+        options: {
+          urls: ["http://127.0.0.1:8080/test/index.html?hidepassed"],
+          build: process.env.TRAVIS_JOB_ID,
+          throttled: 4,
+          "max-duration": 1200, // seconds, IE6 is slow
+          browsers: browsers,
+          testname: "qunit tests",
+          tags: tags,
+          // Tests have statusCheckAttempts * pollInterval seconds to complete
+          pollInterval: 2000,
+          statusCheckAttempts: 240,
+          "max-duration": 1200,
+          browsers: browsers,
+          maxRetries: 2
+        }
+      }
+    },
+    jshint: {
+      // see https://github.com/gruntjs/grunt-contrib-jshint/issues/198
+      // we can't override the options using the jshintrc path
+      options: grunt.file.readJSON('.jshintrc'),
+      production: ['./lib/**/*.js'],
+      test: ['./test/helpers/**/*.js', './test/asserts/**/*.js'],
+      documentation: {
+        options: {
+          // we include js files with jekyll, jshint can't see all
+          // variables and we can't declare all of them
+          undef: false,
+          // 'implied' still give false positives in our case
+          strict: false
+        },
+        files: {
+          src: ['./documentation/**/*.js']
+        }
+      }
+    },
     browserify: {
       all: {
         files: {
@@ -139,44 +78,48 @@ module.exports = function(grunt) {
             standalone: 'JSZip',
             transform: ['package-json-versionify'],
             insertGlobalVars: {
-                process: undefined,
-                Buffer: undefined,
-                __filename: undefined,
-                __dirname: undefined
+              process: undefined,
+              Buffer: undefined,
+              __filename: undefined,
+              __dirname: undefined
             },
             builtins: false
           },
-          banner : grunt.file.read('lib/license_header.js').replace(/__VERSION__/, version)
+          banner: grunt.file.read('lib/license_header.js').replace(/__VERSION__/, version)
         }
       }
     },
     uglify: {
       options: {
         mangle: true,
         preserveComments: false,
-        banner : grunt.file.read('lib/license_header.js').replace(/__VERSION__/, version)
+        banner: grunt.file.read('lib/license_header.js').replace(/__VERSION__/, version)
       },
       all: {
         src: 'dist/jszip.js',
         dest: 'dist/jszip.min.js'
       }
-    },
-    qunit: {
-        all: ['test/**/*.html']
     }
   });
 
-  grunt.loadNpmTasks("grunt-saucelabs");
   grunt.loadNpmTasks("grunt-contrib-connect");
+  grunt.loadNpmTasks("grunt-saucelabs");
   grunt.loadNpmTasks('grunt-browserify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-qunit');
+
+  // A task to cause Grunt to sit and wait, keeping the test server running
+  grunt.registerTask("wait", function() {
+    this.async();
+  });
+
+  grunt.registerTask("test-local", ["build", "connect", "wait"]);
+  grunt.registerTask("test-remote", ["build", "connect", "saucelabs-qunit"]);
 
   if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
-    grunt.registerTask("test", ["qunit", "connect", "saucelabs-qunit"]);
+    grunt.registerTask("test", ["jshint", "test-remote"]);
   } else {
-    grunt.registerTask("test", ["qunit"]);
+    grunt.registerTask("test", ["jshint", "test-local"]);
   }
   grunt.registerTask("build", ["browserify", "uglify"]);
   grunt.registerTask("default", ["jshint", "build"]);

README.markdown

@@ -3,7 +3,7 @@ JSZip [![Build Status](https://api.travis-ci.org/Stuk/jszip.svg?branch=master)](
 
 [![Selenium Test Status](https://saucelabs.com/browser-matrix/jszip.svg)](https://saucelabs.com/u/jszip)
 
-A library for creating, reading and editing .zip files with Javascript, with a
+A library for creating, reading and editing .zip files with JavaScript, with a
 lovely and simple API.
 
 See https://stuk.github.io/jszip for all the documentation.

bower.json

@@ -4,7 +4,7 @@
   "authors": [
     "Stuart Knightley <stuart@stuartk.com>"
   ],
-  "description": "Create, read and edit .zip files with Javascript http://stuartk.com/jszip",
+  "description": "Create, read and edit .zip files with JavaScript http://stuartk.com/jszip",
   "main": "dist/jszip.js",
   "keywords": [
     "zip",

component.json

@@ -1,16 +1,16 @@
-{
-  "name": "jszip",
-  "repo": "Stuk/jszip",
-  "description": "Create, read and edit .zip files with Javascript http://stuartk.com/jszip",
-  "version": "3.1.3",
-  "keywords": [
-    "zip",
-    "deflate",
-    "inflate"
-  ],
-  "main": "dist/jszip.js",
-  "license": "MIT or GPLv3",
-  "scripts": [
-    "dist/jszip.js"
-  ]
-}
+{
+  "name": "jszip",
+  "repo": "Stuk/jszip",
+  "description": "Create, read and edit .zip files with JavaScript http://stuartk.com/jszip",
+  "version": "3.2.0",
+  "keywords": [
+    "zip",
+    "deflate",
+    "inflate"
+  ],
+  "main": "dist/jszip.js",
+  "license": "MIT or GPLv3",
+  "scripts": [
+    "dist/jszip.js"
+  ]
+}