Make getMode return undefined as default instead of 'typescript' (codesandbox#2007)

* Make getMode return undefined as default instead of 'typescript'

* Fix window typing

* Remove unnecessary extension from import path

Author: CompuIves

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

@@ -319,7 +319,7 @@ class CodemirrorEditor extends React.Component<Props, State> implements Editor {
     const currentModule = this.currentModule;
 
     if (!documentCache[currentModule.id]) {
-      const mode = await this.getMode(currentModule.title);
+      const mode = (await this.getMode(currentModule.title)) || 'typescript';
 
       documentCache[currentModule.id] = new CodeMirror.Doc(
         currentModule.code || '',
@@ -421,7 +421,7 @@ class CodemirrorEditor extends React.Component<Props, State> implements Editor {
       CodeMirror.commands.save = this.handleSaveCode;
     }
 
-    const mode = await this.getMode(title);
+    const mode = (await this.getMode(title)) || 'typescript';
 
     documentCache[id] = new CodeMirror.Doc(code || '', mode);
 
@@ -452,7 +452,7 @@ class CodemirrorEditor extends React.Component<Props, State> implements Editor {
 
   configureEmmet = async () => {
     const { title } = this.currentModule;
-    const mode = await this.getMode(title);
+    const mode = (await this.getMode(title)) || 'typescript';
 
     const newMode = mode === 'htmlmixed' ? 'html' : mode;
     const addon = newMode === 'jsx' ? { jsx: true } : null;

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

@@ -1023,7 +1023,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
   }
 
   lint = async (code: string, title: string, version: number) => {
-    const mode = await getMode(title, this.monaco);
+    const mode = (await getMode(title, this.monaco)) || 'typescript';
     if (this.settings.lintEnabled) {
       if (mode === 'javascript' || mode === 'vue') {
         if (this.lintWorker) {
@@ -1219,7 +1219,8 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
           // Related issue: https://github.com/Microsoft/monaco-editor/issues/461
           const lib = this.addLib(module.code || '', path);
 
-          const mode = await getMode(module.title, this.monaco);
+          const mode =
+            (await getMode(module.title, this.monaco)) || 'typescript';
 
           if (
             mode !== 'javascript' &&

…app/components/CodeEditor/Monaco/mode.js …app/components/CodeEditor/Monaco/mode.tspackages/app/src/app/components/CodeEditor/Monaco/mode.js renamed to packages/app/src/app/components/CodeEditor/Monaco/mode.ts packages/app/src/app/components/CodeEditor/Monaco/mode.js renamed to packages/app/src/app/components/CodeEditor/Monaco/mode.ts

@@ -1,5 +1,5 @@
 const requireAMDModule = paths =>
-  new Promise(resolve => window.require(paths, () => resolve()));
+  new Promise(resolve => (window as any).require(paths, () => resolve()));
 
 export default async (title: string, monaco) => {
   if (title == null) return 'javascript';
@@ -11,6 +11,7 @@ export default async (title: string, monaco) => {
     if (kind[1] === 'scss') return 'scss';
     if (kind[1] === 'json') return 'json';
     if (kind[1] === 'html') return 'html';
+    if (kind[1] === 'svelte') return 'html';
     if (kind[1] === 'vue') {
       if (
         monaco.languages.getLanguages &&
@@ -26,5 +27,5 @@ export default async (title: string, monaco) => {
     if (/tsx?$/.test(kind[1])) return 'typescript';
   }
 
-  return 'typescript';
+  return undefined;
 };

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

@@ -59,7 +59,7 @@ export default class MonacoDiff extends React.Component<Props>
     modifiedCode: string,
     title: string
   ) => {
-    const mode = await getMode(title, this.monaco);
+    const mode = (await getMode(title, this.monaco)) || 'typescript';
     const originalModel = this.monaco.editor.createModel(originalCode, mode);
     const modifiedModel = this.monaco.editor.createModel(modifiedCode, mode);