Merge pull request #1981 from blockstack/release/v0.37.0

v0.37.0
stacks-archive · Jan 16, 2020 · 96a6743 · 96a6743
2 parents d535ede + ae913f3
commit 96a6743
Show file tree

Hide file tree

Showing 172 changed files with 8,423 additions and 11,188 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,8 +1,10 @@
 {
   "env": {
     "test": {
+      "sourceMaps": "both",
+      "retainLines": true,
+      "compact": false,
       "presets": [
-        "@babel/preset-flow",
         "@babel/preset-react",
         "@babel/preset-env"
       ],
@@ -17,9 +19,7 @@
             ],
             "alias": {
               "@components": "./app/js/components",
-              "@common": "./app/js/common",
               "@styled": "./app/js/components/styled",
-              "@utils": "./app/js/utils",
               "@blockstack/ui": "./app/js/components/ui",
               "@ui/components": "./app/js/components/ui/components",
               "@ui/containers": "./app/js/components/ui/containers",
@@ -58,14 +58,21 @@
       ]
     },
     "development": {
+      "sourceMaps": "both",
+      "retainLines": true,
+      "compact": false,
       "presets": [
-        "@babel/preset-flow",
         "@babel/preset-react",
         [
           "@babel/preset-env",
           {
             "modules": false,
             "useBuiltIns": "usage",
+            "shippedProposals": true,
+            "corejs": { 
+              "version": 2,
+              "proposals": true 
+            },
             "targets": {
               "browsers": [
                 "Chrome >= 60",
@@ -94,9 +101,7 @@
             ],
             "alias": {
               "@components": "./app/js/components",
-              "@common": "./app/js/common",
               "@styled": "./app/js/components/styled",
-              "@utils": "./app/js/utils",
               "@blockstack/ui": "./app/js/components/ui",
               "@ui/components": "./app/js/components/ui/components",
               "@ui/containers": "./app/js/components/ui/containers",
@@ -135,13 +140,17 @@
     },
     "production": {
       "presets": [
-        "@babel/preset-flow",
         "@babel/preset-react",
         [
           "@babel/preset-env",
           {
             "modules": false,
             "useBuiltIns": "usage",
+            "shippedProposals": true,
+            "corejs": { 
+              "version": 2,
+              "proposals": true 
+            },
             "targets": {
               "browsers": [
                 "Chrome >= 60",
@@ -169,9 +178,7 @@
             ],
             "alias": {
               "@components": "./app/js/components",
-              "@common": "./app/js/common",
               "@styled": "./app/js/components/styled",
-              "@utils": "./app/js/utils",
               "@blockstack/ui": "./app/js/components/ui",
               "@ui/components": "./app/js/components/ui/components",
               "@ui/containers": "./app/js/components/ui/containers",

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:10.15.1
+      - image: circleci/node:12.13.0
     working_directory: ~/repo
     steps:
       - checkout
@@ -15,7 +15,7 @@ jobs:
       - run: npm run prod-webapp
   test-e2e-login:
     docker:
-      - image: circleci/node:10.15.1-browsers
+      - image: circleci/node:12.13.0-browsers
     working_directory: ~/repo
     steps:
       - checkout
@@ -33,7 +33,7 @@ jobs:
           path: /tmp/test-errors
   test-e2e-account-creation:
     docker:
-      - image: circleci/node:10.15.1-browsers
+      - image: circleci/node:12.13.0-browsers
     working_directory: ~/repo
     steps:
       - checkout
@@ -51,7 +51,7 @@ jobs:
           path: /tmp/test-errors
   test-e2e-account-recovery:
     docker:
-      - image: circleci/node:10.15.1-browsers
+      - image: circleci/node:12.13.0-browsers
     working_directory: ~/repo
     steps:
       - checkout

diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.eslintrc b/.eslintrc
@@ -33,26 +33,71 @@
     "react/jsx-uses-react": 2,
     "react/jsx-uses-vars": 2,
     "react/react-in-jsx-scope": 2,
-    "react/prop-types": 2,
+    "react/prop-types": 0,
     "react/sort-comp": 0,
+    "react/destructuring-assignment": 0,
+    "react/forbid-prop-types": 0,
+    "react/static-property-placement": 0,
+    "react/jsx-filename-extension": 0,
+    "react/state-in-constructor": 0,
+    "react/no-deprecated": 0,
+    "react/no-access-state-in-setstate": 0,
+    "react/jsx-closing-tag-location": 0,
+    "react/self-closing-comp": 0,
+    "react/default-props-match-prop-types": 0,
+    "react/jsx-max-props-per-line": 0,
+    "react/no-array-index-key": 0,
+    "react/no-unused-prop-types": 0,
+    "react/jsx-curly-newline": 0,
+    "react/jsx-wrap-multilines": 0,
+    "react/require-default-props": 0,
+    "react/jsx-props-no-spreading": 0,
+    "react/button-has-type": 0,
+    "react/no-unused-state": 0,
+    "react/jsx-one-expression-per-line": 0,
+    "react/jsx-indent": 0,
+    "react/no-unescaped-entities": 0,
+    "react/jsx-no-target-blank": 0,
+    "react/jsx-curly-brace-presence": 0,
+    "jsx-a11y/label-has-associated-control": 0,
+    "jsx-a11y/no-static-element-interactions": 0,
+    "jsx-a11y/click-events-have-key-events": 0,
+    "jsx-a11y/no-noninteractive-element-interactions": 0,
+    "jsx-a11y/alt-text": 0,
+    "prefer-object-spread": 0,
+    "prefer-destructuring": 0,
+    "no-useless-return": 0,
+    "class-methods-use-this": 0,
+    "no-lonely-if": 0,
+    "spaced-comment": 0,
     "no-duplicate-imports": 0,
+    "no-prototype-builtins": 0,
+    "no-restricted-globals": 0,
+    "no-plusplus": 0,
+    "no-undef-init": 0,
+    "no-await-in-loop": 0,
+    "lines-between-class-members": 0,
+    "max-classes-per-file": 0,
+    "import/no-named-as-default": 0,
+    "import/prefer-default-export": 0,
     "import/no-duplicates": 2,
+    "import/order": 0,
+    "import/first": 0,
+    "import/newline-after-import": 0,
+    "import/no-cycle": 0,
     "no-useless-escape": 0
   },
   "settings": {
     "react": {
       "createClass": "createReactClass", // Regex for Component Factory to use, default to "createReactClass"
       "pragma": "React", // Pragma to use, default to "React"
-      "version": "16.4", // React version, default to the latest React stable release
-      "flowVersion": "0.53" // Flow version
+      "version": "16.11" // React version, default to the latest React stable release
     },
     "import/resolver": {
       "babel-module": {
         "alias": {
           "@components": "./app/js/components",
-          "@common": "./app/js/common",
           "@styled": "./app/js/components/styled",
-          "@utils": "./app/js/utils",
           "@blockstack/ui": "./app/js/components/ui",
           "@ui/components": "./app/js/components/ui/components",
           "@ui/containers": "./app/js/components/ui/containers",

diff --git a/.flowconfig b/.flowconfig
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.12.0
+12.13
diff --git a/.nycrc b/.nycrc
@@ -16,7 +16,7 @@
   ],
   "reporter": [
     "text-summary",
-    "html"
+    "lcov"
   ],
   "report-dir": "__coverage__/",
   "produce-source-map": true

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,51 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "chrome",
+      "url": "http://localhost:3000",
+      "webRoot": "${workspaceFolder}",
+      "sourceMaps": true,
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "webpack-dev-server",
+      "program": "${workspaceFolder}/node_modules/webpack-dev-server/bin/webpack-dev-server.js",
+      "args": [
+          "--config",
+          "${workspaceFolder}/webpack.config.js"
+      ],
+      "sourceMaps": true,
+      "env": {
+        "NODE_ENV": "development",
+        "BABEL_ENV": "development",
+        "DEBUG_LOGGING": "true"
+      },
+      // "smartStep": true,
+      "trace": true,
+      "autoAttachChildProcesses": true
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Unit tests",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": [
+          "--timeout",
+          "999999",
+          "--colors",
+          "${workspaceFolder}/test"
+      ],
+      "env": {
+        "NODE_ENV": "test",
+        "BABEL_ENV": "test"
+      },
+      "console": "integratedTerminal",
+      "outputCapture": "std"
+    },
     {
       "type": "node",
       "request": "launch",
@@ -52,5 +97,11 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"
     }
+  ],
+  "compounds": [
+    {
+      "name": "Webpack+Chrome",
+      "configurations": ["webpack-dev-server", "chrome"]
+    }
   ]
 }
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:12
 
 # Project directory
 WORKDIR /src/blockstack-browser
@@ -13,7 +13,7 @@ RUN npm install
 RUN npm run prod-webapp
 
 # Remove node modules
-FROM node:10
+FROM node:12
 WORKDIR /src/blockstack-browser
 
 COPY --from=0 /src/blockstack-browser/build /src/blockstack-browser/build

diff --git a/app/js/HomeScreenPage.js b/app/js/HomeScreenPage.js
@@ -7,7 +7,7 @@ import { AppsActions } from './store/apps'
 import { Box, Flex, Type } from 'blockstack-ui'
 import { Hover } from 'react-powerplug'
 import { Spinner } from '@components/ui/components/spinner'
-import { trackEventOnce } from '@utils/server-utils'
+import { trackEventOnce } from './utils/server-utils'
 
 const Loading = ({ ...rest }) => (
   <Flex

diff --git a/app/js/UpdateStatePage.js b/app/js/UpdateStatePage.js
@@ -149,7 +149,7 @@ class UpdateStatePage extends Component {
 
     const { encryptedBackupPhrase } = this.props
 
-    const dataBuffer = new Buffer(encryptedBackupPhrase, 'hex')
+    const dataBuffer = Buffer.from(encryptedBackupPhrase, 'hex')
     const password = this.state.password
 
     decrypt(dataBuffer, password)