modern-monaco 0.3.0 → 0.3.2

package/dist/core.mjs

@@ -40,7 +40,7 @@ function isObject(v) {
 }
 
 // package.json
-var version = "0.3.0";
+var version = "0.3.2";
 
 // src/core.ts
 import { getExtnameFromLanguageId, getLanguageIdFromPath, grammars, initShiki, setDefaultWasmLoader, themes } from "./shiki.mjs";
@@ -48,8 +48,7 @@ import { initShikiMonacoTokenizer, registerShikiMonacoTokenizer } from "./shiki.
 import { render } from "./shiki.mjs";
 import { getWasmInstance } from "./shiki-wasm.mjs";
 import { NotFoundError, Workspace } from "./workspace.mjs";
-import { debunce, decode, getCDNUrl, isDigital } from "./util.mjs";
-import { init as initLspClient } from "./lsp/client.mjs";
+import { debunce, decode, isDigital } from "./util.mjs";
 var editorProps = [
   "autoDetectHighContrast",
   "automaticLayout",
@@ -91,7 +90,7 @@ var setStyle = (el, style) => Object.assign(el.style, style);
 async function init(options) {
   const langs = (options?.langs ?? []).concat(syntaxes);
   const shiki = await initShiki({ ...options, langs });
-  return loadMonaco(shiki, options?.workspace, options?.lsp, options?.cdn);
+  return loadMonaco(shiki, options?.workspace, options?.lsp);
 }
 function lazy(options) {
   if (!customElements.get("monaco-editor")) {
@@ -254,7 +253,7 @@ function lazy(options) {
             }
           }
           {
-            const monaco = await (monacoPromise ?? (monacoPromise = loadMonaco(highlighter, workspace, options?.lsp, options?.cdn)));
+            const monaco = await (monacoPromise ?? (monacoPromise = loadMonaco(highlighter, workspace, options?.lsp)));
             const editor = monaco.editor.create(containerEl, renderOptions);
             if (workspace) {
               const storeViewState = () => {
@@ -328,9 +327,10 @@ function lazy(options) {
 function hydrate(options) {
   return lazy(options);
 }
-async function loadMonaco(highlighter, workspace, lsp, cdn) {
-  let editorCoreModuleUrl = getCDNUrl(`/modern-monaco@${version}/dist/editor-core.mjs`, cdn);
-  let lspModuleUrl = getCDNUrl(`/modern-monaco@${version}/dist/lsp/index.mjs`, cdn);
+async function loadMonaco(highlighter, workspace, lsp) {
+  let cdnUrl = `https://esm.sh/modern-monaco@${version}`;
+  let editorCoreModuleUrl = `${cdnUrl}/es2022/editor-core.mjs`;
+  let lspModuleUrl = `${cdnUrl}/es2022/lsp.mjs`;
   let importmapEl = null;
   if (importmapEl = document.querySelector("script[type='importmap']")) {
     try {
@@ -351,9 +351,6 @@ async function loadMonaco(highlighter, workspace, lsp, cdn) {
   ]);
   const allLspProviders = { ...builtinLSPProviders, ...lspProviders, ...lsp?.providers };
   workspace?.setupMonaco(monaco);
-  if (Object.keys(allLspProviders).length > 0) {
-    initLspClient(monaco);
-  }
   if (!document.getElementById("monaco-editor-core-css")) {
     const styleEl = document.createElement("style");
     styleEl.id = "monaco-editor-core-css";

package/dist/index.mjs

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/tm-themes@1.10.12/node_modules/tm-themes/themes/vitesse-dark.json
+// node_modules/.pnpm/tm-themes@1.10.13/node_modules/tm-themes/themes/vitesse-dark.json
 var vitesse_dark_default = {
   colors: {
     "activityBar.activeBorder": "#4d9375",
@@ -693,7 +693,7 @@ var vitesse_dark_default = {
   type: "dark"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/html.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/html.json
 var html_default = {
   displayName: "HTML",
   injections: {
@@ -3322,7 +3322,7 @@ var html_default = {
   scopeName: "text.html.basic"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/css.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/css.json
 var css_default = {
   displayName: "CSS",
   name: "css",
@@ -5184,7 +5184,7 @@ var css_default = {
   scopeName: "source.css"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/javascript.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/javascript.json
 var javascript_default = {
   displayName: "JavaScript",
   name: "javascript",
@@ -11182,7 +11182,7 @@ var javascript_default = {
   scopeName: "source.js"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/typescript.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/typescript.json
 var typescript_default = {
   displayName: "TypeScript",
   name: "typescript",
@@ -16931,7 +16931,7 @@ var typescript_default = {
   scopeName: "source.ts"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/jsx.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/jsx.json
 var jsx_default = {
   displayName: "JSX",
   name: "jsx",
@@ -22929,7 +22929,7 @@ var jsx_default = {
   scopeName: "source.js.jsx"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/tsx.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/tsx.json
 var tsx_default = {
   displayName: "TSX",
   name: "tsx",
@@ -28927,7 +28927,7 @@ var tsx_default = {
   scopeName: "source.tsx"
 };
 
-// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/json.json
+// node_modules/.pnpm/tm-grammars@1.26.0/node_modules/tm-grammars/grammars/json.json
 var json_default = {
   displayName: "JSON",
   name: "json",

package/dist/lsp/css/setup.mjs

@@ -24,6 +24,7 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
     worker: getWorker(createData),
     host: client.createHost(workspace)
   });
+  client.init(monaco);
   client.registerBasicFeatures(languageId, worker, ["/", "-", ":", "("], workspace);
   client.registerCodeAction(languageId, worker);
   client.registerColorPresentation(languageId, worker);

package/dist/lsp/html/setup.mjs

@@ -33,6 +33,7 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
     host: client.createHost(workspace)
   });
   const workerWithEmbeddedLanguages = client.createWorkerWithEmbeddedLanguages(htmlWorker);
+  client.init(monaco);
   client.registerEmbedded(languageId, workerWithEmbeddedLanguages, ["css", "javascript", "importmap"]);
   client.registerBasicFeatures(languageId, workerWithEmbeddedLanguages, ["<", "/", "=", '"'], workspace);
   client.registerAutoComplete(languageId, workerWithEmbeddedLanguages, [">", "/", "="]);

package/dist/lsp/json/setup.mjs

@@ -151,6 +151,7 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
       resetSchema(event.model.uri);
     }
   });
+  client.init(monaco);
   client.registerBasicFeatures(languageId, worker, [" ", ":", '"'], workspace);
   client.registerColorPresentation(languageId, worker);
   client.registerDocumentLinks(languageId, worker);

package/dist/lsp/typescript/setup.mjs

@@ -104,6 +104,7 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
   if (worker instanceof Promise) {
     worker = await worker;
   }
+  client.init(monaco);
   client.registerBasicFeatures(languageId, worker, [".", "/", '"', "'", "<"], workspace);
   client.registerAutoComplete(languageId, worker, [">", "/"]);
   client.registerSignatureHelp(languageId, worker, ["(", ","]);