Permalink
Browse files

version bump 0.7.2: pre-BIFF5 support

- allow for naked streams (pre-BIFF5, CFB optional)
- support pre-BIFF5 strings and widths
- removed nested functions in parse_xlscfb, added more record types
- README improvements (paralleling js-xlsx)
- fake "Sheet1" name if sheet name is missing (fixes #57, h/t @egon12)
- demo only processes one file (addresses #52)
- updated CFB (bits/18_cfb.js pulled from js-cfb)
- cellStyles option (only supports patternType)
- sheet_to_json __rowNum__ now non-enumerable (h/t @SystemParadox)
- strip sourceMappingURL references from minified scripts (h/t @vinin3)
- sheet_to_json header === 1 now includes empty rows (h/t @tamlyn)

Related:

SheetJS/js-xlsx#139
SheetJS/js-xlsx#142
#51
SheetJS/j#8
  • Loading branch information...
1 parent 646e157 commit 2aa239b2796bcf8cd86f2003c2c7e9b09ec26602 @SheetJSDev SheetJSDev committed Nov 11, 2014
View
@@ -3,5 +3,17 @@ misc/coverage.html
misc/prof.js
v8.log
tmp
+*.txt
+*.csv
+*.dif
+*.prn
+*.slk
+*.socialcalc
*.xls
+*.xlsb
+*.xlsm
+*.xlsx
*.xml
+*.htm
+*.html
+*.sheetjs
View
@@ -3,20 +3,30 @@ index.html
misc/
node_modules
tmp
+*.txt
+*.csv
+*.dif
+*.prn
+*.slk
+*.socialcalc
*.xls
*.xlsb
*.xlsm
*.xlsx
*.xml
+*.htm
+*.html
+*.sheetjs
.gitignore
.jshintrc
CONTRIBUTING.md
Makefile
-tests.lst
+*.lst
.npmignore
xlsworker.js
shim.js
test.js
.jscs.json
.gitmodules
.travis.yml
+bits/
View
@@ -1,15 +1,24 @@
LIB=xls
-DEPS=$(sort $(wildcard bits/*.js))
-TARGET=$(LIB).js
FMT=xls xml misc full
REQS=
ADDONS=dist/cpexcel.js
+AUXTARGETS=
+
+ULIB=$(shell echo $(LIB) | tr a-z A-Z)
+DEPS=$(sort $(wildcard bits/*.js))
+TARGET=$(LIB).js
+
+.PHONY: all
+all: $(TARGET) $(AUXTARGETS)
$(TARGET): $(DEPS)
cat $^ | tr -d '\15\32' > $@
bits/01_version.js: package.json
- echo "XLS.version = '"`grep version package.json | awk '{gsub(/[^0-9a-z\.-]/,"",$$2); print $$2}'`"';" > $@
+ echo "$(ULIB).version = '"`grep version package.json | awk '{gsub(/[^0-9a-z\.-]/,"",$$2); print $$2}'`"';" > $@
+
+bits/18_cfb.js: node_modules/cfb/dist/xlscfb.js
+ cp $^ $@
.PHONY: clean
clean:
@@ -30,7 +39,7 @@ init:
.PHONY: test mocha
test mocha: test.js
mkdir -p tmp
- mocha -R spec -t 10000
+ mocha -R spec -t 20000
.PHONY: prof
prof:
@@ -45,8 +54,8 @@ $(TESTFMT): test_%:
.PHONY: lint
lint: $(TARGET)
- jshint --show-non-errors $(TARGET)
- jscs $(TARGET)
+ jshint --show-non-errors $(TARGET) $(AUXTARGETS)
+ jscs $(TARGET) $(AUXTARGETS)
.PHONY: cov cov-spin
@@ -69,16 +78,22 @@ coveralls:
coveralls-spin:
make coveralls & bash misc/spin.sh $$!
-bower.json: package.json misc/_bower.json
- cat $^ | sed 's/_VERSION_/'`grep version package.json | awk '{gsub(/[^0-9a-z\.-]/,"",$$2); print $$2}'`'/' > $@
+bower.json: misc/_bower.json package.json
+ cat $< | sed 's/_VERSION_/'`grep version package.json | awk '{gsub(/[^0-9a-z\.-]/,"",$$2); print $$2}'`'/' > $@
.PHONY: dist
dist: dist-deps $(TARGET) bower.json
cp $(TARGET) dist/
cp LICENSE dist/
uglifyjs $(TARGET) -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) -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) -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
+
+.PHONY: aux
+aux: $(AUXTARGETS)
.PHONY: dist-deps
dist-deps:
Oops, something went wrong.

0 comments on commit 2aa239b

Please sign in to comment.