Merge pull request #1824 from ethereum/fixdesktop2

fixes
pull/1825/head^2
bunsenstraat 3 years ago committed by GitHub
commit 3920bffbca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      apps/remix-ide/webpack.config.js
  2. 4
      libs/remix-ui/workspace/src/lib/reducers/workspace.ts
  3. 3
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@ -1,7 +1,6 @@
const nxWebpack = require('@nrwl/react/plugins/webpack')
const TerserPlugin = require('terser-webpack-plugin')
const CopyWebpackPlugin = require("copy-webpack-plugin");
const CopyWebpackPlugin = require('copy-webpack-plugin')
module.exports = config => {
const nxWebpackConfig = nxWebpack(config)
@ -19,7 +18,7 @@ module.exports = config => {
...nxWebpackConfig.plugins,
new CopyWebpackPlugin({
patterns: [
{ from: "../../../node_modules/monaco-editor/dev/vs/", to: "assets/js/monaco-editor/dev/vs" },
{ from: '../../../node_modules/monaco-editor/dev/vs/', to: 'assets/js/monaco-editor/dev/vs' }
].filter(Boolean)
})
]

@ -334,12 +334,12 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
case 'ROOT_FOLDER_CHANGED': {
const payload = action.payload as string
return {
...state,
localhost: {
...state.localhost,
sharedFolder: payload
sharedFolder: payload,
files: {}
}
}
}

@ -23,7 +23,7 @@ export function Workspace () {
else setCurrentWorkspace(NO_WORKSPACE)
global.dispatchFetchWorkspaceDirectory(global.fs.browser.currentWorkspace)
} else if (global.fs.mode === 'localhost') {
// global.dispatchFetchWorkspaceDirectory('/')
global.dispatchFetchWorkspaceDirectory('/')
setCurrentWorkspace(LOCALHOST)
}
}, [global.fs.browser.currentWorkspace, global.fs.localhost.sharedFolder, global.fs.mode])
@ -127,6 +127,7 @@ export function Workspace () {
</label>
<span className="remixui_menu">
<span
hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
id='workspaceCreate'
data-id='workspaceCreate'
onClick={(e) => {

Loading…
Cancel
Save