some changes to build

BetterDiscordApp/gulpfile.js

@@ -1,20 +0,0 @@
-const gulp = require("gulp");
-const rename = require("gulp-rename");
-const csso = require("gulp-csso");
-
-gulp.task("minify-css", minifyCSS);
-gulp.task("watch-css", function() {
-  return gulp.watch(["./src/styles/index.css"], minifyCSS);
-});
-
-async function minifyCSS() {
-  return [
-    gulp.src("./src/styles/index.css")
-        .pipe(csso({restructure: false}))
-        .pipe(rename("style.min.css"))
-        .pipe(gulp.dest("./dist")),
-	gulp.src("./src/styles/index.css")
-        .pipe(rename("style.css"))
-        .pipe(gulp.dest("./dist"))
-  ]
-}

BetterDiscordApp/minify-css.js

@@ -0,0 +1,43 @@
+const CleanCSS = require("clean-css")
+const fs = require("fs")
+const path = require("path")
+const child_process = require("child_process")
+
+let commit = child_process.execSync("git rev-parse HEAD").toString().split("\n")[0].trim()
+
+function minify(){
+    let start = Date.now()
+    console.log(`\x1b[33mMinifying...\x1b[0m`)
+    const css = fs.readFileSync(path.join(__dirname, "./src/styles/index.css"), "utf-8")
+    fs.writeFileSync(path.join(__dirname, "./dist/style.css"), css)
+    const output = new CleanCSS({
+        sourceMap: true,
+        sourceMapInlineSources: true
+    }).minify(css)
+    if(output.errors.length > 0){
+        console.error("\x1b[31m"+output.errors.join("\n")+"\x1b[0m")
+    }
+    if(output.warnings.length > 0){
+        console.warn("\x1b[33m"+output.warnings.join("\n")+"\x1b[0m")
+    }
+    let outputCSS = output.styles + "\n" +
+    "/*# sourceMappingURL=https://rawcdn.githack.com/Lightcord/Lightcord/"+commit+"/BetterDiscordApp/dist/style.min.css.map*/"
+    fs.writeFileSync(path.join(__dirname, "./dist/style.min.css"), outputCSS)
+    fs.writeFileSync(path.join(__dirname, "./dist/style.min.css.map"), output.sourceMap)
+    console.log(`\x1b[32mMinified in ${(Date.now() - start)}ms. Minified by ${Math.floor(output.stats.efficiency*100)}%\x1b[0m`)
+}
+module.exports.minify = minify
+
+if(require.main === module){
+    if(process.argv.includes("--watch")){
+        console.log("\x1b[32mStarting watch mode.\x1b[0m")
+        minify()
+        console.log()
+        fs.watchFile(path.join(__dirname, "./src/styles/index.css"), () => {
+            minify()
+            console.log()
+        })
+    }else{
+        minify()
+    }
+}

BetterDiscordApp/package.json

@@ -6,11 +6,11 @@
     "scripts": {
         "build": "webpack --progress --colors",
         "watch": "webpack --progress --colors --watch",
-        "build-prod": "webpack --progress --colors --mode production -o dist/index.min.js --devtool none",
+        "build-prod": "webpack --progress --colors --config prod.config.js",
-        "watch-prod": "webpack --progress --colors --watch --mode production -o dist/index.min.js --devtool none",
+        "watch-prod": "webpack --progress --colors --watch --config prod.config.js",
         "test": "echo \"Error: no test specified\" && exit 1",
-        "minify-css": "gulp minify-css",
+        "minify-css": "node minify-css.js",
-        "watch-css": "gulp watch-css",
+        "watch-css": "node minify-css.js --watch",
         "deploy": "npm run build-prod && npm run minify-css"
     },
     "repository": {
@@ -30,10 +30,8 @@
         "@babel/register": "^7.10.5",
         "babel-loader": "^8.1.0",
         "circular-dependency-plugin": "^5.2.0",
-        "gulp": "^4.0.2",
+        "clean-css": "^4.2.3",
-        "gulp-csso": "^4.0.1",
+        "webpack": "^4.44.1",
-        "gulp-rename": "^2.0.0",
-        "webpack": "^4.43.0",
         "webpack-cli": "^3.3.12"
     }
 }

BetterDiscordApp/prod.config.js

@@ -0,0 +1,13 @@
+const config = require("./webpack.config.js")
+const { SourceMapDevToolPlugin } = require("webpack")
+
+config.mode = "production"
+delete config.devtool
+config.output.filename = "index.min.js"
+config.plugins.push(new SourceMapDevToolPlugin({
+    test: /\.(js|jsx|)/,
+    filename: "[name].js.map",
+    publicPath: config.output.publicPath,
+}))
+
+module.exports = config

BetterDiscordApp/src/0globals.js

@@ -128,6 +128,9 @@ export const defaultRPC = {
     "assets.large": "712323821037682791"
 }
 
+export const lightcordSettings = {};
+export const defaultLightcordSettings = {};
+
 export const bdpluginErrors = [];
 export const bdthemeErrors = []; // define for backwards compatibility
 

BetterDiscordApp/src/modules/core.js

@@ -1,4 +1,4 @@
-import {bdConfig, minSupportedVersion, bbdVersion, settingsCookie, bdpluginErrors, bdthemeErrors, bbdChangelog, defaultCookie, currentDiscordVersion, defaultRPC, settingsRPC} from "../0globals";
+import {bdConfig, minSupportedVersion, bbdVersion, settingsCookie, bdpluginErrors, bdthemeErrors, bbdChangelog, defaultCookie, currentDiscordVersion, defaultRPC, settingsRPC, lightcordSettings} from "../0globals";
 import Utils from "./utils";
 
 import BDV2 from "./v2";
@@ -231,13 +231,16 @@ Core.prototype.injectExternals = async function() {
 
 Core.prototype.initSettings = function () {
     DataStore.initialize();
-    if(!DataStore.getSettingGroup("settings") && !DataStore.getSettingGroup("rpc")){
+    if(!DataStore.getSettingGroup("lightcord-settings")){
-        if (!DataStore.getSettingGroup("settings")) {
+        for(let key in lightcordSettings){
-            Object.assign(settingsCookie, defaultCookie);
+            delete lightcordSettings[key]
         }
-        if (!DataStore.getSettingGroup("rpc")) {
+    }
+    if(!DataStore.getSettingGroup("rpc")){
         Object.assign(settingsRPC, defaultRPC);
     }
+    if(!DataStore.getSettingGroup("settings")){
+            Object.assign(settingsCookie, defaultCookie);
         settingsPanel.saveSettings();
     } else {
         settingsPanel.loadSettings();

BetterDiscordApp/src/modules/domtools.js

@@ -132,8 +132,7 @@ export default class DOMTools {
      * @param {Element} [baseElement] - Element to base the query from
      * @returns {(Element|null)} - The found element or null if not found
      */
-    static query(selector, baseElement) {
+    static query(selector, baseElement = document) {
-        if (!baseElement) baseElement = document;
         return baseElement.querySelector(selector);
     }
 
@@ -144,8 +143,7 @@ export default class DOMTools {
      * @param {Element} [baseElement] - Element to base the query from
      * @returns {Array<Element>} - Array of all found elements
      */
-    static queryAll(selector, baseElement) {
+    static queryAll(selector, baseElement = document) {
-        if (!baseElement) baseElement = document;
         return baseElement.querySelectorAll(selector);
     }
 

BetterDiscordApp/src/modules/settingsPanel.js

@@ -1,4 +1,4 @@
-import {settings, settingsCookie, settingsRPC} from "../0globals";
+import {settings, settingsCookie, settingsRPC, lightcordSettings} from "../0globals";
 import DataStore from "./dataStore";
 import V2_SettingsPanel_Sidebar from "./settingsPanelSidebar";
 import Utils from "./utils";
@@ -295,11 +295,14 @@ export default new class V2_SettingsPanel {
     saveSettings() {
         DataStore.setSettingGroup("settings", settingsCookie);
         DataStore.setSettingGroup("rpc", settingsRPC);
+        DataStore.setSettingGroup("lightcord-settings", lightcordSettings);
     }
 
     loadSettings() {
         Object.assign(settingsCookie, DataStore.getSettingGroup("settings"));
         Object.assign(settingsRPC, DataStore.getSettingGroup("rpc"));
+        console.log(lightcordSettings, DataStore.getSettingGroup("lightcord-settings"))
+        Object.assign(lightcordSettings, DataStore.getSettingGroup("lightcord-settings"));
     }
 
     renderSidebar(sidebar) {

BetterDiscordApp/src/ui/settingsGroup.js

@@ -1,24 +0,0 @@
-import {settingsCookie} from "../0globals";
-import BDV2 from "../modules/v2";
-
-import SettingsTitle from "./settingsTitle";
-import Switch from "./switch";
-
-export default class V2C_SettingsGroup extends BDV2.reactComponent {
-
-    constructor(props) {
-        super(props);
-    }
-
-    render() {
-        const {title, settings, button} = this.props;
-        const buttonComponent = button ? BDV2.react.createElement("button", {key: "title-button", className: "bd-pfbtn", onClick: button.onClick}, button.title) : null;
-        return [BDV2.react.createElement(SettingsTitle, {text: title}),
-                buttonComponent,
-                settings.map(setting => {
-                    return BDV2.react.createElement(Switch, {id: setting.id, key: setting.id, data: setting, checked: settingsCookie[setting.id], onChange: (id, checked) => {
-                        this.props.onChange(id, checked);
-                    }});
-                })];
-    }
-}

BetterDiscordApp/src/ui/settingsGroup.jsx

@@ -0,0 +1,91 @@
+import {settingsCookie} from "../0globals";
+import BDV2 from "../modules/v2";
+
+import SettingsTitle from "./settingsTitle";
+import Switch from "./switch";
+import MarginTop from "./margintop";
+
+let formModule
+let switchItem
+let betaClassNames
+export default class V2C_SettingsGroup extends BDV2.reactComponent {
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            error: false
+        }
+    }
+
+    renderOldSettings() {
+        const {title, settings, button} = this.props;
+        const buttonComponent = button ? BDV2.react.createElement("button", {key: "title-button", className: "bd-pfbtn", onClick: button.onClick}, button.title) : null;
+        return [BDV2.react.createElement(SettingsTitle, {text: title}),
+                buttonComponent,
+                settings.map(setting => {
+                    return BDV2.react.createElement(Switch, {id: setting.id, key: setting.id, data: setting, checked: settingsCookie[setting.id], onChange: (id, checked) => {
+                        this.props.onChange(id, checked);
+                    }});
+                })];
+    }
+
+    componentDidCatch(err, errInfo){
+        console.log(err, errInfo)
+        this.setState({
+            error: true
+        })
+    }
+
+    render(){
+        if(this.state.error){
+            try{
+                return this.renderOldSettings()
+            }catch(e){
+                console.error(e)
+                return null
+            }
+        }else{
+            try{
+                if(!formModule)formModule = BDV2.WebpackModules.find(e => e.FormSection)
+                if(!switchItem)switchItem = BDV2.WebpackModules.find(e => e.default && e.default.displayName === "SwitchItem")
+                if(!betaClassNames)betaClassNames = BDV2.WebpackModules.find(e => e.beta && (!e.container && !e.userSettingsVoice))
+                
+                let children = []
+                if(this.props.description){
+                    children.push(<formModule.FormText type="description" selectable={false}>
+                        {this.props.description}
+                    </formModule.FormText>, <MarginTop></MarginTop>)
+                }
+                children.push(...this.props.settings.map(setting => {
+                    let info = [
+                        setting.text
+                    ]
+                    if(setting.experimental){
+                        info.push(<sup className={betaClassNames.beta}>(EXPERIMENTAL)</sup>)
+                    }
+                    return <switchItem.default onChange={(ev) => {
+                        this.props.onChange(setting.id, ev.target.checked);
+                        this.forceUpdate()
+                    }} key={setting.id} value={settingsCookie[setting.id]} className={__SECRET_EMOTION__.css({
+                        marginBottom: "20px"
+                    })} disabled={false} hideBorder={false}
+                        size={switchItem.default.Sizes.DEFAULT} theme={switchItem.default.Themes.DEFAULT} note={setting.info}>
+                        {info}
+                    </switchItem.default>
+                }))
+                return <formModule.FormSection tag="h2" title={this.props.title}>
+                    {children}
+                </formModule.FormSection>
+            }catch(e){
+                console.error(e)
+                setImmediate(()=>{
+                    this.setState({
+                        error: true
+                    })
+                })
+                return null
+            }
+        }
+    }
+}

BetterDiscordApp/webpack.config.js

@@ -1,6 +1,11 @@
 const path = require("path");
 const CircularDependencyPlugin = require("circular-dependency-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
+const child_process = require("child_process")
+
+const commit = child_process.execSync("git rev-parse HEAD", {
+    cwd: __dirname
+}).toString("utf-8").replace(/[^\w\d]/g, "")
 
 module.exports = {
   mode: "development",
@@ -11,7 +16,8 @@ module.exports = {
     filename: "index.js",
     path: path.resolve(__dirname, "dist"),
     library: "BetterDiscord",
-    libraryTarget: "commonjs2"
+    libraryTarget: "commonjs2",
+    publicPath: "https://rawcdn.githack.com/Lightcord/Lightcord/"+commit+"/LightcordApi/dist/"
   },
   externals: {
     electron: `electron`,
@@ -67,7 +73,8 @@ module.exports = {
       new TerserPlugin({
         terserOptions: {
           compress: {drop_debugger:false}
-        }
+        },
+        sourceMap: true
       })
     ]
   }

LightcordApi/package.json

@@ -6,8 +6,8 @@
   "scripts": {
     "build": "webpack --progress --colors",
     "watch": "webpack --progress --colors --watch",
-    "build-prod": "webpack --progress --colors --mode production -o js/main.min.js --devtool none",
+    "build-prod": "webpack --progress --colors --mode production -o js/main.min.js --devtool source-map",
-    "watch-prod": "webpack --progress --colors --watch --mode production -o js/main.min.js --devtool none",
+    "watch-prod": "webpack --progress --colors --watch --mode production -o js/main.min.js --devtool source-map",
     "test": "echo \"Error: no test specified\" && exit 1",
     "docs": "typedoc --out ../../LightcordApiDocs ./src"
   },

LightcordApi/prod.config.js

@@ -0,0 +1,12 @@
+const config = require("./webpack.config.js")
+
+config.mode = "production"
+delete config.devtool
+config.output.filename = "main.min.js"
+config.plugins.push(new SourceMapDevToolPlugin({
+    test: /\.(js|jsx|)/,
+    filename: "[name].js.map",
+    publicPath: config.output.publicPath,
+}))
+
+module.exports = config

LightcordApi/src/components/general/AlertBox.tsx

@@ -3,7 +3,7 @@ import { ReactNode } from "react"
 
 type AlertBoxProps = {
     type: "warn"|"info"|"danger"|"error"|"success",
-    children: ReactNode|string
+    children?: ReactNode|string
 }
 
 let AlertBoxModules

LightcordApi/src/components/general/ErrorCatcher.tsx

@@ -8,7 +8,7 @@ import AlertBox from "./AlertBox";
 
 
 type ErrorCatcherProps = {
-    children: ReactNode
+    children?: ReactNode
 }
 let ErrorCatcherModules
 export default class ErrorCatcher extends React.Component<ErrorCatcherProps, {error: boolean, hasSentNotification: boolean}> {

LightcordApi/src/components/general/Flex.tsx

@@ -10,7 +10,6 @@ type FlexProps = {
     shrink?: number,
     grow?: number,
     basis?: "auto"|string,
-    children: ReactNode,
     style?: CSSProperties
 }
 
@@ -91,7 +90,7 @@ export default class Flex extends React.Component<FlexProps> {
 let AllPreviews
 
 export type FlexChildProps = {
-    children: ReactNode,
+    children?: ReactNode,
     className?: string,
     grow?: number,
     style?: CSSProperties,

LightcordApi/src/components/general/SettingSubTitle.tsx

@@ -3,7 +3,7 @@ import { ReactNode } from "react"
 import Utils from "../../modules/Utils"
 
 type SettingSubTitleProps = {
-    children: ReactNode
+    children?: ReactNode
     className?: string
 }
 

LightcordApi/src/components/general/SettingsTitle.tsx

@@ -3,7 +3,7 @@ import Title from "./Title"
 import { ReactNode } from "react"
 
 type SettingsTitleProps = {
-    children: ReactNode
+    children?: ReactNode
     className?: string
 }
 

LightcordApi/src/components/inputs/Dropdown.tsx

@@ -72,6 +72,7 @@ export default class Dropdown extends React.Component<DropdownProps, {value: str
     }
 
     onChange(value){
+        value = value ? value.value : null
         this.props.onChange(value)
         this.setState({
             value: value

LightcordApi/tsconfig.json

@@ -14,6 +14,7 @@
     "exclude": [
         "./js/**",
         "./webpack.config.js",
-        "./dist/**"
+        "./dist/**",
+        "./prod.config.js"
     ]
 }

LightcordApi/webpack.config.js

@@ -1,5 +1,10 @@
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin")
+const child_process = require("child_process")
+
+const commit = child_process.execSync("git rev-parse --short HEAD", {
+    cwd: __dirname
+}).toString("utf-8")
 
 module.exports = {
     mode: "development",
@@ -10,7 +15,8 @@ module.exports = {
         filename: "main.js",
         path: path.resolve(__dirname, "js"),
         library: "LightcordApi",
-        libraryTarget: "commonjs2"
+        libraryTarget: "commonjs2",
+        publicPath: "https://rawcdn.githack.com/Lightcord/Lightcord/"+commit+"/LightcordApi/js/"
     },
     externals: {
         electron: `electron`,

build.js

@@ -13,9 +13,12 @@ console.log = (...args) => {
 console.info = (...args) => {
     console.log(`\x1b[34m[INFO]\x1b[0m`, ...args)
 }
+let commit = child_process.execSync("git rev-parse HEAD").toString().split("\n")[0].trim()
+console.info(`Obtained commit ${commit} for the build`)
 
 async function main(){
-    console.log(__dirname, process.cwd())
+    let startTimestamp = Date.now()
+    console.info("Starting build")
     
     console.info("Reseting existent directory...")
     await fs.promises.rmdir("./distApp", {"recursive": true})
@@ -41,7 +44,8 @@ async function main(){
                 if([
                     "ts",
                     "md",
-                    "gitignore"
+                    "gitignore",
+                    "map"
                 ].includes(type)){
                     console.warn(`\x1b[33mIgnored file ${path.relative(folders.startDir, filepath)} because of type ${type}\x1b[0m`)
                     continue
@@ -67,7 +71,32 @@ async function main(){
                 if(!isMinified && predicate(filepath) && filepath.split(/[\\/]+/).reverse()[1] !== "js"){
                     await compile(filepath, path.join(filepath.replace(folders.startDir, folders.newDir)), "..")
                 }else{
+                    if(["js", "css"].includes(type)){
+                        let fileContent = (await fs.promises.readFile(filepath, "utf8"))
+                        let sourceMap = fileContent.split(/[\n\r]+/g).pop()
+                        if(!sourceMap.startsWith("//# sourceMappingURL=")){
                             await fs.promises.copyFile(filepath, filepath.replace(folders.startDir, folders.newDir))
+                            continue
+                        }
+                        let sourceMapContent
+                        if(sourceMap.slice(21).startsWith("data:")){
+                            sourceMapContent= Buffer.from(sourceMap.split("=").slice(1).join("="), "base64")
+                        }else{
+                            await fs.promises.copyFile(filepath, filepath.replace(folders.startDir, folders.newDir))
+                            continue
+                            //let file = path.dirname(filepath)+"/"+sourceMap.slice(21)
+                            //sourceMapContent = fs.readFileSync(file)
+                        }
+                        let sourceMapPath = filepath + ".map"
+                        let pth = path.posix.resolve(sourceMapPath.replace(__dirname, "").replace(/\\/g, "/"))
+                        fileContent = fileContent
+                        // source map
+                        .replace(sourceMap, "//# sourceMappingURL=https://rawcdn.githack.com/Lightcord/Lightcord/"+commit+pth)
+                        await fs.promises.writeFile(filepath.replace(folders.startDir, folders.newDir), fileContent)
+                        await fs.promises.writeFile(sourceMapPath, sourceMapContent)
+                    }else{
+                        await fs.promises.copyFile(filepath, filepath.replace(folders.startDir, folders.newDir))
+                    }
                 }
             }else if(file.isDirectory()){
                 if(ignoreModules && file.name === "node_modules")continue
@@ -79,13 +108,12 @@ async function main(){
     }
     await processNextDir(startDir, {
         startDir,
-        newDir
+        newDir,
-    }, ((filepath) => filepath.endsWith(".js") && (!production ? !filepath.includes("node_modules") : true)), async (filepath, newpath) => {
+        exclude: /node_modules/g
+    }, ((filepath) => filepath.endsWith(".js")), async (filepath, newpath) => {
         console.info(`Minifying ${filepath} to ${newpath}`)
 
         if(filepath.endsWith("git.js")){
-            let commit = child_process.execSync("git rev-parse HEAD").toString().split("\n")[0].trim()
-            console.info(`Obtained commit ${commit} for the build`)
             await fs.promises.writeFile(newpath, terser.minify(fs.readFileSync(filepath, "utf8").replace(/"{commit}"/g, `"${commit}"`)).code, "utf8")
         }else{
             await fs.promises.writeFile(newpath, terser.minify(await fs.promises.readFile(filepath, "utf8")).code, "utf8")
@@ -96,9 +124,9 @@ async function main(){
     
     await processNextDir(path.join(__dirname, "modules"), {
         startDir: path.join(__dirname, "modules"),
-        newDir: path.join(__dirname, "distApp", "modules")
+        newDir: path.join(__dirname, "distApp", "modules"),
-    }, ((filepath) => filepath.endsWith(".js") && (!production ? !filepath.includes("node_modules") : true)), async (filepath, newpath) => {
+        exclude: /node_modules/g
-        if(filepath.includes("node_modules"))return // don't minify node_modules, and don't include them at all. Installing later
+    }, ((filepath) => filepath.endsWith(".js")), async (filepath, newpath) => {
         console.info(`Minifying ${filepath} to ${newpath}`)
         await fs.promises.writeFile(newpath, terser.minify(await fs.promises.readFile(filepath, "utf8")).code, "utf8")
     }, true).then(() => {
@@ -130,7 +158,10 @@ async function main(){
     }, ((filepath) => filepath.endsWith(".js") && (!production ? !filepath.includes("node_modules") : true)), async (filepath, newpath) => {
         if(filepath.includes("node_modules"))return // don't minify node_modules, and don't include them at all. Installing later
         console.info(`Minifying ${filepath} to ${newpath}`)
-        await fs.promises.writeFile(newpath, terser.minify(await fs.promises.readFile(filepath, "utf8")).code, "utf8")
+        let fileContent = (await fs.promises.readFile(filepath, "utf8"))
+        // source map
+        .replace(/\/\/# sourceMappingURL=/, "//# sourceMappingURL=https://raw.githubusercontent.com/Lightcord/Lightcord/"+commit+"/LightcordApi/js/")
+        await fs.promises.writeFile(newpath, fileContent, "utf8")
     }, true).then(() => {
         console.info(`Copied files and minified them from ${path.join(__dirname, "LightcordApi")}.`)
     })
@@ -144,9 +175,9 @@ async function main(){
         fs.mkdirSync(path.join(__dirname, "distApp", "DiscordJS", dir), {recursive: true})
         return processNextDir(path.join(__dirname, "DiscordJS", dir), {
             startDir: path.join(__dirname, "DiscordJS", dir),
-            newDir: path.join(__dirname, "distApp", "DiscordJS", dir)
+            newDir: path.join(__dirname, "distApp", "DiscordJS", dir),
-        }, ((filepath) => filepath.endsWith(".js") && (!production ? !filepath.includes("node_modules") : true)), async (filepath, newpath) => {
+            exclude: /node_modules/g
-            if(filepath.includes("node_modules"))return // don't minify node_modules, and don't include them at all
+        }, ((filepath) => filepath.endsWith(".js")), async (filepath, newpath) => {
             console.info(`Minifying ${filepath} to ${newpath}`)
             await fs.promises.writeFile(newpath, terser.minify(await fs.promises.readFile(filepath, "utf8")).code, "utf8")
         }).then(() => {
@@ -174,7 +205,8 @@ async function main(){
     await fs.promises.mkdir(path.join(__dirname, "distApp", "splash", "videos"), {recursive: true})
     await processNextDir(path.join(__dirname, "splash"), {
         startDir: path.join(__dirname, "splash"),
-        newDir: path.join(__dirname, "distApp", "splash")
+        newDir: path.join(__dirname, "distApp", "splash"),
+        exclude: /node_modules/g
     }, (filepath) => {
         if(filepath.endsWith(".js"))return true
         return false
@@ -197,6 +229,7 @@ async function main(){
         encoding: "binary",
         cwd: path.join(__dirname, "distApp")
     }))
+    console.info("Build took "+(Date.now() - startTimestamp) +"ms.")
 }
 main()
 .catch(err => {

compile.js

@@ -4,8 +4,8 @@ const { join } = require("path")
 /** Main Project */
 spawnSync("tsc")
 /** BetterDiscord */
-spawnSync("npm run build-prod", join(__dirname, "BetterDiscordApp"))
 spawnSync("npm run build", join(__dirname, "BetterDiscordApp"))
+spawnSync("npm run build-prod", join(__dirname, "BetterDiscordApp"))
 spawnSync("npm run minify-css", join(__dirname, "BetterDiscordApp"))
 /** DiscordJS */
 spawnSync("npm run build", join(__dirname, "DiscordJS"))

modules/discord_desktop_core/core/app/mainScreen.js

@@ -364,7 +364,7 @@ function launchMainAppWindow(isVisible) {
         preload: _path.join(__dirname, 'mainScreenPreload.js')
       })
     },
-    icon: _path.join(__dirname, 'discord.png')
+    icon: _path.join(__dirname, "images", 'discord.png')
   };
 
   if (process.platform === 'linux') {

modules/discord_desktop_core/core/app/popoutWindows.js

@@ -32,7 +32,7 @@ const DEFAULT_POPOUT_OPTIONS = {
     nodeIntegration: false,
     nativeWindowOpen: true
   },
-  icon: join(__dirname, 'discord.png')
+  icon: join(__dirname, "images", 'discord.png')
 };
 const features = (0, _appFeatures.getFeatures)();
 

package-lock.json

@@ -8,7 +8,6 @@
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz",
       "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==",
-      "dev": true,
       "requires": {
         "debug": "^4.1.1",
         "env-paths": "^2.2.0",
@@ -24,14 +23,12 @@
     "@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
-      "dev": true
     },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
       "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
       "requires": {
         "defer-to-connect": "^1.0.1"
       }
@@ -83,8 +80,7 @@
     "@types/node": {
       "version": "12.12.39",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.39.tgz",
-      "integrity": "sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg==",
+      "integrity": "sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg=="
-      "dev": true
     },
     "@types/rimraf": {
       "version": "3.0.0",
@@ -194,7 +190,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz",
       "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==",
-      "dev": true,
       "optional": true
     },
     "brace-expansion": {
@@ -214,14 +209,12 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-      "dev": true
     },
     "cacheable-request": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
       "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
       "requires": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
@@ -236,7 +229,6 @@
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
           "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
           "requires": {
             "pump": "^3.0.0"
           }
@@ -244,8 +236,7 @@
         "lowercase-keys": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-          "dev": true
         }
       }
     },
@@ -258,7 +249,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
       "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
       "requires": {
         "mimic-response": "^1.0.0"
       }
@@ -286,7 +276,6 @@
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -298,7 +287,6 @@
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
       "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
-      "dev": true,
       "optional": true,
       "requires": {
         "ini": "^1.3.4",
@@ -309,7 +297,6 @@
       "version": "3.6.5",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
-      "dev": true,
       "optional": true
     },
     "core-util-is": {
@@ -345,7 +332,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
       "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
       "requires": {
         "ms": "^2.1.1"
       }
@@ -354,7 +340,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
       "requires": {
         "mimic-response": "^1.0.0"
       }
@@ -362,14 +347,12 @@
     "defer-to-connect": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
-      "dev": true
     },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
       "optional": true,
       "requires": {
         "object-keys": "^1.0.12"
@@ -384,14 +367,12 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
       "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-      "dev": true,
       "optional": true
     },
     "duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-      "dev": true
     },
     "ecc-jsbn": {
       "version": "0.1.2",
@@ -406,7 +387,6 @@
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/electron/-/electron-8.4.0.tgz",
       "integrity": "sha512-SpgyccM5rjDJSGcpQjiviUBT44fZlSyhcjy8RpKSnAad+co4xY1vYj6T25U1CfSk0PH/dhvcp63P2sdXHCwq/Q==",
-      "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
         "@types/node": "^12.0.12",
@@ -417,14 +397,12 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
       "optional": true
     },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -432,21 +410,18 @@
     "env-paths": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
-      "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
+      "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="
-      "dev": true
     },
     "es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true,
       "optional": true
     },
     "escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
       "optional": true
     },
     "extend": {
@@ -458,7 +433,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
       "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
-      "dev": true,
       "requires": {
         "concat-stream": "^1.6.2",
         "debug": "^2.6.9",
@@ -470,7 +444,6 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -479,7 +452,6 @@
           "version": "0.5.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -487,8 +459,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-          "dev": true
         }
       }
     },
@@ -534,7 +505,6 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -550,7 +520,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
       "requires": {
         "pump": "^3.0.0"
       }
@@ -588,7 +557,6 @@
       "version": "2.1.12",
       "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz",
       "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==",
-      "dev": true,
       "optional": true,
       "requires": {
         "boolean": "^3.0.1",
@@ -604,7 +572,6 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
       "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
-      "dev": true,
       "optional": true,
       "requires": {
         "encodeurl": "^1.0.2",
@@ -617,7 +584,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
       "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
-      "dev": true,
       "optional": true,
       "requires": {
         "define-properties": "^1.1.3"
@@ -627,7 +593,6 @@
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
       "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
       "requires": {
         "@sindresorhus/is": "^0.14.0",
         "@szmarczak/http-timer": "^1.1.2",
@@ -645,8 +610,7 @@
     "graceful-fs": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-      "dev": true
     },
     "har-schema": {
       "version": "2.0.0",
@@ -665,8 +629,7 @@
     "http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
-      "dev": true
     },
     "http-signature": {
       "version": "1.2.0",
@@ -696,7 +659,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true,
       "optional": true
     },
     "is-typedarray": {
@@ -707,8 +669,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -729,8 +690,7 @@
     "json-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-      "dev": true
     },
     "json-schema": {
       "version": "0.2.3",
@@ -751,7 +711,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
       }
@@ -771,29 +730,25 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
       "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
       "requires": {
         "json-buffer": "3.0.0"
       }
     },
     "lodash": {
-      "version": "4.17.19",
+      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-      "dev": true,
       "optional": true
     },
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
-      "dev": true
     },
     "matcher": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
       "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "dev": true,
       "optional": true,
       "requires": {
         "escape-string-regexp": "^4.0.0"
@@ -815,8 +770,7 @@
     "mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
-      "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
@@ -839,8 +793,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-      "dev": true
     },
     "node-fetch": {
       "version": "2.6.0",
@@ -850,14 +803,12 @@
     "normalize-url": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
-      "dev": true
     },
     "npm-conf": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
       "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
-      "dev": true,
       "optional": true,
       "requires": {
         "config-chain": "^1.1.11",
@@ -873,7 +824,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
       "optional": true
     },
     "once": {
@@ -892,8 +842,7 @@
     "p-cancelable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
-      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -920,32 +869,27 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
       "optional": true
     },
     "prepend-http": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
-      "dev": true
     },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-      "dev": true
     },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-      "dev": true
     },
     "proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true,
       "optional": true
     },
     "psl": {
@@ -957,7 +901,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -977,7 +920,6 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -1019,7 +961,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
       "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
       "requires": {
         "lowercase-keys": "^1.0.0"
       }
@@ -1036,7 +977,6 @@
       "version": "2.15.3",
       "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz",
       "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==",
-      "dev": true,
       "optional": true,
       "requires": {
         "boolean": "^3.0.0",
@@ -1061,7 +1001,6 @@
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
       "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
-      "dev": true,
       "requires": {
         "truncate-utf8-bytes": "^1.0.0"
       }
@@ -1070,21 +1009,18 @@
       "version": "7.3.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
       "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "dev": true,
       "optional": true
     },
     "semver-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
       "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
-      "dev": true,
       "optional": true
     },
     "serialize-error": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
       "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "dev": true,
       "optional": true,
       "requires": {
         "type-fest": "^0.13.1"
@@ -1125,7 +1061,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-      "dev": true,
       "optional": true
     },
     "sshpk": {
@@ -1148,7 +1083,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -1157,7 +1091,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
       "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-      "dev": true,
       "requires": {
         "debug": "^4.1.0"
       }
@@ -1184,8 +1117,7 @@
     "to-readable-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
-      "dev": true
     },
     "tough-cookie": {
       "version": "2.5.0",
@@ -1200,7 +1132,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
       "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
-      "dev": true,
       "requires": {
         "utf8-byte-length": "^1.0.1"
       }
@@ -1209,7 +1140,6 @@
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "dev": true,
       "optional": true
     },
     "tunnel-agent": {
@@ -1229,14 +1159,12 @@
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
       "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "dev": true,
       "optional": true
     },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-      "dev": true
     },
     "typescript": {
       "version": "3.9.7",
@@ -1247,8 +1175,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-      "dev": true
     },
     "untildify": {
       "version": "3.0.3",
@@ -1267,7 +1194,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
       "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "dev": true,
       "requires": {
         "prepend-http": "^2.0.0"
       }
@@ -1275,14 +1201,12 @@
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
+      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
-      "dev": true
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-      "dev": true
     },
     "uuid": {
       "version": "3.4.0",

package.json

@@ -17,11 +17,12 @@
     "devInstall:64": "npm i --save-dev --arch=x64 electron@8.4.0 && node installSubModules.js && echo \"Everything is installed. You should be able to do `npm run test` to compile everything and launch.\"",
     "versions": "echo Electron: && electron -v && echo Typescript: && tsc -v"
   },
-  "author": "",
+  "author": "JeanOUINA",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "auto-launch": "^5.0.5",
     "custom-electron-titlebar": "^3.2.2-hotfix62",
+    "electron": "^8.4.0",
     "glasstron": "0.0.3",
     "mkdirp": "^1.0.4",
     "node-fetch": "^2.6.0",
@@ -40,7 +41,6 @@
     "@types/uuid": "^8.0.0",
     "@types/yauzl": "^2.9.1",
     "cross-spawn": "^7.0.3",
-    "electron": "^8.4.0",
     "terser": "^4.7.0",
     "typescript": "^3.9.7",
     "yazl": "^2.5.1"

src/splashScreen.ts

@@ -104,7 +104,7 @@ function launchSplashWindow(startMinimized = false) {
       nodeIntegration: true,
       enableRemoteModule: true
     },
-    icon: path.join(__dirname, "..", "discord.png")
+    icon: path.join(__dirname, "..", "modules", "discord_desktop_core", "core", "app", "images", "discord.png")
   };
 
   splashWindow = new electron.BrowserWindow(windowConfig);