From beb2f516a82c6b69368893ceaf413c31e431dbb8 Mon Sep 17 00:00:00 2001
From: Observer KRypt0n_ <suimin.tu.mu.ga.mi@gmail.com>
Date: Sun, 2 Jan 2022 15:15:30 +0200
Subject: [PATCH] Updated bundle command

---
 package.json                                  |  6 +++--
 scripts/bundle-appimage-pure.cjs              | 14 +++++++++++
 scripts/bundle-appimage-with-libs.cjs         | 18 +++++++++++++++
 .../bundle-appimage.cjs                       | 23 ++++++++-----------
 4 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 scripts/bundle-appimage-pure.cjs
 create mode 100644 scripts/bundle-appimage-with-libs.cjs
 rename bundle-appimage.cjs => scripts/bundle-appimage.cjs (57%)

diff --git a/package.json b/package.json
index 009cc42..ec22130 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,9 @@
     "neu": "neu",
     "dev": "vite build && neu run --disable-auto-reload",
     "build": "vite build && rm -rf dist/an-anime-game-launcher/public && mkdir dist/an-anime-game-launcher/public && cp public/runners.json dist/an-anime-game-launcher/public && cp public/dxvks.json dist/an-anime-game-launcher/public && cp -r public/locales dist/an-anime-game-launcher/public/locales && cp -r public/shaders dist/an-anime-game-launcher/public/shaders && neu build --release",
-    "bundle": "node bundle-appimage.cjs",
+    "bundle": "yarn bundle:pure && yarn bundle:with-libs",
+    "bundle:pure": "node scripts/bundle-appimage-pure.cjs",
+    "bundle:with-libs": "node scripts/bundle-appimage-with-libs.cjs",
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "dependencies": {
@@ -20,7 +22,7 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.33",
     "@tsconfig/svelte": "^3.0.0",
     "@types/js-md5": "^0.4.3",
-    "neutralino-appimage-bundler": "^1.1.1",
+    "neutralino-appimage-bundler": "^1.2.1",
     "sass": "^1.45.2",
     "svelte": "^3.44.3",
     "svelte-check": "^2.2.11",
diff --git a/scripts/bundle-appimage-pure.cjs b/scripts/bundle-appimage-pure.cjs
new file mode 100644
index 0000000..148a0cd
--- /dev/null
+++ b/scripts/bundle-appimage-pure.cjs
@@ -0,0 +1,14 @@
+const { params } = require('./bundle-appimage.cjs');
+
+// Require bundler
+const { Bundler } = require('neutralino-appimage-bundler');
+
+// Create an object with some params
+const bundler = new Bundler({
+    ...params,
+    
+    includeLibraries: false
+});
+
+// Bundle project
+bundler.bundle();
diff --git a/scripts/bundle-appimage-with-libs.cjs b/scripts/bundle-appimage-with-libs.cjs
new file mode 100644
index 0000000..1e392f8
--- /dev/null
+++ b/scripts/bundle-appimage-with-libs.cjs
@@ -0,0 +1,18 @@
+const path = require('path');
+
+const { params } = require('./bundle-appimage.cjs');
+
+// Require bundler
+const { Bundler } = require('neutralino-appimage-bundler');
+
+// Create an object with some params
+const bundler = new Bundler({
+    ...params,
+    
+    includeLibraries: true,
+
+    output: path.join(__dirname, '../dist/An Anime Game Launcher Prebundled.AppImage')
+});
+
+// Bundle project
+bundler.bundle();
diff --git a/bundle-appimage.cjs b/scripts/bundle-appimage.cjs
similarity index 57%
rename from bundle-appimage.cjs
rename to scripts/bundle-appimage.cjs
index 6b37bbd..5e03d5a 100644
--- a/bundle-appimage.cjs
+++ b/scripts/bundle-appimage.cjs
@@ -1,17 +1,13 @@
 const path = require('path');
 
-// Require bundler
-const { Bundler } = require('neutralino-appimage-bundler');
-
-// Create an object with some params
-const bundler = new Bundler({
+exports.params = {
     // .desktop file properties
     desktop: {
         // Name field
         name: 'An Anime Game Launcher',
 
         // Path to the icon
-        icon: path.join(__dirname, 'public/icons/64x64.png'),
+        icon: path.join(__dirname, '../public/icons/64x64.png'),
 
         // Categories (defult is Utilities)
         categories: ['Game']
@@ -23,20 +19,21 @@ const bundler = new Bundler({
         name: 'an-anime-game-launcher',
 
         // Dist folder path
-        dist: path.join(__dirname, 'dist')
+        dist: path.join(__dirname, '../dist')
     },
 
+    // Should AppImage contain Neutralino's dependencies or not
+    // If true, then AppImage will contain webkit2gtk
+    includeLibraries: false,
+
     // Some files or folders to copy inside of the the AppImage
     copy: {
-        'public': path.join(__dirname, 'dist/an-anime-game-launcher/public')
+        'public': path.join(__dirname, '../dist/an-anime-game-launcher/public')
     },
 
     // Path to the appimage to save
-    output: path.join(__dirname, 'dist/An Anime Game Launcher.AppImage'),
+    output: path.join(__dirname, '../dist/An Anime Game Launcher.AppImage'),
 
     // Application version
     version: '2.0.0-beta-2'
-});
-
-// Bundle project
-bundler.bundle();
+};