From c27f1aa5cce8cd88e43b05895a1ead902c66b808 Mon Sep 17 00:00:00 2001
From: daniel-j <daniel.j.hede@gmail.com>
Date: Mon, 10 Aug 2020 11:34:53 +0200
Subject: [PATCH] fix standalone build, bump version

---
 .gitignore        |  2 --
 bin/fimfic2epub   |  1 +
 gulpfile.babel.js |  2 +-
 package-lock.json |  2 +-
 package.json      |  2 +-
 webpack.config.js | 10 +++++++++-
 6 files changed, 13 insertions(+), 6 deletions(-)
 create mode 120000 bin/fimfic2epub

diff --git a/.gitignore b/.gitignore
index 74e2f9d..3e2c0ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,4 @@ extension.zip
 fimfic2epub.safariextension/
 dist/
 build/
-bin/
 *.epub
-*.node
diff --git a/bin/fimfic2epub b/bin/fimfic2epub
new file mode 120000
index 0000000..49299b0
--- /dev/null
+++ b/bin/fimfic2epub
@@ -0,0 +1 @@
+../build/fimfic2epub
\ No newline at end of file
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 39ebf70..b3e7f4a 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -139,7 +139,7 @@ gulp.task('binaries', gulp.series('version', function binariesTask () {
     .pipe(rename({ extname: '' }))
     .pipe(header('#!/usr/bin/env node\n// fimfic2epub ' + packageVersion + '\n'))
     .pipe(chmod(0o777))
-    .pipe(gulp.dest('bin/'))
+    .pipe(gulp.dest('build/'))
 }))
 
 gulp.task('pack:firefox', gulp.series('version', function packFirefox () {
diff --git a/package-lock.json b/package-lock.json
index a76ef23..af93b99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "fimfic2epub",
-  "version": "1.7.44",
+  "version": "1.7.45",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 17030d7..4577a97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fimfic2epub",
-  "version": "1.7.44",
+  "version": "1.7.45",
   "description": "Tool to generate improved EPUB ebooks from Fimfiction stories",
   "author": "djazz",
   "license": "MIT",
diff --git a/webpack.config.js b/webpack.config.js
index 56399e9..44f091d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -182,6 +182,11 @@ const bundleNpmBinaryConfig = {
     __dirname: false
   },
 
+  externals: [nodeExternals(), {
+    './FimFic2Epub': 'require(\'../dist/fimfic2epub\')',
+    '../package.json': 'require(\'../package.json\')'
+  }],
+
   plugins: [],
   performance: {
     hints: false
@@ -231,7 +236,10 @@ const bundleStaticNpmModuleConfig = {
       },
       {
         test: /\.node$/,
-        use: 'node-loader'
+        loader: 'node-loader',
+        options: {
+          name: '[name].[ext]'
+        }
       }
     ]
   },