version bump 0.11.0: new minified versions

- build script strips `require` statements
- finally every version is pinned (see #740 h/t @the-spyke)
- removed colloquialisms in README

CHANGELOG.md

@@ -4,6 +4,10 @@ This log is intended to keep track of backwards-incompatible changes, including
 but not limited to API changes and file location changes.  Minor behavioral
 changes may not be included if they are not expected to break existing code.
 
+## 0.11.0 (2017-07-31)
+
+* Strip `require` statements from minified version
+* minifier mangler enabled
 
 ## 0.10.9 (2017-07-28)
 

Makefile

@@ -14,7 +14,7 @@ FLOWTARGET=$(LIB).flow.js
 FLOWAUX=$(patsubst %.js,%.flow.js,$(AUXTARGETS))
 AUXSCPTS=xlsxworker1.js xlsxworker2.js xlsxworker.js
 FLOWTGTS=$(TARGET) $(AUXTARGETS) $(AUXSCPTS)
-UGLIFYOPTS=--support-ie8
+UGLIFYOPTS=--support-ie8 -m
 CLOSURE=/usr/local/lib/node_modules/google-closure-compiler/compiler.jar
 
 ## Main Targets
@@ -52,13 +52,13 @@ init: ## Initial setup for development
 
 .PHONY: dist
 dist: dist-deps $(TARGET) bower.json ## Prepare JS files for distribution
-	cp $(TARGET) dist/
+	<$(TARGET) sed "s/require('stream')/{}/g;s/require('.*')/null/g" > dist/$(TARGET)
 	cp LICENSE dist/
-	uglifyjs $(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).min.js --source-map dist/$(LIB).min.map --preamble "$$(head -n 1 bits/00_header.js)"
+	uglifyjs dist/$(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).min.js --source-map dist/$(LIB).min.map --preamble "$$(head -n 1 bits/00_header.js)"
 	misc/strip_sourcemap.sh dist/$(LIB).min.js
-	uglifyjs $(REQS) $(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).core.min.js --source-map dist/$(LIB).core.min.map --preamble "$$(head -n 1 bits/00_header.js)"
+	uglifyjs $(REQS) dist/$(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).core.min.js --source-map dist/$(LIB).core.min.map --preamble "$$(head -n 1 bits/00_header.js)"
 	misc/strip_sourcemap.sh dist/$(LIB).core.min.js
-	uglifyjs $(REQS) $(ADDONS) $(TARGET) $(AUXTARGETS) $(UGLIFYOPTS) -o dist/$(LIB).full.min.js --source-map dist/$(LIB).full.min.map --preamble "$$(head -n 1 bits/00_header.js)"
+	uglifyjs $(REQS) $(ADDONS) dist/$(TARGET) $(AUXTARGETS) $(UGLIFYOPTS) -o dist/$(LIB).full.min.js --source-map dist/$(LIB).full.min.map --preamble "$$(head -n 1 bits/00_header.js)"
 	misc/strip_sourcemap.sh dist/$(LIB).full.min.js
 	cat <(head -n 1 bits/00_header.js) $(REQS) $(ADDONS) $(TARGET) $(AUXTARGETS) > demos/requirejs/$(LIB).full.js
 

README.md

@@ -235,7 +235,7 @@ Excel 2007, nothing outside of SheetJS or Excel supported the format.
 
 To promote a format-agnostic view, js-xlsx starts from a pure-JS representation
 that we call the ["Common Spreadsheet Format"](#common-spreadsheet-format).
-Emphasizing a uniform object representation enables radical features like format
+Emphasizing a uniform object representation enables new features like format
 conversion (e.g. reading an XLSX template and saving as XLS) and circumvents the
 "class trap".  By abstracting the complexities of the various formats, tools
 need not worry about the specific file type!
@@ -440,7 +440,7 @@ On Windows XP and up you can get the base64 encoding using `certutil`:
 The most common and interesting formats (XLS, XLSX/M, XLSB, ODS) are ultimately
 ZIP or CFB containers of files.  Neither format puts the directory structure at
 the beginning of the file: ZIP files place the Central Directory records at the
-end of the logical file, while CFB files can place the FAT structure anywhere in
+end of the logical file, while CFB files can place the storage info anywhere in
 the file! As a result, to properly handle these formats, a streaming function
 would have to buffer the entire file before commencing.  That belies the
 expectations of streaming, so we do not provide any streaming read API.
@@ -1517,7 +1517,7 @@ The exported `write` and `writeFile` functions accept an options argument:
   in this README may not be serialized.
 - `cellDates` only applies to XLSX output and is not guaranteed to work with
   third-party readers.  Excel itself does not usually write cells with type `d`
-  so non-Excel tools may ignore the data or blow up in the presence of dates.
+  so non-Excel tools may ignore the data or error in the presence of dates.
 - `Props` is an object mirroring the workbook `Props` field.  See the table from
   the [Workbook File Properties](#workbook-file-properties) section.
 - if specified, the string from `themeXLSX` will be saved as the primary theme
@@ -1998,7 +1998,7 @@ standard, instead focusing on parts necessary to extract and store raw data.
 
 UOS is a very similar format, and it comes in 2 varieties corresponding to ODS
 and FODS respectively.  For the most part, the difference between the formats
-lies in the names of tags and attributes.
+is in the names of tags and attributes.
 
 </details>
 
@@ -2124,7 +2124,7 @@ Start a local server and navigate to that directory to run the tests.
 
 To run the full in-browser tests, clone the repo for
 [oss.sheetjs.com](https://github.com/SheetJS/SheetJS.github.io) and replace
-the xlsx.js file (then fire up the browser and go to `stress.html`):
+the xlsx.js file (then open a browser window and go to `stress.html`):
 
 ```bash
 $ cp xlsx.js ../SheetJS.github.io

bits/01_version.js

@@ -1 +1 @@
-XLSX.version = '0.10.9';
+XLSX.version = '0.11.0';

dist/xlsx.js

@@ -6,11 +6,11 @@
 /*global global, exports, module, require:false, process:false, Buffer:false */
 var XLSX = {};
 (function make_xlsx(XLSX){
-XLSX.version = '0.10.9';
+XLSX.version = '0.11.0';
 var current_codepage = 1200;
 /*global cptable:true */
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
-	if(typeof cptable === 'undefined') global.cptable = require('./dist/cpexcel.js');
+	if(typeof cptable === 'undefined') global.cptable = null;
 }
 function reset_cp() { set_cp(1200); }
 var set_cp = function(cp) { current_codepage = cp; };
@@ -1347,7 +1347,7 @@ function read_date(blob, offset) {
 
 var fs;
 function readFileSync(filename, options) {
-	if(fs == null) fs = require('fs');
+	if(fs == null) fs = null;
 	return parse(fs.readFileSync(filename), options);
 }
 
@@ -1583,8 +1583,8 @@ var _fs, jszip;
 if(typeof JSZip !== 'undefined') jszip = JSZip;
 if (typeof exports !== 'undefined') {
 	if (typeof module !== 'undefined' && module.exports) {
-		if(typeof jszip === 'undefined') jszip = require('./jszip.js');
-		_fs = require('fs');
+		if(typeof jszip === 'undefined') jszip = null;
+		_fs = null;
 	}
 }
 
@@ -2122,7 +2122,7 @@ var make_offcrypto = function(O, _crypto) {
 	var crypto;
 	if(typeof _crypto !== 'undefined') crypto = _crypto;
 	else if(typeof require !== 'undefined') {
-		try { crypto = require('crypto'); }
+		try { crypto = null; }
 		catch(e) { crypto = null; }
 	}
 
@@ -17974,7 +17974,7 @@ return utils;
 })(utils);
 
 if(has_buf && typeof require != 'undefined') (function() {
-	var Readable = require('stream').Readable;
+	var Readable = {}.Readable;
 
 	var write_csv_stream = function(sheet, opts) {
 		var stream = Readable();

docbits/15_phil.md

@@ -10,7 +10,7 @@ Excel 2007, nothing outside of SheetJS or Excel supported the format.
 
 To promote a format-agnostic view, js-xlsx starts from a pure-JS representation
 that we call the ["Common Spreadsheet Format"](#common-spreadsheet-format).
-Emphasizing a uniform object representation enables radical features like format
+Emphasizing a uniform object representation enables new features like format
 conversion (e.g. reading an XLSX template and saving as XLS) and circumvents the
 "class trap".  By abstracting the complexities of the various formats, tools
 need not worry about the specific file type!

docbits/21_readstream.md

@@ -6,7 +6,7 @@
 The most common and interesting formats (XLS, XLSX/M, XLSB, ODS) are ultimately
 ZIP or CFB containers of files.  Neither format puts the directory structure at
 the beginning of the file: ZIP files place the Central Directory records at the
-end of the logical file, while CFB files can place the FAT structure anywhere in
+end of the logical file, while CFB files can place the storage info anywhere in
 the file! As a result, to properly handle these formats, a streaming function
 would have to buffer the entire file before commencing.  That belies the
 expectations of streaming, so we do not provide any streaming read API.

docbits/81_writeopts.md

@@ -19,7 +19,7 @@ The exported `write` and `writeFile` functions accept an options argument:
   in this README may not be serialized.
 - `cellDates` only applies to XLSX output and is not guaranteed to work with
   third-party readers.  Excel itself does not usually write cells with type `d`
-  so non-Excel tools may ignore the data or blow up in the presence of dates.
+  so non-Excel tools may ignore the data or error in the presence of dates.
 - `Props` is an object mirroring the workbook `Props` field.  See the table from
   the [Workbook File Properties](#workbook-file-properties) section.
 - if specified, the string from `themeXLSX` will be saved as the primary theme

docbits/85_filetype.md

@@ -168,7 +168,7 @@ standard, instead focusing on parts necessary to extract and store raw data.
 
 UOS is a very similar format, and it comes in 2 varieties corresponding to ODS
 and FODS respectively.  For the most part, the difference between the formats
-lies in the names of tags and attributes.
+is in the names of tags and attributes.
 
 </details>
 

docbits/90_test.md

@@ -49,7 +49,7 @@ Start a local server and navigate to that directory to run the tests.
 
 To run the full in-browser tests, clone the repo for
 [oss.sheetjs.com](https://github.com/SheetJS/SheetJS.github.io) and replace
-the xlsx.js file (then fire up the browser and go to `stress.html`):
+the xlsx.js file (then open a browser window and go to `stress.html`):
 
 ```bash
 $ cp xlsx.js ../SheetJS.github.io

misc/docs/README.md

@@ -224,7 +224,7 @@ Excel 2007, nothing outside of SheetJS or Excel supported the format.
 
 To promote a format-agnostic view, js-xlsx starts from a pure-JS representation
 that we call the ["Common Spreadsheet Format"](#common-spreadsheet-format).
-Emphasizing a uniform object representation enables radical features like format
+Emphasizing a uniform object representation enables new features like format
 conversion (e.g. reading an XLSX template and saving as XLS) and circumvents the
 "class trap".  By abstracting the complexities of the various formats, tools
 need not worry about the specific file type!
@@ -408,7 +408,7 @@ On Windows XP and up you can get the base64 encoding using `certutil`:
 The most common and interesting formats (XLS, XLSX/M, XLSB, ODS) are ultimately
 ZIP or CFB containers of files.  Neither format puts the directory structure at
 the beginning of the file: ZIP files place the Central Directory records at the
-end of the logical file, while CFB files can place the FAT structure anywhere in
+end of the logical file, while CFB files can place the storage info anywhere in
 the file! As a result, to properly handle these formats, a streaming function
 would have to buffer the entire file before commencing.  That belies the
 expectations of streaming, so we do not provide any streaming read API.
@@ -1400,7 +1400,7 @@ The exported `write` and `writeFile` functions accept an options argument:
   in this README may not be serialized.
 - `cellDates` only applies to XLSX output and is not guaranteed to work with
   third-party readers.  Excel itself does not usually write cells with type `d`
-  so non-Excel tools may ignore the data or blow up in the presence of dates.
+  so non-Excel tools may ignore the data or error in the presence of dates.
 - `Props` is an object mirroring the workbook `Props` field.  See the table from
   the [Workbook File Properties](#workbook-file-properties) section.
 - if specified, the string from `themeXLSX` will be saved as the primary theme
@@ -1828,7 +1828,7 @@ standard, instead focusing on parts necessary to extract and store raw data.
 
 UOS is a very similar format, and it comes in 2 varieties corresponding to ODS
 and FODS respectively.  For the most part, the difference between the formats
-lies in the names of tags and attributes.
+is in the names of tags and attributes.
 
 
 ### Other Single-Worksheet Formats
@@ -1933,7 +1933,7 @@ Start a local server and navigate to that directory to run the tests.
 
 To run the full in-browser tests, clone the repo for
 [oss.sheetjs.com](https://github.com/SheetJS/SheetJS.github.io) and replace
-the xlsx.js file (then fire up the browser and go to `stress.html`):
+the xlsx.js file (then open a browser window and go to `stress.html`):
 
 ```bash
 $ cp xlsx.js ../SheetJS.github.io

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.10.9",
+	"version": "0.11.0",
 	"author": "sheetjs",
 	"description": "Excel (XLSB/XLSX/XLS/XML) ODS and other spreadsheet format (CSV/DIF/DBF/SYLK) parser and writer",
 	"keywords": [ "excel", "xls", "xlsx", "xlsb", "xlsm", "ods", "csv", "dbf", "dif", "sylk", "office", "spreadsheet" ],
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"exit-on-epipe":"~1.0.1",
-		"ssf":"~0.10.0",
+		"ssf":"~0.10.1",
 		"codepage":"~1.10.1",
 		"cfb":"~0.12.0",
 		"crc-32":"~1.1.0",

tests/core.js

@@ -1918,6 +1918,7 @@ describe('encryption', function() {
 	});
 });
 
+if(typeof cptable !== 'undefined')
 describe('multiformat tests', function() {
 var mfopts = opts;
 var mft = fs.readFileSync('multiformat.lst','utf-8').split("\n");

xlsx.flow.js

@@ -6,7 +6,7 @@
 /*global global, exports, module, require:false, process:false, Buffer:false */
 var XLSX = {};
 (function make_xlsx(XLSX){
-XLSX.version = '0.10.9';
+XLSX.version = '0.11.0';
 var current_codepage = 1200;
 /*:: declare var cptable:any; */
 /*global cptable:true */

xlsx.js

@@ -6,7 +6,7 @@
 /*global global, exports, module, require:false, process:false, Buffer:false */
 var XLSX = {};
 (function make_xlsx(XLSX){
-XLSX.version = '0.10.9';
+XLSX.version = '0.11.0';
 var current_codepage = 1200;
 /*global cptable:true */
 if(typeof module !== "undefined" && typeof require !== 'undefined') {