[v2.3.3] Merge pull request #607 from bridge-core/dev

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Debug in Edge",
+			"type": "msedge",
+			"request": "launch",
+			"url": "http://localhost:8080",
+			"webRoot": "${workspaceFolder}"
+		},
+		{
+			"name": "Debug in Chrome",
+			"type": "chrome",
+			"request": "launch",
+			"url": "http://localhost:8080",
+			"webRoot": "${workspaceFolder}"
+		}
+	]
+}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bridge",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"private": true,
 	"scripts": {
 		"dev": "vite",
@@ -23,7 +23,7 @@
 		"comlink": "^4.3.0",
 		"compare-versions": "^3.6.0",
 		"core-js": "^3.6.5",
-		"dash-compiler": "^0.9.28",
+		"dash-compiler": "^0.9.29",
 		"escape-string-regexp": "^5.0.0",
 		"fflate": "^0.6.7",
 		"idb-keyval": "^5.1.3",

src/App.ts

@@ -319,6 +319,8 @@ export class App {
 
 	public readonly bridgeFolderSetup = new Signal<void>()
 	async setupBridgeFolder(forceReselect = false) {
+		if (!forceReselect && this.bridgeFolderSetup.hasFired) return true
+
 		let fileHandle = await get<AnyDirectoryHandle | undefined>(
 			'bridgeBaseDir'
 		)

src/components/Data/JSONDefaults.ts

@@ -10,6 +10,7 @@ import { AnyFileHandle } from '../FileSystem/Types'
 import { Tab } from '../TabSystem/CommonTab'
 import { ComponentSchemas } from '../Compiler/Worker/Plugins/CustomComponent/ComponentSchemas'
 import { loadMonaco, useMonaco } from '../../utils/libs/useMonaco'
+import { Task } from '../TaskManager/Task'
 
 let globalSchemas: Record<string, IMonacoSchemaArrayEntry> = {}
 let loadedGlobalSchemas = false
@@ -19,6 +20,7 @@ export class JsonDefaults extends EventDispatcher<void> {
 	protected localSchemas: Record<string, IMonacoSchemaArrayEntry> = {}
 	protected disposables: IDisposable[] = []
 	public readonly componentSchemas = new ComponentSchemas()
+	protected task: Task | null = null
 
 	constructor(protected project: Project) {
 		super()
@@ -60,22 +62,24 @@ export class JsonDefaults extends EventDispatcher<void> {
 		this.disposables.forEach((disposable) => disposable.dispose())
 		this.componentSchemas.dispose()
 		this.disposables = []
+		this.task?.complete()
+		this.task = null
 	}
 
 	async loadAllSchemas() {
 		this.localSchemas = {}
 		const app = await App.getApp()
-		const task = app.taskManager.create({
+		this.task = app.taskManager.create({
 			icon: 'mdi-book-open-outline',
 			name: 'taskManager.tasks.loadingSchemas.name',
 			description: 'taskManager.tasks.loadingSchemas.description',
 			totalTaskSteps: 10,
 		})
 
 		await app.dataLoader.fired
-		task.update(1)
+		this.task?.update(1)
 		const packages = await app.dataLoader.readdir('data/packages')
-		task.update(2)
+		this.task?.update(2)
 
 		// Static schemas
 		for (const packageName of packages) {
@@ -92,11 +96,11 @@ export class JsonDefaults extends EventDispatcher<void> {
 			}
 		}
 		loadedGlobalSchemas = true
-		task.update(3)
+		this.task?.update(3)
 
 		// Schema scripts
 		await this.runSchemaScripts(app)
-		task.update(5)
+		this.task?.update(5)
 		const tab = this.project.tabSystem?.selectedTab
 		if (tab && tab instanceof FileTab) {
 			const fileType = App.fileType.getId(tab.getPath())
@@ -111,11 +115,11 @@ export class JsonDefaults extends EventDispatcher<void> {
 
 		// Schemas generated from lightning cache
 		this.addSchemas(await this.getDynamicSchemas())
-		task.update(4)
+		this.task?.update(4)
 
 		this.loadedSchemas = true
-		task.update(6)
-		task.complete()
+		this.task?.update(6)
+		this.task?.complete()
 	}
 
 	async setJSONDefaults(validate = true) {

src/components/Data/TypeLoader.ts

@@ -111,7 +111,13 @@ export class TypeLoader {
 		const app = await App.getApp()
 
 		await app.project.packIndexer.fired
-		const allFiles = await app.project.packIndexer.service.getAllFiles()
+		let allFiles
+		try {
+			allFiles = await app.project.packIndexer.service.getAllFiles()
+		} catch {
+			// We failed to access the pack indexer service -> fail silently
+			return
+		}
 
 		const typeScriptFiles = allFiles.filter(
 			(filePath) => filePath.endsWith('.ts') || filePath.endsWith('.js')