Skip to content

Commit 3920bff

Browse files
authored
Merge pull request #1824 from ethereum/fixdesktop2
fixes
2 parents be779f2 + d89dc37 commit 3920bff

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

apps/remix-ide/webpack.config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const nxWebpack = require('@nrwl/react/plugins/webpack')
22
const TerserPlugin = require('terser-webpack-plugin')
3-
const CopyWebpackPlugin = require("copy-webpack-plugin");
4-
3+
const CopyWebpackPlugin = require('copy-webpack-plugin')
54

65
module.exports = config => {
76
const nxWebpackConfig = nxWebpack(config)
@@ -19,7 +18,7 @@ module.exports = config => {
1918
...nxWebpackConfig.plugins,
2019
new CopyWebpackPlugin({
2120
patterns: [
22-
{ from: "../../../node_modules/monaco-editor/dev/vs/", to: "assets/js/monaco-editor/dev/vs" },
21+
{ from: '../../../node_modules/monaco-editor/dev/vs/', to: 'assets/js/monaco-editor/dev/vs' }
2322
].filter(Boolean)
2423
})
2524
]

libs/remix-ui/workspace/src/lib/reducers/workspace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,12 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
334334

335335
case 'ROOT_FOLDER_CHANGED': {
336336
const payload = action.payload as string
337-
338337
return {
339338
...state,
340339
localhost: {
341340
...state.localhost,
342-
sharedFolder: payload
341+
sharedFolder: payload,
342+
files: {}
343343
}
344344
}
345345
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function Workspace () {
2323
else setCurrentWorkspace(NO_WORKSPACE)
2424
global.dispatchFetchWorkspaceDirectory(global.fs.browser.currentWorkspace)
2525
} else if (global.fs.mode === 'localhost') {
26-
// global.dispatchFetchWorkspaceDirectory('/')
26+
global.dispatchFetchWorkspaceDirectory('/')
2727
setCurrentWorkspace(LOCALHOST)
2828
}
2929
}, [global.fs.browser.currentWorkspace, global.fs.localhost.sharedFolder, global.fs.mode])
@@ -127,6 +127,7 @@ export function Workspace () {
127127
</label>
128128
<span className="remixui_menu">
129129
<span
130+
hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
130131
id='workspaceCreate'
131132
data-id='workspaceCreate'
132133
onClick={(e) => {

0 commit comments

Comments
 (0)