Merge pull request #1040 from lightninglabs/upgrade-npm-deps

tanx · web-flow · commit da63be93dd77 · 2019-04-08T11:23:54.000+08:00
Upgrade npm deps
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [],
   "plugins": [
-    "transform-es2015-modules-commonjs",
-    "transform-object-rest-spread"
+    "@babel/plugin-transform-modules-commonjs",
+    "@babel/plugin-proposal-object-rest-spread"
   ]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -3,12 +3,11 @@
     "prettier"
   ],
   "parserOptions": {
-    "ecmaVersion": 2017,
+    "ecmaVersion": 2018,
     "sourceType": "module",
     "ecmaFeatures": {
       "jsx": true,
-      "spread": true,
-      "experimentalObjectRestSpread": true
+      "spread": true
     }
   },
   globals: {
@@ -34,7 +33,7 @@
       "trailingComma": "es5",
       "bracketSpacing": true,
       "jsxBracketSameLine": false,
-      "parser": "babylon"
+      "parser": "babel"
     }],
     "no-console": "off"
   }
diff --git a/.storybook/.babelrc b/.storybook/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "react-native"
+    "module:metro-react-native-babel-preset"
   ],
   "plugins": [
     "react-native-web"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,55 +29,59 @@
     "protobuf": "pbjs assets/rpc.proto -t static-module -w es6 -o assets/rpc.js"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.3.0",
-    "electron-is-dev": "^0.3.0",
-    "electron-log": "^2.2.14",
-    "electron-updater": "^3.2.3",
-    "grpc": "^1.15.1",
+    "@grpc/proto-loader": "0.3.0",
+    "electron-is-dev": "0.3.0",
+    "electron-log": "2.2.14",
+    "electron-updater": "3.2.3",
+    "grpc": "1.15.1",
     "locale-currency": "0.0.2",
-    "mobx": "^4.5.0",
-    "mobx-react": "^5.2.8",
+    "mobx": "^4.9.4",
+    "mobx-react": "^5.4.3",
     "qr-image": "^3.2.0",
-    "react": "^16.7.0",
-    "react-art": "^16.7.0",
-    "react-dom": "^16.7.0",
-    "react-native-web": "^0.9.13",
-    "react-scripts": "^1.1.5",
-    "svgs": "^4.0.0"
+    "react": "^16.8.6",
+    "react-art": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-native-web": "^0.11.2",
+    "svgs": "4.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.3.15",
-    "@storybook/addon-links": "^3.3.15",
-    "@storybook/addons": "^3.3.15",
-    "@storybook/react": "^3.3.15",
-    "@svgr/cli": "^3.1.0",
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.4.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.4.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.4.0",
+    "@babel/register": "^7.4.0",
+    "@storybook/addon-actions": "^5.0.6",
+    "@storybook/addon-links": "^5.0.6",
+    "@storybook/addons": "^5.0.6",
+    "@storybook/react": "^5.0.6",
+    "@svgr/cli": "3.1.0",
     "ajv": "^6.5.0",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
-    "babel-plugin-react-native-web": "^0.9.13",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-react-native": "^4.0.0",
+    "babel-plugin-react-native-web": "^0.11.2",
     "concurrently": "^3.5.1",
-    "electron": "^3.0.9",
-    "electron-builder": "^20.8.1",
-    "eslint": "^4.19.0",
-    "eslint-config-google": "^0.9.1",
-    "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-html": "^4.0.2",
-    "eslint-plugin-prettier": "^2.6.0",
-    "eslint-plugin-react": "^7.7.0",
+    "electron": "3.0.9",
+    "electron-builder": "20.8.1",
+    "eslint-config-google": "^0.12.0",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-plugin-html": "^5.0.3",
+    "eslint-plugin-prettier": "^3.0.1",
+    "eslint-plugin-react": "^7.12.4",
     "isomorphic-fetch": "^2.2.1",
+    "metro-react-native-babel-preset": "^0.53.1",
     "mocha": "^5.0.0",
     "nock": "^9.1.6",
     "prettier": "^1.11.1",
     "prop-types": "^15.6.2",
     "protobufjs": "^6.8.8",
+    "react-scripts": "2.1.8",
     "sinon": "^6.0.0",
     "unexpected": "^10.37.2",
     "unexpected-sinon": "^10.10.1",
-    "wait-on": "^2.1.0"
+    "wait-on": "^2.1.0",
+    "webpack": "4.28.3"
   },
+  "browserslist": [
+    "electron 3.0"
+  ],
   "build": {
     "appId": "engineering.lightning.lightning-app",
     "publish": {
diff --git a/public/electron.js b/public/electron.js
@@ -128,8 +128,8 @@ function createWindow() {
     network: isDev
       ? 'simnet'
       : lndArgs.includes('--bitcoin.mainnet')
-        ? 'mainnet'
-        : 'testnet',
+      ? 'mainnet'
+      : 'testnet',
   });
 }
 
diff --git a/public/index.html b/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <!-- Mitigate XSS -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; object-src 'none'; connect-src *; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; object-src 'none'; connect-src *; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Lightning</title>
   </head>
diff --git a/src/action/info.js b/src/action/info.js
@@ -88,7 +88,7 @@ class InfoAction {
       ? bestHeaderTimestamp - this.startingSyncTimestamp
       : 0;
     const totalProgress = currTimestamp - this.startingSyncTimestamp || 0.001;
-    const percentSynced = progressSoFar * 1.0 / totalProgress;
+    const percentSynced = (progressSoFar * 1.0) / totalProgress;
     return percentSynced;
   }
 }
diff --git a/src/component/notification.js b/src/component/notification.js
@@ -79,10 +79,10 @@ export const alertColor = type => {
   return type === 'success'
     ? color.greenSig
     : type === 'error'
-      ? color.pinkSig
-      : type === 'inactive'
-        ? color.greySig
-        : color.orangeSig;
+    ? color.pinkSig
+    : type === 'inactive'
+    ? color.greySig
+    : color.orangeSig;
 };
 
 const alertStyles = StyleSheet.create({
diff --git a/src/computed/channel.js b/src/computed/channel.js
@@ -13,8 +13,8 @@ const ComputedChannel = store => {
       const p = pendingChannels ? pendingChannels.slice() : [];
       const cl = closedChannels ? closedChannels.slice() : [];
       c.sort((a, b) => (a.active === b.active ? 0 : a.active ? -1 : 1));
-      p.sort(
-        (a, b) => (a.status > b.status ? -1 : a.status < b.status ? 1 : 0)
+      p.sort((a, b) =>
+        a.status > b.status ? -1 : a.status < b.status ? 1 : 0
       );
       let all = [].concat(c, p, cl);
       all.forEach((c, i) => {
@@ -25,10 +25,10 @@ const ComputedChannel = store => {
           c.status === 'open' && c.active
             ? 'success'
             : c.status === 'open'
-              ? 'inactive'
-              : c.status.includes('open')
-                ? 'info'
-                : 'error';
+            ? 'inactive'
+            : c.status.includes('open')
+            ? 'info'
+            : 'error';
         c.capacityLabel = toAmountLabel(c.capacity, settings);
         c.localBalanceLabel = toAmountLabel(c.localBalance, settings);
         c.remoteBalanceLabel = toAmountLabel(c.remoteBalance, settings);
@@ -94,10 +94,10 @@ const ComputedChannel = store => {
       return opened
         ? 'success'
         : inactive
-          ? 'inactive'
-          : pending
-            ? 'info'
-            : 'error';
+        ? 'inactive'
+        : pending
+        ? 'info'
+        : 'error';
     },
   });
 };
diff --git a/src/computed/wallet.js b/src/computed/wallet.js
@@ -43,7 +43,7 @@ const ComputedWallet = store => {
     },
     get channelPercentageLabel() {
       const { balanceSatoshis: onChain, totalBalanceSatoshis: total } = store;
-      const percent = total ? (total - onChain) / total * 100 : 0;
+      const percent = total ? ((total - onChain) / total) * 100 : 0;
       return `${Math.round(percent)}% on Lightning`;
     },
     get newPasswordCopy() {
diff --git a/src/helper.js b/src/helper.js
@@ -309,7 +309,7 @@ export const retry = async (api, interval = 100, retries = 1000) => {
  * @return {Point}                 The point in cartesian form
  */
 const polarToCartesian = (centerX, centerY, radius, angleInDegrees) => {
-  const angleInRadians = (angleInDegrees - 90) * Math.PI / 180.0;
+  const angleInRadians = ((angleInDegrees - 90) * Math.PI) / 180.0;
   return {
     x: centerX + radius * Math.cos(angleInRadians),
     y: centerY + radius * Math.sin(angleInRadians),
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -1,4 +1,4 @@
 --exit
 --recursive
---require babel-core/register
+--require @babel/register
 -r ./test/setup.js

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"presets": [],`
`3`	`3`	`"plugins": [`
`4`		`- "transform-es2015-modules-commonjs",`
`5`		`- "transform-object-rest-spread"`
	`4`	`+ "@babel/plugin-transform-modules-commonjs",`
	`5`	`+ "@babel/plugin-proposal-object-rest-spread"`
`6`	`6`	`]`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"presets": [`
`3`		`- "react-native"`
	`3`	`+ "module:metro-react-native-babel-preset"`
`4`	`4`	`],`
`5`	`5`	`"plugins": [`
`6`	`6`	`"react-native-web"`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class InfoAction {`
`88`	`88`	`? bestHeaderTimestamp - this.startingSyncTimestamp`
`89`	`89`	`: 0;`
`90`	`90`	`const totalProgress = currTimestamp - this.startingSyncTimestamp \|\| 0.001;`
`91`		`- const percentSynced = progressSoFar * 1.0 / totalProgress;`
	`91`	`+ const percentSynced = (progressSoFar * 1.0) / totalProgress;`
`92`	`92`	`return percentSynced;`
`93`	`93`	`}`
`94`	`94`	`}`