diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b13be8671..000000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 18554cd2c..0c206b936 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ test_files example.js example2.js .idea +.DS_Store diff --git a/package.json b/package.json index 286fbd662..6fc25876a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "xlsx", - "version": "0.8.18", + "name": "xlsx-style", + "version": "0.8.18.1", "author": "sheetjs", "description": "Excel (XLSB/XLSX/XLSM/XLS/XML) and ODS spreadsheet parser and writer (extended to enable read/write of cell formats with xlsx files)", "keywords": [ "excel", "xls", "xlsx", "xlsb", "xlsm", "ods", "office", "spreadsheet" ], diff --git a/xlsx.js b/xlsx.js index eec27b468..bcdf8ad4a 100644 --- a/xlsx.js +++ b/xlsx.js @@ -1341,9 +1341,9 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(has_buf && typeof jszip === 'undefined') jszip = require('js'+'zip'); - if(typeof jszip === 'undefined') jszip = require('./js'+'zip').JSZip; - _fs = require('f'+'s'); + if(has_buf && typeof jszip === 'undefined') jszip = require('jszip'); + if(typeof jszip === 'undefined') jszip = require('./jszip').JSZip; + _fs = require('fs'); } } var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; @@ -1776,7 +1776,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; } } @@ -11520,7 +11520,7 @@ var XLSRecordEnum = { /* Helper function to call out to ODS parser */ function parse_ods(zip, opts) { - if(typeof module !== "undefined" && typeof require !== 'undefined' && typeof ODS === 'undefined') ODS = require('./od' + 's'); + if(typeof module !== "undefined" && typeof require !== 'undefined' && typeof ODS === 'undefined') ODS = require('./ods'); if(typeof ODS === 'undefined' || !ODS.parse_ods) throw new Error("Unsupported ODS"); return ODS.parse_ods(zip, opts); }