Merge branch 'master' of https://github.com/exceljs/exceljs

donaldsonjulia · May 7, 2019 · c6ee7a1 · c6ee7a1
2 parents 4915195 + 1b8c63d
commit c6ee7a1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,9 @@ tmp/*
 # WebStorm
 .idea
 
+# Intellij IDEA
+exceljs.iml
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-  - 6
   - 8
-  - 9
   - 10
+  - 11
+  - 12
 script:
   - npm test
 notifications:

diff --git a/index.d.ts b/index.d.ts
@@ -1129,6 +1129,12 @@ export interface Xlsx {
 	 */
 	read(stream: Stream): Promise<Workbook>;
 
+	/**
+	 * load from an array buffer
+	 * @param buffer
+	 */
+	load(buffer: Buffer): Promise<Workbook>;
+
 	/**
 	 * Create input stream for reading
 	 */

diff --git a/package.json b/package.json
@@ -116,6 +116,7 @@
     "uglify-js": "^3.4.9"
   },
   "main": "./dist/es5/index.js",
+  "browser": "./dist/es5/exceljs.browser.js",
   "types": "./index.d.ts",
   "files": [
     "dist",