diff --git a/data/emotes/blacklist.json b/assets/emotes/blacklist.json similarity index 100% rename from data/emotes/blacklist.json rename to assets/emotes/blacklist.json diff --git a/data/emotes/bttv.json b/assets/emotes/bttv.json similarity index 100% rename from data/emotes/bttv.json rename to assets/emotes/bttv.json diff --git a/data/emotes/frankerfacez.json b/assets/emotes/frankerfacez.json similarity index 100% rename from data/emotes/frankerfacez.json rename to assets/emotes/frankerfacez.json diff --git a/data/emotes/twitchglobal.json b/assets/emotes/twitchglobal.json similarity index 100% rename from data/emotes/twitchglobal.json rename to assets/emotes/twitchglobal.json diff --git a/data/emotes/twitchsubscriber.json b/assets/emotes/twitchsubscriber.json similarity index 100% rename from data/emotes/twitchsubscriber.json rename to assets/emotes/twitchsubscriber.json diff --git a/data/locales/en.json b/assets/locales/en.json similarity index 100% rename from data/locales/en.json rename to assets/locales/en.json diff --git a/data/locales/ja.json b/assets/locales/ja.json similarity index 100% rename from data/locales/ja.json rename to assets/locales/ja.json diff --git a/data/locales/sv.json b/assets/locales/sv.json similarity index 100% rename from data/locales/sv.json rename to assets/locales/sv.json diff --git a/data/updater.json b/data/updater.json deleted file mode 100644 index d1303021..00000000 --- a/data/updater.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "injectorVersion": "0.3.2" -} \ No newline at end of file diff --git a/js/main.js b/dist/index.js similarity index 100% rename from js/main.js rename to dist/index.js diff --git a/js/main.min.js b/dist/index.min.js similarity index 100% rename from js/main.min.js rename to dist/index.min.js diff --git a/css/main.min.css b/dist/style.css similarity index 100% rename from css/main.min.css rename to dist/style.css diff --git a/gulpfile.js b/gulpfile.js index 70d7b2f2..e785ad72 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,12 +5,12 @@ const csso = require("gulp-csso"); gulp.task("minify-css", minifyCSS); gulp.task("watch-css", function() { - return gulp.watch(["./css/main.css"], minifyCSS); + return gulp.watch(["./src/styles/index.css"], minifyCSS); }); function minifyCSS() { - return gulp.src("./css/main.css") + return gulp.src("./src/styles/index.css") .pipe(csso({restructure: false})) - .pipe(rename("main.min.css")) - .pipe(gulp.dest("./css")); + .pipe(rename("style.min.css")) + .pipe(gulp.dest("./dist")); } \ No newline at end of file diff --git a/package.json b/package.json index 27d510d2..e0918166 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "bandagedbd", - "version": "0.2.3", + "version": "1.0.0", "description": "Enhances Discord adding functionality and themes.", "main": "js/main.js", "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 dist/index.min.js --devtool none", "test": "echo \"Error: no test specified\" && exit 1", "minify": "npm run build-prod && npm run minify-css", "minify-css": "gulp minify-css", diff --git a/src/modules/core.js b/src/modules/core.js index d94cff38..c53f4515 100644 --- a/src/modules/core.js +++ b/src/modules/core.js @@ -42,9 +42,9 @@ export default new class Core { { name: "bd-stylesheet", type: "style", - url: "//cdn.staticaly.com/gh/{{repo}}/BetterDiscordApp/{{hash}}/css/main{{minified}}.css", - backup: "//rauenzi.github.io/BetterDiscordApp/css/main{{minified}}.css", - local: "{{localServer}}/BetterDiscordApp/css/main.css" + url: "//cdn.staticaly.com/gh/{{repo}}/BetterDiscordApp/{{hash}}/dist/style.css", + backup: "//rauenzi.github.io/BetterDiscordApp/dist/style.css", + local: "{{localServer}}/BetterDiscordApp/dist/style.css" } ]; } @@ -141,7 +141,7 @@ export default new class Core { async loadDependencies() { for (const data of this.dependencies) { - const url = Utilities.formatString((Config.local && data.local != null) ? data.local : data.url, {repo: Config.repo, hash: Config.hash, minified: Config.minified ? ".min" : "", localServer: Config.localServer}); + const url = Utilities.formatString((Config.local && data.local != null) ? data.local : data.url, {repo: Config.repo, hash: Config.hash, localServer: Config.localServer}); Logger.log(`Startup`, `Loading Resource (${url})`); const injector = (data.type == "script" ? DOMManager.injectScript : DOMManager.linkStyle).bind(DOMManager); try { diff --git a/css/main.css b/src/styles/index.css similarity index 100% rename from css/main.css rename to src/styles/index.css diff --git a/webpack.config.js b/webpack.config.js index f93d46cd..5fbff39d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -7,8 +7,8 @@ module.exports = { devtool: "eval-source-map", entry: "./src/index.js", output: { - filename: "main.js", - path: path.resolve(__dirname, "js"), + filename: "index.js", + path: path.resolve(__dirname, "dist"), library: "Core", libraryTarget: "var", libraryExport: "default"