Merge branch 'dev' into immediate-finds
This commit is contained in:
commit
a1881bff3d
|
@ -129,7 +129,7 @@ export const SettingsStore = new SettingsStoreClass(settings, {
|
||||||
|
|
||||||
if (path === "plugins" && key in plugins)
|
if (path === "plugins" && key in plugins)
|
||||||
return target[key] = {
|
return target[key] = {
|
||||||
enabled: plugins[key].required ?? plugins[key].enabledByDefault ?? false
|
enabled: IS_REPORTER ?? plugins[key].required ?? plugins[key].enabledByDefault ?? false
|
||||||
};
|
};
|
||||||
|
|
||||||
// Since the property is not set, check if this is a plugin's setting and if so, try to resolve
|
// Since the property is not set, check if this is a plugin's setting and if so, try to resolve
|
||||||
|
|
|
@ -11,7 +11,6 @@ import { patches } from "plugins";
|
||||||
|
|
||||||
import { loadLazyChunks } from "./loadLazyChunks";
|
import { loadLazyChunks } from "./loadLazyChunks";
|
||||||
|
|
||||||
|
|
||||||
const ReporterLogger = new Logger("Reporter");
|
const ReporterLogger = new Logger("Reporter");
|
||||||
|
|
||||||
async function runReporter() {
|
async function runReporter() {
|
||||||
|
@ -21,7 +20,7 @@ async function runReporter() {
|
||||||
let loadLazyChunksResolve: (value: void | PromiseLike<void>) => void;
|
let loadLazyChunksResolve: (value: void | PromiseLike<void>) => void;
|
||||||
const loadLazyChunksDone = new Promise<void>(r => loadLazyChunksResolve = r);
|
const loadLazyChunksDone = new Promise<void>(r => loadLazyChunksResolve = r);
|
||||||
|
|
||||||
Webpack.beforeInitListeners.add(() => loadLazyChunks().then(() => loadLazyChunksResolve()));
|
Webpack.beforeInitListeners.add(() => loadLazyChunks().then((loadLazyChunksResolve)));
|
||||||
await loadLazyChunksDone;
|
await loadLazyChunksDone;
|
||||||
|
|
||||||
for (const patch of patches) {
|
for (const patch of patches) {
|
||||||
|
|
|
@ -44,7 +44,6 @@ const settings = Settings.plugins;
|
||||||
|
|
||||||
export function isPluginEnabled(p: string) {
|
export function isPluginEnabled(p: string) {
|
||||||
return (
|
return (
|
||||||
IS_REPORTER ||
|
|
||||||
Plugins[p]?.required ||
|
Plugins[p]?.required ||
|
||||||
Plugins[p]?.isDependency ||
|
Plugins[p]?.isDependency ||
|
||||||
settings[p]?.enabled
|
settings[p]?.enabled
|
||||||
|
|
Loading…
Reference in a new issue