Merge branch '2.5.0_dev' into 2.5.0

.eslintrc

@@ -3,8 +3,7 @@
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
       "ecmaVersion": 2018,
-      "sourceType": "module",
-      "project": "./tsconfig.base.json"
+      "sourceType": "module"
     },
     "plugins": ["@typescript-eslint", "@nrwl/nx"],
     "extends": "standard",
@@ -18,4 +17,4 @@
         }
       }
     ]
-  }
+  }
\ No newline at end of file

apps/remix-ide/src/index.js

@@ -7,9 +7,9 @@ const app = new App({})
 document.body.appendChild(app.render())
 window.onload = () => {
   BrowserFS.install(window)
-  BrowserFS.FileSystem.LocalStorage.Create(function(e, lsfs) {
+  BrowserFS.FileSystem.LocalStorage.Create(function (e, lsfs) {
     BrowserFS.initialize(lsfs)
-    window.remixFileSystem =  BrowserFS.BFSRequire("fs")
+    window.remixFileSystem = BrowserFS.BFSRequire('fs')
     app.init()
-  });
+  })
 }

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@@ -166,7 +166,7 @@ export function Workspace () {
                       return <option key={index} value={folder}>{folder}</option>
                     })
                 }
-                {/*<option value={LOCALHOST}>{currentWorkspace === LOCALHOST ? 'localhost' : LOCALHOST}</option>*/}
+                {/* <option value={LOCALHOST}>{currentWorkspace === LOCALHOST ? 'localhost' : LOCALHOST}</option> */}
                 { global.fs.browser.workspaces.length <= 0 && <option value={NO_WORKSPACE}>{NO_WORKSPACE}</option> }
               </select>
             </div>