[v1.7.14] Merge pull request #291 from bridge-core/dev

bridge-core · Nov 14, 2020 · 306e4d7 · 306e4d7
2 parents 9be50cb + 853cfab
commit 306e4d7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/app/renderer/src/plugins/CustomComponents.ts b/app/renderer/src/plugins/CustomComponents.ts
@@ -71,9 +71,6 @@ export default class ComponentRegistry {
 
 		this.registerUpdates.clear()
 	}
-	static async reset() {
-		this.components = {}
-	}
 
 	static set(
 		MASK: JSONMask,

diff --git a/app/renderer/src/plugins/Disposables.ts b/app/renderer/src/plugins/Disposables.ts
@@ -8,11 +8,13 @@ export function set(pluginId: string, disposables: IDisposable[]) {
 }
 
 export function clearAll() {
-	DisposableStore.forEach(disposables => {
+	DisposableStore.forEach((disposables, pluginId) => {
 		disposables.forEach(disposable => disposable.dispose())
+		DisposableStore.delete(pluginId)
 	})
 }
 
 export function clear(pluginId: string) {
 	DisposableStore.get(pluginId)?.forEach(disposable => disposable.dispose())
+	DisposableStore.delete(pluginId)
 }
diff --git a/app/renderer/src/plugins/PluginLoader.ts b/app/renderer/src/plugins/PluginLoader.ts
@@ -68,8 +68,6 @@ export default class PluginLoader {
 		Store.commit('unloadPlugins')
 		clearAllDisposables()
 
-		CommandRegistry.clear()
-		ComponentRegistry.reset()
 		resetLoadLocations()
 	}
 
@@ -136,18 +134,23 @@ export default class PluginLoader {
 			)
 		)
 
+		const globalDisposables: IDisposable[] = []
 		await Promise.all([
 			//LOAD CORRECT THEME
 			ThemeManager.loadTheme(),
 
 			//LOAD CUSTOM COMPONENENTS IN PROJECT
 			this.loadComponents(
 				path.join(CURRENT.PROJECT_PATH, 'components'),
-				[]
+				globalDisposables
 			),
 			//LOAD CUSTOM COMMANDS IN PROJECT
-			loadCustomCommands(path.join(CURRENT.PROJECT_PATH, 'commands'), []),
+			loadCustomCommands(
+				path.join(CURRENT.PROJECT_PATH, 'commands'),
+				globalDisposables
+			),
 		])
+		setDisposables('bridge.core', globalDisposables)
 
 		//Update files using custom commands/components
 		await ComponentRegistry.updateFiles(getCommandFiles())

diff --git a/app/shared/app_version.ts b/app/shared/app_version.ts
@@ -1,4 +1,4 @@
 /**
  * Current bridge. app version
  */
-export default 'v1.7.13'
+export default 'v1.7.14'
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "author": "solvedDev <[email protected]>",
   "description": "A powerful add-on editor",
   "license": "GNU",