Merge branch 'master' into react-plugin-manager

.circleci/config.yml

@@ -232,14 +232,14 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
       - run: npm run downloadsolc_assets
-      - run: npx nx build remix-ide --with-deps
+      - run: npm run build:production
       - run: 
           name: Deploy
           command: |
@@ -260,7 +260,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
@@ -268,7 +268,7 @@ jobs:
       - setup_remote_docker
       - run: npm install
       - run: npm run downloadsolc_assets
-      - run: npx nx build remix-ide --with-deps
+      - run: npm run build:production
       - run: ./apps/remix-ide/ci/copy_resources.sh     
       - run: ./apps/remix-ide/ci/publishIpfs
       - run: ./apps/remix-ide/ci/build_and_publish_docker_images.sh
@@ -286,14 +286,14 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
       - run: npm run downloadsolc_assets
-      - run: npx nx build remix-ide --with-deps
+      - run: npm run build:production
       - run: 
           name: Deploy
           command: |
@@ -314,7 +314,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
@@ -322,7 +322,7 @@ jobs:
       - run: npm install
       - run: npm run build:libs
       - run: npm run downloadsolc_assets
-      - run: npm run build
+      - run: npm run build:production
       - run: 
           name: Deploy
           command: |

README.md

@@ -50,6 +50,18 @@ Run `nx serve` and open `http://127.0.0.1:8080` in your browser.
 Then open your `text editor` and start developing.
 The browser will automatically refresh when files are saved.
 
+## Production Build
+To generate react production builds for remix-project.
+```bash
+npm run build:production
+```
+build can be found in `remix-project/dist/apps/remix-ide` directory.
+
+```bash
+npm run serve:production
+```
+production build will be served by default to `http://localhost:8080/` or `http://127.0.0.1:8080/`
+
 ## Docker:
 
 Prerequisites: 

apps/debugger/webpack.config.js

 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,
-        node: {
-            fs: 'empty',
-            tls: 'empty',
-            readline: 'empty',
-            net: 'empty',
-            module: 'empty',
-            child_process: 'empty'
-        }
+      ...webpackConfig,
+      mode: 'production',
+      devtool: 'source-map',
+      optimization: {
+        minimize: true,
+        minimizer: [new TerserPlugin()]
+      }
     }
+  } else {
+    return webpackConfig
+  }
 }

apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh

@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js favicon.ico"
+FILES_TO_DEPLOY="assets index.html main.js polyfills.js favicon.ico"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

apps/remix-ide/ci/deploy_from_travis_remix-beta.sh

@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js favicon.ico"
+FILES_TO_DEPLOY="assets index.html main.js polyfills.js favicon.ico"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

apps/remix-ide/ci/deploy_from_travis_remix-live.sh

@@ -13,7 +13,7 @@ echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ fo
 echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
-FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js"
+FILES_TO_DEPLOY="assets index.html main.js polyfills.js"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

apps/remix-ide/src/index.html

@@ -5,19 +5,15 @@
 		<meta charset="utf-8">
 		<!--
 		The MIT License (MIT)
-
 		Copyright (c) 2014, 2015, the individual contributors
-
 		Permission is hereby granted, free of charge, to any person obtaining a copy
 		of this software and associated documentation files (the "Software"), to deal
 		in the Software without restriction, including without limitation the rights
 		to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 		copies of the Software, and to permit persons to whom the Software is
 		furnished to do so, subject to the following conditions:
-
 		The above copyright notice and this permission notice shall be included in
 		all copies or substantial portions of the Software.
-
 		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

apps/remix-ide/webpack.config.js

 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,
-        node: {
-            fs: 'empty',
-            tls: 'empty',
-            readline: 'empty',
-            net: 'empty',
-            module: 'empty',
-            child_process: 'empty'
-        }
+      ...webpackConfig,
+      mode: 'production',
+      devtool: 'source-map',
+      optimization: {
+        minimize: true,
+        minimizer: [new TerserPlugin()]
+      }
     }
+  } else {
+    return webpackConfig
+  }
 }

package.json

@@ -53,6 +53,8 @@
     "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",
     "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",
+    "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",
     "nightwatch_local_chrome": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome",
@@ -286,6 +288,7 @@
     "swarmgw": "^0.3.1",
     "tap-spec": "^5.0.0",
     "tape": "^4.13.3",
+    "terser-webpack-plugin": "^4.2.3",
     "ts-jest": "25.2.1",
     "ts-node": "^7.0.1",
     "tslint": "~6.0.0",