diff --git a/extension/manifest.json b/extension/manifest.json index 15375b3..04224b1 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -4,7 +4,7 @@ "name": "fimfic2epub", "short_name": "fimfic2epub", "description": "Improved EPUB exporter for Fimfiction", - "version": "1.4.3", + "version": "1.4.4", "icons": { "128": "icon-128.png" diff --git a/package.json b/package.json index 014f4fc..68fd139 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fimfic2epub", - "version": "1.4.3", + "version": "1.4.4", "description": "Tool to generate improved EPUB ebooks from Fimfiction stories", "author": "djazz", "repository": { @@ -21,13 +21,12 @@ ], "dependencies": { "detect-node": "^2.0.3", - "es6-event-emitter": "^1.5.1", "escape-string-regexp": "^1.0.5", "file-type": "^3.8.0", "html-entities": "^1.2.0", "html-to-text": "^2.1.3", "image-size": "^0.5.0", - "jszip": "^3.1.1", + "jszip": "^3.1.2", "match-words": "^0.1.0", "mithril": "^0.2.5", "pretty-data": "^0.40.0", @@ -38,27 +37,28 @@ }, "devDependencies": { "autosize": "^3.0.17", - "babel-core": "^6.13.2", - "babel-loader": "^6.2.4", - "babel-preset-es2015": "^6.13.2", + "babel-core": "^6.14.0", + "babel-loader": "^6.2.5", + "babel-preset-es2015": "^6.14.0", "babel-preset-node6": "^11.0.0", - "babel-register": "^6.11.6", + "babel-register": "^6.14.0", "del": "^2.2.2", + "es6-event-emitter": "^1.5.1", "exports-loader": "^0.6.3", "file-saver": "^1.3.2", "gulp": "^3.9.1", "gulp-filter": "^4.0.0", "gulp-json-editor": "^2.2.1", - "gulp-standard": "^7.0.1", + "gulp-standard": "^8.0.2", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.9", "gulp-zip": "^3.2.0", "lazypipe": "^1.0.1", "raw-loader": "^0.5.1", "run-sequence": "^1.2.2", - "standard": "^7.1.2", + "standard": "^8.0.0", "stylus": "^0.54.5", - "stylus-loader": "^2.2.0", + "stylus-loader": "^2.3.1", "webpack": "^2.1.0-beta.20", "webpack-node-externals": "^1.3.3" }, diff --git a/src/FimFic2Epub.js b/src/FimFic2Epub.js index 25f34f7..0e22e38 100644 --- a/src/FimFic2Epub.js +++ b/src/FimFic2Epub.js @@ -257,7 +257,6 @@ class FimFic2Epub extends Emitter { this.progress(0, 0, 'Fetching remote files...') this.pcache.remoteResources = new Promise((resolve, reject) => { let iter = this.remoteResources.entries() - let count = 0 let completeCount = 0 let recursive = () => { @@ -271,8 +270,6 @@ class FimFic2Epub extends Emitter { let url = r[0] r = r[1] - count++ - fetchRemote(url, 'arraybuffer').then((data) => { r.dest = null let info = fileType(isNode ? data : new Uint8Array(data)) diff --git a/src/templates.js b/src/templates.js index 61cee73..f7e90fd 100644 --- a/src/templates.js +++ b/src/templates.js @@ -83,9 +83,9 @@ function sortSpineItems (items) { export function createOpf (ffc) { let remotes = [] - let remoteCounter = 0 + // let remoteCounter = 0 ffc.remoteResources.forEach((r, url) => { - remoteCounter++ + // remoteCounter++ if (!ffc.options.includeExternal) { // hack-ish, but what can I do? // turns out only video and audio can be remote resources.. :I diff --git a/webpack.config.babel.js b/webpack.config.babel.js index ad81365..1d71bce 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -18,7 +18,10 @@ const bundleExtensionConfig = { module: { loaders: [ { - test: /\.js$/, loader: 'babel', exclude: /node_modules/, query: { + test: /\.js$/, + loader: 'babel', + exclude: /node_modules/, + query: { sourceMaps: true, presets: ['es2015'] } @@ -66,7 +69,10 @@ const bundleNpmModuleConfig = { module: { loaders: [ { - test: /\.js$/, loader: 'babel', exclude: /node_modules/, query: { + test: /\.js$/, + loader: 'babel', + exclude: /node_modules/, + query: { sourceMaps: !inProduction, presets: ['es2015'] } @@ -89,7 +95,7 @@ const bundleNpmModuleConfig = { ] }, - externals: [nodeExternals(), 'exports?tidy_html5!tidy-html5'], + externals: [nodeExternals({whitelist: ['es6-event-emitter', /^babel-runtime/]}), 'exports?tidy_html5!tidy-html5'], plugins: [], devtool: 'source-map',