From b202b133d9eb5286affc5c7bb4a721939b8c39a0 Mon Sep 17 00:00:00 2001 From: Outer Cloud Date: Wed, 10 Jul 2024 21:24:25 -0500 Subject: [PATCH] Fix compilation errors --- package-lock.json | 28 ++----------------- package.json | 4 +-- src/components/Data/TypeLoader.ts | 2 -- .../Extensions/Scripts/JsRuntime.ts | 2 +- src/main.ts | 2 +- 5 files changed, 7 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 483e38ab6..22356906b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,21 @@ { "name": "bridge", - "version": "2.7.24", + "version": "2.7.26", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bridge", - "version": "2.7.24", + "version": "2.7.26", "dependencies": { "@bridge-editor/dash-compiler": "^0.11.4", + "@bridge-editor/js-runtime": "^0.4.4", "@mdi/font": "^7.4.47", "@swc/wasm-web": "^1.6.7", "@tauri-apps/api": "^1.2.0", "@types/lz-string": "^1.3.34", "bridge-common-utils": "^0.3.3", "bridge-iframe-api": "^0.4.11", - "bridge-js-runtime": "^0.4.1", "bridge-model-viewer": "^0.7.7", "buffer": "^6.0.3", "color-convert": "^2.0.1", @@ -2536,28 +2536,6 @@ "resolved": "https://registry.npmjs.org/bridge-iframe-api/-/bridge-iframe-api-0.4.11.tgz", "integrity": "sha512-+gt/4+KkEhtg9vvWI99empq8jOukIAe9nUH9CVdFTXYj4ZLxIqjfBi0XdxyAFKWIapmQDCQA17Wx5d8bBuG4rw==" }, - "node_modules/bridge-js-runtime": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/bridge-js-runtime/-/bridge-js-runtime-0.4.1.tgz", - "integrity": "sha512-SAH7CXMdufqRrGrN3pJ+LBiGctQNTwamrLK+DiZCQKFMX4doESNvPbbfBTJlcqWB/rlpgL5hXI/NBGPm4nP3Jw==", - "dependencies": { - "@swc/wasm-web": "^1.2.218", - "json5": "^2.2.1", - "magic-string": "^0.26.2", - "path-browserify": "^1.0.1", - "vitest": "^0.15.2" - } - }, - "node_modules/bridge-js-runtime/node_modules/magic-string": { - "version": "0.26.2", - "license": "MIT", - "dependencies": { - "sourcemap-codec": "^1.4.8" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/bridge-model-viewer": { "version": "0.7.7", "license": "MIT", diff --git a/package.json b/package.json index 707c790ae..6dfde5d9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bridge", - "version": "2.7.25", + "version": "2.7.26", "private": true, "scripts": { "dev": "vite", @@ -13,13 +13,13 @@ }, "dependencies": { "@bridge-editor/dash-compiler": "^0.11.4", + "@bridge-editor/js-runtime": "^0.4.4", "@mdi/font": "^7.4.47", "@swc/wasm-web": "^1.6.7", "@tauri-apps/api": "^1.2.0", "@types/lz-string": "^1.3.34", "bridge-common-utils": "^0.3.3", "bridge-iframe-api": "^0.4.11", - "bridge-js-runtime": "^0.4.1", "bridge-model-viewer": "^0.7.7", "buffer": "^6.0.3", "color-convert": "^2.0.1", diff --git a/src/components/Data/TypeLoader.ts b/src/components/Data/TypeLoader.ts index 16a6eaf09..bf2f02438 100644 --- a/src/components/Data/TypeLoader.ts +++ b/src/components/Data/TypeLoader.ts @@ -190,8 +190,6 @@ export class TypeLoader { .filter((type) => type[0]) as [string, string?][] } - console.log(libDefinitions) - const libs = await this.load(libDefinitions) for (const [typePath, lib] of libs) { diff --git a/src/components/Extensions/Scripts/JsRuntime.ts b/src/components/Extensions/Scripts/JsRuntime.ts index d9abc8a4c..ad9bc44d9 100644 --- a/src/components/Extensions/Scripts/JsRuntime.ts +++ b/src/components/Extensions/Scripts/JsRuntime.ts @@ -1,4 +1,4 @@ -import { Runtime } from 'bridge-js-runtime' +import { Runtime } from '@bridge-editor/js-runtime' import { App } from '/@/App' import { dirname } from '/@/utils/path' diff --git a/src/main.ts b/src/main.ts index 59557d0dc..6fd247c16 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,7 +10,7 @@ import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker.js?worker import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker.js?worker' import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker.js?worker' import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker.js?worker' -import { initRuntimes } from 'bridge-js-runtime' +import { initRuntimes } from '@bridge-editor/js-runtime' import wasmUrl from '@swc/wasm-web/wasm_bg.wasm?url' import './main.css'