Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

<script setup>
import { ref, watch, onMounted, onUnmounted } from 'vue'
import 'monaco-editor/min/vs/editor/editor.main.css'
import { useData } from 'vitepress'

const { isDark } = useData()
Expand Down
20 changes: 10 additions & 10 deletions .vitepress/theme/components/cds-playground/monaco.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@ import { shikiToMonaco } from '@shikijs/monaco'

// no correct top-level await in Safari
async function setupMonaco() {
const [monaco, editorWorker, tsWorker] = await Promise.all([
import('monaco-editor/esm/vs/editor/editor.api'),
import('monaco-editor/esm/vs/editor/editor.worker?worker'),
import('monaco-editor/esm/vs/language/typescript/ts.worker?worker'),
import('monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'),
import('monaco-editor/esm/vs/language/typescript/monaco.contribution'),
import('monaco-editor/esm/vs/language/json/monaco.contribution')
])
const monaco = await import('monaco-editor')

monaco.languages.register({ id: 'javascript' })
monaco.languages.register({ id: 'js' })
Expand All @@ -20,8 +13,15 @@ async function setupMonaco() {

self.MonacoEnvironment = {
getWorker(_, label) {
if (label === 'typescript' || label === 'javascript') return new tsWorker.default()
return new editorWorker.default()
const getWorkerModule = (moduleUrl, label) => {
return new Worker(self.MonacoEnvironment.getWorkerUrl(moduleUrl), {
name: label,
type: 'module'
});
};

if (label === 'typescript' || label === 'javascript') return getWorkerModule('/monaco-editor/esm/vs/language/typescript/ts.worker?worker', label)
return getWorkerModule('/monaco-editor/esm/vs/editor/editor.worker?worker', label);
}
}

Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading