more refactor

Author: christianalfoni

…/app/overmind/effects/vscode/fs/index.ts …ermind/effects/vscode/browserFs/index.tspackages/app/src/app/overmind/effects/vscode/fs/index.ts renamed to packages/app/src/app/overmind/effects/vscode/browserFs/index.ts packages/app/src/app/overmind/effects/vscode/fs/index.ts renamed to packages/app/src/app/overmind/effects/vscode/browserFs/index.ts

@@ -1,17 +1,18 @@
-import { css } from 'glamor';
-import { TextOperation } from 'ot';
-import { actions, dispatch } from 'codesandbox-api';
 import {
+  getModulePath,
+  resolveModule,
+} from '@codesandbox/common/lib/sandbox/modules';
+import {
+  EditorSelection,
   Module,
   Sandbox,
   UserSelection,
-  EditorSelection,
 } from '@codesandbox/common/lib/types';
-import {
-  resolveModule,
-  getModulePath,
-} from '@codesandbox/common/lib/sandbox/modules';
 import { indexToLineAndColumn } from 'app/overmind/utils/common';
+import { actions, dispatch } from 'codesandbox-api';
+import { css } from 'glamor';
+import { TextOperation } from 'ot';
+
 import { getModel } from './utils';
 
 // @ts-ignore

packages/app/src/app/overmind/effects/vscode/editorManager/FilesSync.ts

@@ -7,10 +7,11 @@ import {
 } from '@codesandbox/common/lib/types';
 import { Reaction } from 'app/overmind';
 import FontFaceObserver from 'fontfaceobserver';
+import * as childProcess from 'node-services/lib/child_process';
 
+import browserFs from './browserFs';
 import { VSCodeEditorManager } from './editorManager';
 import { OnFileChangeData } from './editorManager/FilesSync';
-import fs from './fs';
 import { ICustomEditorApi, VSCodeManager } from './manager';
 
 export type VsCodeOptions = {
@@ -79,9 +80,26 @@ class VSCodeEffect {
       this.customEditorApi.getCustomEditor(modulePath)
     );
 
+    import(
+      // @ts-ignore
+      'worker-loader?publicPath=/&name=ext-host-worker.[hash:8].worker.js!./manager/extensionHostWorker/bootstrappers/ext-host'
+    ).then(ExtHostWorkerLoader => {
+      childProcess.addDefaultForkHandler(ExtHostWorkerLoader.default);
+    });
+
+    const loadingScriptStart = performance.now();
+
+    this.manager.loadScript(['vs/editor/codesandbox.editor.main']).then(() => {
+      console.log('LOADING SCRIPT', performance.now() - loadingScriptStart);
+    });
+
+    if (process.env.NODE_ENV === 'development') {
+      console.log('Loaded Monaco'); // eslint-disable-line
+    }
+
     // It will only load the editor once. We should probably call this
     const container = this.elements.editor;
-    this.editorPromise = fs
+    this.editorPromise = browserFs
       .initialize({
         onModulesByPathChange(cb) {
           options.reaction(

packages/app/src/app/overmind/effects/vscode/index.ts

@@ -4,7 +4,6 @@ import {
 } from '@codesandbox/common/lib/utils/notifications';
 import { NotificationMessage } from '@codesandbox/notifications/lib/state';
 import { Blocker, blocker } from 'app/utils/blocker';
-import * as childProcess from 'node-services/lib/child_process';
 
 import bootstrap from './dev-bootstrap';
 import {
@@ -350,21 +349,6 @@ export class VSCodeManager {
         this.enableExtension('vscodevim.vim');
       }
 
-      import(
-        // @ts-ignore
-        'worker-loader?publicPath=/&name=ext-host-worker.[hash:8].worker.js!./extensionHostWorker/bootstrappers/ext-host'
-      ).then(ExtHostWorkerLoader => {
-        childProcess.addDefaultForkHandler(ExtHostWorkerLoader.default);
-      });
-
-      const loadingScriptStart = performance.now();
-
-      await this.loadScript(['vs/editor/codesandbox.editor.main']);
-      console.log('LOADING SCRIPT', performance.now() - loadingScriptStart);
-      if (process.env.NODE_ENV === 'development') {
-        console.log('Loaded Monaco'); // eslint-disable-line
-      }
-
       this.addWorkbenchActions();
 
       const r = window.require;