fix loadExternalFeatures

packages/ui-default/components/monaco/loader.ts

@@ -91,6 +91,7 @@ export async function load(features = ['markdown']) {
     console.log('Loaded monaco editor in', Date.now() - s, 'ms');
     loaded = [];
   }
+  Object.assign((window as any).HydroExports, { vscode: res.vscode, monaco: res.default });
   for (const feat of features) {
     if (loaded.includes(feat)) continue;
     if (!loaders[feat]) {
@@ -104,7 +105,7 @@ export async function load(features = ['markdown']) {
     console.log('Loading monaco feature:', feat);
     try {
       if (loaders[feat]) await loaders[feat]();
-      else await loaders.external(res.default, feat);
+      await loaders.external(res.default, feat);
       console.log('Loaded monaco feature:', feat, 'in', Date.now() - s, 'ms');
       loaded.push(feat);
     } catch (e) {

packages/ui-default/components/monaco/monaco.ts

@@ -8,10 +8,12 @@ import {
 } from '@codingame/monaco-editor-wrapper';
 import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
 import * as monaco from 'monaco-editor';
-import { Uri } from 'vscode';
+import * as vscode from 'vscode';
 
 export default monaco;
-export { createEditor, registerFile, RegisteredMemoryFile };
+export {
+  createEditor, registerFile, RegisteredMemoryFile, vscode,
+};
 export {
   getUserConfiguration, getConfiguration,
   onUserConfigurationChange, onConfigurationChanged,
@@ -46,7 +48,7 @@ export const init = async (workbench = false) => {
     workspaceProvider: {
       trusted: true,
       workspace: {
-        workspaceUri: Uri.file('/'),
+        workspaceUri: vscode.Uri.file('/'),
       },
       async open() {
         return false;

packages/ui-default/components/scratchpad/ScratchpadEditorContainer.tsx

@@ -42,7 +42,7 @@ export default connect((state: any) => ({
     const value = this.props.value || '';
     const { language } = this.props;
     const { monaco, createEditor } = await load([language]);
-    const uri = monaco.Uri.parse(`/${UiContext.pdoc.pid || UiContext.pdoc.docId}.${language}`);
+    const uri = monaco.Uri.parse(`hydro:${UiContext.pdoc.pid || UiContext.pdoc.docId}.${language}`);
     this.model = monaco.editor.getModel(uri) || monaco.editor.createModel(value, language, uri);
     if (this.containerElement) {
       const config: monaco.editor.IStandaloneEditorConstructionOptions = {
@@ -95,7 +95,7 @@ export default connect((state: any) => ({
     if (model && editor && prevProps.language !== language) {
       const val = model.getValue(LF, false);
       model.dispose();
-      const uri = monaco.Uri.parse(`file:///${UiContext.pdoc.pid || UiContext.pdoc.docId}.${language}`);
+      const uri = monaco.Uri.parse(`hydro:${UiContext.pdoc.pid || UiContext.pdoc.docId}.${language}`);
       this.model = monaco.editor.getModel(uri) || monaco.editor.createModel(val, language, uri);
       editor.setModel(this.model);
     }