Skip to content

Commit 8fba20b

Browse files
author
Ives van Hoorne
committed
Fix vue sandboxes
1 parent f2c7965 commit 8fba20b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

packages/app/src/app/components/CodeEditor/Monaco/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
10531053
updateLintWarnings = async (markers: Array<Object>) => {
10541054
const currentModule = this.currentModule;
10551055

1056-
const mode = await getMode(currentModule.title);
1056+
const mode = await getMode(currentModule.title, this.monaco);
10571057
if (mode === 'javascript' || mode === 'vue') {
10581058
this.monaco.editor.setModelMarkers(
10591059
this.editor.getModel(),
@@ -1140,7 +1140,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
11401140
}
11411141

11421142
syntaxHighlight = async (code: string, title: string, version: string) => {
1143-
const mode = await getMode(title);
1143+
const mode = await getMode(title, this.monaco);
11441144
if (mode === 'typescript' || mode === 'javascript') {
11451145
if (this.syntaxWorker) {
11461146
this.syntaxWorker.postMessage({
@@ -1153,7 +1153,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
11531153
};
11541154

11551155
lint = async (code: string, title: string, version: number) => {
1156-
const mode = await getMode(title);
1156+
const mode = await getMode(title, this.monaco);
11571157
if (this.settings.lintEnabled) {
11581158
if (mode === 'javascript' || mode === 'vue') {
11591159
if (this.lintWorker) {
@@ -1337,7 +1337,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
13371337
// Related issue: https://github.com/Microsoft/monaco-editor/issues/461
13381338
const lib = this.addLib(module.code || '', path);
13391339

1340-
const mode = await getMode(module.title);
1340+
const mode = await getMode(module.title, this.monaco);
13411341

13421342
const model = this.monaco.editor.createModel(
13431343
module.code || '',

packages/app/src/app/components/CodeEditor/Monaco/mode.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const requireAMDModule = paths =>
1+
const requireAMDModule = (paths, monaco) =>
22
new Promise(resolve => window.require(paths, () => resolve()));
33
export default async (title: string) => {
44
if (title == null) return 'javascript';
@@ -11,7 +11,7 @@ export default async (title: string) => {
1111
if (kind[1] === 'json') return 'json';
1212
if (kind[1] === 'html') return 'html';
1313
if (kind[1] === 'vue') {
14-
if (!this.monaco.languages.getLanguages().find(l => l.id === 'vue')) {
14+
if (!monaco.languages.getLanguages().find(l => l.id === 'vue')) {
1515
await requireAMDModule(['vs/language/vue/monaco.contribution']);
1616
}
1717
return 'vue';

packages/app/src/app/components/CodeEditor/MonacoDiff/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default class MonacoDiff extends React.Component<Props>
5959
modifiedCode: string,
6060
title: string
6161
) => {
62-
const mode = await getMode(title);
62+
const mode = await getMode(title, this.monaco);
6363
const originalModel = this.monaco.editor.createModel(originalCode, mode);
6464
const modifiedModel = this.monaco.editor.createModel(modifiedCode, mode);
6565

0 commit comments

Comments
 (0)