Merge pull request #538 from LiskHQ/491-move-the-default-network-sett…

…ing-outside

Move the default network setting outside of built bundles - Closes #491

.eslintignore

@@ -2,3 +2,4 @@ dist
 node_modules
 coverage
 app/build
+app/build-testnet

.eslintrc

@@ -15,7 +15,6 @@
     "beforeEach": true,
     "afterEach": true,
     "ipc": true,
-    "DEFAULT_NEWTORK": true,
     "PRODUCTION": true,
     "TEST": true
   },

.gitignore

@@ -8,6 +8,7 @@ e2e-test-screenshots
 app/report.html
 app/*.map
 app/build
+app/build-testnet
 *.sw[pon]
 app/app.js
 .vscode

Jenkinsfile

@@ -99,6 +99,7 @@ node('lisk-hub') {
         sh '''
         cp ~/.coveralls.yml-hub .coveralls.yml
         npm run --silent build
+        npm run --silent build:testnet
         rsync -axl --delete --rsync-path="mkdir -p /var/www/test/${JOB_NAME%/*}/$BRANCH_NAME/ && rsync" $WORKSPACE/app/build/ jenkins@master-01:/var/www/test/${JOB_NAME%/*}/$BRANCH_NAME/
         npm run --silent bundlesize
         '''

config/webpack.config.react.js

@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const { resolve } = require('path');
-const { ContextReplacementPlugin, DefinePlugin } = require('webpack');
+const { ContextReplacementPlugin } = require('webpack');
 const StyleLintPlugin = require('stylelint-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -97,9 +97,6 @@ module.exports = {
     historyApiFallback: true,
   },
   plugins: [
-    new DefinePlugin({
-      DEFAULT_NEWTORK: JSON.stringify(process.env.TESTNET ? 'testnet' : 'mainnet'),
-    }),
     new StyleLintPlugin({
       context: `${resolve(__dirname, '../src')}/`,
       files: '**/*.css',

config/webpack.config.test.js

@@ -31,3 +31,4 @@ module.exports = merge(baseConfig, reactConfig, {
   ],
   externals,
 });
+

package.json

@@ -7,7 +7,9 @@
   "main": "main.js",
   "scripts": {
     "build": "npm run clean-build && npm run copy-files && npm run build-prod && npm run build-electron",
-    "build:testnet": "export TESTNET=true && npm run build",
+    "build:testnet": "npm run build:testnet:pre",
+    "build:testnet:pre": "cpx \"./app/build/**\" ./app/build-testnet && npm run build:testnet:post",
+    "build:testnet:post": "replace '\"mainnet\";//defaultNetwork' '\"testnet\";//defaultNetwork' ./app/build-testnet/index.html ",
     "dev": "webpack-dev-server --config ./config/webpack.config.dev --env.dev --hot",
     "build-prod": "webpack --config ./config/webpack.config.prod --env.prod",
     "build-electron": "webpack --config ./config/webpack.config.electron",
@@ -159,6 +161,7 @@
     "react-hot-loader": "=1.3.1",
     "react-test-renderer": "=16.0.0",
     "redux-mock-store": "1.3.0",
+    "replace": "0.3.0",
     "should": "13.1.0",
     "simulant": "0.2.2",
     "sinon": "3.3.0",

src/components/register/register.test.js

@@ -7,6 +7,7 @@ import { spy, match } from 'sinon';
 import PropTypes from 'prop-types';
 import configureMockStore from 'redux-mock-store';
 
+import networks from '../../constants/networks';
 import accounts from '../../../test/constants/accounts';
 import i18n from '../../i18n';
 import Register from './register';
@@ -61,7 +62,7 @@ describe('Register', () => {
   it('should call activePeerSet with network and passphrase', () => {
     wrapper.find('MultiStep').props().finalCallback(passphrase);
     expect(prop.activePeerSet).to.have.been.calledWith(match({
-      network: { code: 0, name: 'Mainnet', port: 443, ssl: true },
+      network: networks.mainnet,
       passphrase,
     }));
   });

src/constants/env.js

@@ -1,8 +1,7 @@
 const env = {
   production: PRODUCTION,
-  test: TEST,
   development: (!PRODUCTION && !TEST),
-  defaultNetwork: DEFAULT_NEWTORK,
+  test: TEST,
 };
 
 export default env;

src/constants/networks.js

@@ -1,5 +1,3 @@
-import env from './env';
-
 const networks = {
   mainnet: { // network name translation t('Mainnet');
     name: 'Mainnet',
@@ -22,6 +20,5 @@ const networks = {
   },
 };
 
-networks.default = networks[env.defaultNetwork];
-
+networks.default = networks[window.localStorage && window.localStorage.getItem('defaultNetwork')] || networks.mainnet;
 module.exports = networks;

src/index.html

@@ -9,6 +9,15 @@
           <%= compilation.assets['head.css'].source() %>
         </style>
         <link rel="icon" type="image/png" href="./assets/images/LISK.png" />
+        <script type="text/javascript">
+          /* Following comment is a placeholder used by `npm run build:testnet`, do not remove */
+          var defaultNet = "mainnet";//defaultNetwork
+          (function(targetNet) {
+            if (window.localStorage && !window.localStorage.getItem('defaultNetwork')){
+              window.localStorage.setItem('defaultNetwork', defaultNet);
+            }
+          })(defaultNet);
+        </script>
     </head>
     <body>
         <div id="app"></div>