fix: resolving merge conflicts

apps/solidity-compiler/webpack.config.js

@@ -1,17 +1,31 @@
 const nxWebpack = require('@nrwl/react/plugins/webpack')
+const TerserPlugin = require('terser-webpack-plugin')
 
 module.exports = config => {
-    const nxWebpackConfig = nxWebpack(config)
+  const nxWebpackConfig = nxWebpack(config)
+  const webpackConfig = {
+    ...nxWebpackConfig,
+    node: {
+      fs: 'empty',
+      tls: 'empty',
+      readline: 'empty',
+      net: 'empty',
+      module: 'empty',
+      child_process: 'empty'
+    }
+  }
 
+  if (process.env.NODE_ENV === 'production') {
     return {
-        ...nxWebpackConfig,
+      ...webpackConfig,
-        node: {
+      mode: 'production',
-            fs: 'empty',
+      devtool: 'source-map',
-            tls: 'empty',
+      optimization: {
-            readline: 'empty',
+        minimize: true,
-            net: 'empty',
+        minimizer: [new TerserPlugin()]
-            module: 'empty',
+      }
-            child_process: 'empty'
-        }
     }
+  } else {
+    return webpackConfig
+  }
 }

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

@@ -114,12 +114,13 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     }
 
     if (typeof file === 'undefined') {
-      var content = _deps.editor.currentContent()
+      const content = _deps.editor.currentContent()
       _execute(content, cb)
       return
     }
 
-    var provider = _deps.fileManager.fileProviderOf(file)
+    const provider = _deps.fileManager.fileProviderOf(file)
+    console.log({ provider })
 
     if (!provider) {
       // toolTip(`provider for path ${file} not found`)
@@ -128,6 +129,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     }
 
     provider.get(file, (error, content) => {
+      console.log({ content })
       if (error) {
         // toolTip(error)
         // TODO: pop up
@@ -137,7 +139,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
 
       _execute(content, cb)
     })
-    return ''
   }
 
   function loadgist (id, cb) {
@@ -326,8 +327,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     if (mode) {
       const filterUndefined = (el) => el !== undefined && el !== null
       return function logger (args) {
-        var types = args.filter(filterUndefined).map(type => type)
+        const types = args.filter(filterUndefined).map(type => type)
-        var values = javascriptserialize.apply(null, args.filter(filterUndefined)).map(function (val, idx) {
+        const values = javascriptserialize.apply(null, args.filter(filterUndefined)).map(function (val, idx) {
           if (typeof args[idx] === 'string') {
             const el = document.createElement('div')
             el.innerHTML = args[idx].replace(/(\r\n|\n|\r)/gm, '<br>')
@@ -412,7 +413,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   }
 
   const handleAutoComplete = () => (
-    <div className='popup alert alert-secondary' style={{ display: autoCompletState.showSuggestions && autoCompletState.userInput !== '' ? 'block' : 'none' }}>
+    <div className='popup alert alert-secondary' style={{ display: (autoCompletState.showSuggestions && autoCompletState.userInput !== '') && autoCompletState.data._options.length > 0 ? 'block' : 'none' }}>
       <div>
         {autoCompletState.data._options.map((item, index) => {
           return (

nx.json

@@ -130,5 +130,13 @@
     "remix-ide-e2e-src-local-plugin": {
       "tags": []
     }
+  },
+  "targetDependencies": {
+    "build": [
+      {
+        "target": "build",
+        "projects": "dependencies"
+      }
+    ]
   }
 }

package.json

@@ -57,7 +57,7 @@
     "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/remix-ide/src/assets/js/soljson.js && wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/solidity-compiler/src/assets/js/soljson.js",
     "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js",
     "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",
-    "build:production": "NODE_ENV=production npx nx build remix-ide --with-deps --skip-nx-cache && npx nx build remix-ide",
+    "build:production": "NODE_ENV=production nx build remix-ide --skip-nx-cache",
     "serve:production": "npx http-server ./dist/apps/remix-ide",
     "nightwatch_parallel": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome,firefox",
     "nightwatch_local_firefox": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=firefox",
@@ -201,14 +201,14 @@
     "@babel/preset-typescript": "7.9.0",
     "@babel/register": "^7.4.4",
     "@fortawesome/fontawesome-free": "^5.8.1",
-    "@nrwl/cli": "^12.9.0",
+    "@nrwl/cli": "12.3.6",
-    "@nrwl/eslint-plugin-nx": "^12.9.0",
+    "@nrwl/eslint-plugin-nx": "12.3.6",
-    "@nrwl/jest": "^12.9.0",
+    "@nrwl/jest": "12.3.6",
-    "@nrwl/linter": "^12.9.0",
+    "@nrwl/linter": "12.3.6",
-    "@nrwl/node": "^12.9.0",
+    "@nrwl/node": "12.3.6",
-    "@nrwl/react": "^12.9.0",
+    "@nrwl/react": "12.3.6",
-    "@nrwl/web": "^12.9.0",
+    "@nrwl/web": "12.3.6",
-    "@nrwl/workspace": "^12.9.0",
+    "@nrwl/workspace": "12.3.6",
     "@testing-library/react": "10.4.1",
     "@types/axios": "^0.14.0",
     "@types/chai": "^4.2.11",