Skip to content

Commit db4b045

Browse files
committed
feat: replace monaco-editor-core with monaco-editor
1 parent 5e828e2 commit db4b045

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@volar/monaco": "~1.9.2",
5959
"@volar/typescript": "~1.9.2",
6060
"@vue/language-service": "1.8.6",
61-
"monaco-editor": "^0.41.0",
61+
"monaco-editor": "0.41.0",
6262
"monaco-editor-textmate": "^4.0.0",
6363
"monaco-textmate": "^3.0.1",
6464
"monaco-volar": "^0.4.0",

packages/core/src/components/monaco-editor/env.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { jsDelivrUriBase } from '@volar/cdn';
22
import * as volar from '@volar/monaco';
3-
import { editor, languages, Uri } from 'monaco-editor-core';
3+
import { editor, languages, Uri } from 'monaco-editor';
44
import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
55
import * as onigasm from 'onigasm';
66
import onigasmWasm from 'onigasm/lib/onigasm.wasm?url';

packages/core/src/components/monaco-editor/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
watch,
1616
computed,
1717
} from 'vue';
18-
import * as monaco from 'monaco-editor-core';
18+
import * as monaco from 'monaco-editor';
1919
import { initMonaco } from './env';
2020
import { getOrCreateModel } from './utils';
2121
import { loadGrammars, loadTheme } from 'monaco-volar';
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Uri, editor } from 'monaco-editor-core'
1+
import { Uri, editor } from 'monaco-editor';
22

33
export function getOrCreateModel(
44
uri: Uri,
55
lang: string | undefined,
66
value: string
77
) {
8-
const model = editor.getModel(uri)
8+
const model = editor.getModel(uri);
99
if (model) {
10-
model.setValue(value)
11-
return model
10+
model.setValue(value);
11+
return model;
1212
}
13-
return editor.createModel(value, lang, uri)
13+
return editor.createModel(value, lang, uri);
1414
}

packages/core/src/components/monaco-editor/vue.worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-ignore
22
import * as worker from 'monaco-editor/esm/vs/editor/editor.worker';
3-
import type * as monaco from 'monaco-editor-core';
3+
import type * as monaco from 'monaco-editor';
44
import {
55
createJsDelivrFs,
66
createJsDelivrUriResolver,

packages/website/src/App.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
</template>
44

55
<script setup lang="ts">
6-
import CodePlayer, { CodePlayerOptions } from '../../core/src/index';
7-
// import CodePlayer, { CodePlayerOptions } from '../../core';
6+
// import CodePlayer, { CodePlayerOptions } from '../../core/src/index';
7+
import CodePlayer, { CodePlayerOptions } from '../../core';
88
99
const options: CodePlayerOptions = {
10-
appType: 'react',
10+
appType: 'vue3',
1111
};
1212
</script>
1313

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1791,7 +1791,7 @@ monaco-editor-textmate@^4.0.0:
17911791
resolved "https://registry.npmmirror.com/monaco-editor-textmate/-/monaco-editor-textmate-4.0.0.tgz#f85a8916989dac01791fff1f001e56fdb2907ab4"
17921792
integrity sha512-Clwup5LJzVfwURQrS+odSEC5/hZBEG36pQnvBKt4OtBndF8r2xLeXUZcK/AqEBK2u0Npy7frFp9hG7m66Ol9hA==
17931793

1794-
monaco-editor@^0.41.0:
1794+
monaco-editor@0.41.0, monaco-editor@^0.41.0:
17951795
version "0.41.0"
17961796
resolved "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.41.0.tgz#2ba31e5af7e3ae93ac5d7467ec2772ef9b3d967f"
17971797
integrity sha512-1o4olnZJsiLmv5pwLEAmzHTE/5geLKQ07BrGxlF4Ri/AXAc2yyDGZwHjiTqD8D/ROKUZmwMA28A+yEowLNOEcA==

0 commit comments

Comments
 (0)