Fix packed plugins
This commit is contained in:
parent
47575d3449
commit
82e9b0bd6a
|
@ -84,15 +84,10 @@ export default class PackageInstaller {
|
||||||
|
|
||||||
await oldContent.unload(true);
|
await oldContent.unload(true);
|
||||||
|
|
||||||
if (oldContent.packed && oldContent.packed.packageName !== nameOrId) {
|
if (oldContent.packed && oldContent.packageName !== nameOrId) {
|
||||||
rimraf(oldContent.packed.packagePath, err => {
|
await FileUtils.deleteFile(oldContent.packagePath).catch(err => null);
|
||||||
if (err) throw err;
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
rimraf(oldContent.contentPath, err => {
|
|
||||||
if (err) throw err;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
await FileUtils.recursiveDeleteDirectory(oldContent.contentPath).catch(err => null);
|
||||||
|
|
||||||
return manager.preloadPackedContent(outputName);
|
return manager.preloadPackedContent(outputName);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
|
@ -109,21 +109,9 @@ export default class extends ContentManager {
|
||||||
throw {message: `Plugin ${info.name} did not return a class that extends Plugin.`};
|
throw {message: `Plugin ${info.name} did not return a class that extends Plugin.`};
|
||||||
|
|
||||||
const instance = new plugin({
|
const instance = new plugin({
|
||||||
configs, info, main,
|
configs, info, main, paths
|
||||||
paths: {
|
|
||||||
contentPath: paths.contentPath,
|
|
||||||
dirName: packed ? packed.packageName : paths.dirName,
|
|
||||||
mainPath: paths.mainPath
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (packed) instance.packed = {
|
|
||||||
pkg: packed.pkg,
|
|
||||||
packageName: packed.packageName,
|
|
||||||
packagePath: packed.packagePath,
|
|
||||||
packed: true
|
|
||||||
}; else instance.packed = false;
|
|
||||||
|
|
||||||
if (instance.enabled && this.loaded) {
|
if (instance.enabled && this.loaded) {
|
||||||
instance.userConfig.enabled = false;
|
instance.userConfig.enabled = false;
|
||||||
instance.start(false);
|
instance.start(false);
|
||||||
|
|
|
@ -36,12 +36,7 @@ export default class ThemeManager extends ContentManager {
|
||||||
static async loadTheme(paths, configs, info, main) {
|
static async loadTheme(paths, configs, info, main) {
|
||||||
try {
|
try {
|
||||||
const instance = new Theme({
|
const instance = new Theme({
|
||||||
configs, info, main,
|
configs, info, main, paths
|
||||||
paths: {
|
|
||||||
contentPath: paths.contentPath,
|
|
||||||
dirName: paths.dirName,
|
|
||||||
mainPath: paths.mainPath
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
if (instance.enabled) {
|
if (instance.enabled) {
|
||||||
instance.userConfig.enabled = false;
|
instance.userConfig.enabled = false;
|
||||||
|
|
Loading…
Reference in New Issue