no longer require server for local dev
This commit is contained in:
parent
feac661b68
commit
7170372976
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -12,8 +12,9 @@
|
||||||
"watch-css": "gulp watch-css",
|
"watch-css": "gulp watch-css",
|
||||||
"minify-css": "gulp minify-css",
|
"minify-css": "gulp minify-css",
|
||||||
"lint-css": "stylelint src/styles/*.css && stylelint src/styles/**/*.css && stylelint dist/style.css",
|
"lint-css": "stylelint src/styles/*.css && stylelint src/styles/**/*.css && stylelint dist/style.css",
|
||||||
|
"dist": "npm run minify",
|
||||||
"minify": "npm run build-prod && npm run minify-css",
|
"minify": "npm run build-prod && npm run minify-css",
|
||||||
"build-all": "npm run build-prod && npm run build-css && npm run minify-css",
|
"build-all": "npm run build && npm run build-prod && npm run build-css && npm run minify-css",
|
||||||
"lint": "npm run lint-js && npm run lint-css",
|
"lint": "npm run lint-js && npm run lint-css",
|
||||||
"test": "mocha --require @babel/register --recursive \"./tests/*.js\""
|
"test": "mocha --require @babel/register --recursive \"./tests/*.js\""
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
export default {
|
export default {
|
||||||
local: false,
|
local: false,
|
||||||
|
localPath: "",
|
||||||
localServer: "//localhost:8080",
|
localServer: "//localhost:8080",
|
||||||
minified: true,
|
minified: true,
|
||||||
version: "0.3.0",
|
version: "0.3.0",
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
import LocaleManager from "./localemanager";
|
import LocaleManager from "./localemanager";
|
||||||
|
|
||||||
import Logger from "./logger";
|
import Logger from "./logger";
|
||||||
|
@ -17,6 +20,7 @@ import ComponentPatcher from "./componentpatcher";
|
||||||
import Strings from "./strings";
|
import Strings from "./strings";
|
||||||
import LoadingIcon from "../loadingicon";
|
import LoadingIcon from "../loadingicon";
|
||||||
import Utilities from "./utilities";
|
import Utilities from "./utilities";
|
||||||
|
import { DOM } from "modules";
|
||||||
|
|
||||||
const {ipcRenderer} = require("electron");
|
const {ipcRenderer} = require("electron");
|
||||||
const GuildClasses = DiscordModules.GuildClasses;
|
const GuildClasses = DiscordModules.GuildClasses;
|
||||||
|
@ -44,7 +48,8 @@ export default class Core {
|
||||||
type: "style",
|
type: "style",
|
||||||
url: "//cdn.staticaly.com/gh/{{repo}}/BetterDiscordApp/{{hash}}/dist/style.min.css",
|
url: "//cdn.staticaly.com/gh/{{repo}}/BetterDiscordApp/{{hash}}/dist/style.min.css",
|
||||||
backup: "//rauenzi.github.io/BetterDiscordApp/dist/style.min.css",
|
backup: "//rauenzi.github.io/BetterDiscordApp/dist/style.min.css",
|
||||||
local: "{{localServer}}/BetterDiscordApp/dist/style.min.css"
|
local: "{{localServer}}/BetterDiscordApp/dist/style.min.css",
|
||||||
|
localPath: "style.min.css"
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -141,6 +146,13 @@ export default class Core {
|
||||||
|
|
||||||
async loadDependencies() {
|
async loadDependencies() {
|
||||||
for (const data of this.dependencies) {
|
for (const data of this.dependencies) {
|
||||||
|
if (Config.local && Config.localPath && data.localPath) {
|
||||||
|
if (fs.existsSync(path.resolve(Config.localPath, data.localPath))) {
|
||||||
|
const css = fs.readFileSync(path.resolve(Config.localPath, data.localPath)).toString();
|
||||||
|
DOMManager.injectStyle(data.name, css);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
const url = Utilities.formatString((Config.local && data.local != null) ? data.local : data.url, {repo: Config.repo, hash: Config.hash, 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})`);
|
Logger.log(`Startup`, `Loading Resource (${url})`);
|
||||||
const injector = (data.type == "script" ? DOMManager.injectScript : DOMManager.linkStyle).bind(DOMManager);
|
const injector = (data.type == "script" ? DOMManager.injectScript : DOMManager.linkStyle).bind(DOMManager);
|
||||||
|
|
Loading…
Reference in New Issue