Skip to content

Fix make dist and browserify issue require #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Fix make dist and browserify issue require #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30bc198
uglify no longer have --support-ie8
Liryna Feb 27, 2017
1d88633
Fix sed usage
Liryna Feb 27, 2017
04efc6d
Fix browserify require failure
Liryna Feb 27, 2017
56f1f4e
build dist
Liryna Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=

## Main Targets

Expand Down
4 changes: 2 additions & 2 deletions bits/21_ziputils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
2 changes: 1 addition & 1 deletion bits/26_crypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var make_offcrypto = function(O, _crypto) {
var crypto;
if(typeof _crypto !== 'undefined') crypto = _crypto;
else if(typeof require !== 'undefined') {
try { crypto = require('cry'+'pto'); }
try { crypto = require('crypto'); }
catch(e) { crypto = null; }
}

Expand Down
4 changes: 2 additions & 2 deletions dist/ods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
var attregexg=/[^\s?>\/]+=["'][^"]*['"]/g;
Expand Down
2 changes: 1 addition & 1 deletion dist/ods.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ods.min.map
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions dist/xlsx.core.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/xlsx.core.min.map
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 27 additions & 15 deletions dist/xlsx.full.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/xlsx.full.min.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/xlsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,8 +1377,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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g;
Expand Down Expand Up @@ -1847,7 +1847,7 @@ var make_offcrypto = function(O, _crypto) {
var crypto;
if(typeof _crypto !== 'undefined') crypto = _crypto;
else if(typeof require !== 'undefined') {
try { crypto = require('cry'+'pto'); }
try { crypto = require('crypto'); }
catch(e) { crypto = null; }
}

Expand Down
11 changes: 8 additions & 3 deletions dist/xlsx.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/xlsx.min.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion misc/strip_sourcemap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

if [ $# -gt 0 ]; then
if [ -e "$1" ]; then
sed -i .sheetjs '/sourceMappingURL/d' "$1"
sed -i.sheetjs '/sourceMappingURL/d' "$1"
fi
else
cat - | sed '/sourceMappingURL/d'
Expand Down
4 changes: 2 additions & 2 deletions ods.flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
var attregexg=/[^\s?>\/]+=["'][^"]*['"]/g;
Expand Down
4 changes: 2 additions & 2 deletions ods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
var attregexg=/[^\s?>\/]+=["'][^"]*['"]/g;
Expand Down
4 changes: 2 additions & 2 deletions odsbits/21_ziputils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
6 changes: 3 additions & 3 deletions xlsx.flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,8 +1419,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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g;
Expand Down Expand Up @@ -1889,7 +1889,7 @@ var make_offcrypto = function(O, _crypto) {
var crypto;
if(typeof _crypto !== 'undefined') crypto = _crypto;
else if(typeof require !== 'undefined') {
try { crypto = require('cry'+'pto'); }
try { crypto = require('crypto'); }
catch(e) { crypto = null; }
}

Expand Down
6 changes: 3 additions & 3 deletions xlsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,8 +1377,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('./js'+'zip');
_fs = require('f'+'s');
if(typeof jszip === 'undefined') jszip = require('./jszip');
_fs = require('fs');
}
}
var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g;
Expand Down Expand Up @@ -1847,7 +1847,7 @@ var make_offcrypto = function(O, _crypto) {
var crypto;
if(typeof _crypto !== 'undefined') crypto = _crypto;
else if(typeof require !== 'undefined') {
try { crypto = require('cry'+'pto'); }
try { crypto = require('crypto'); }
catch(e) { crypto = null; }
}

Expand Down