Merge remote-tracking branch 'origin/develop' into Version-v8.0.0

* origin/develop: (689 commits) Implement asset page (#8696) fix crash on signature request (#8709) Fix accounts menu styling (#8707) Delete docs/porting_to_new_environment.md (#8704) Remove unused `getToErrorObject` parameters (#8705) hide connected-status on metamask ext (#8703) Stop adding permissions middleware to trusted connections (#8701) Use `send` state for send flow token (#8695) do not display extension id in connection modal (#8699) Fix tab content disappearing during scrolling on macOS Firefox (#8702) close details when button is pressed (#8694) Refactor token selectors (#8671) Update eth_accounts permission description (#8693) Extract selected token from token input (#8692) Fix propType for Home defaultHomeActiveTabName (#8683) Fix create account form styling (#8689) Remove unused `getSelectedTokenAssetImage` selector (#8691) Remove `getTxParams` (#8676) do not show account mismatch alert on details (#8678) Fix connect hardware styling (#8680) ...
MetaMask · Jun 1, 2020 · 0187153 · 0187153
2 parents 9a624dd + df85ab6
commit 0187153
Show file tree

Hide file tree

Showing 1,217 changed files with 44,288 additions and 46,828 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,22 +13,28 @@ workflows:
       - prep-build:
           requires:
             - prep-deps
-      # - prep-docs:
-      #    requires:
-      #      - prep-deps
+      - prep-build-test:
+          requires:
+            - prep-deps
+      - prep-build-storybook:
+          requires:
+            - prep-deps
       - prep-scss:
           requires:
             - prep-deps
       - test-lint:
           requires:
             - prep-deps
       - test-lint-shellcheck
-      - test-e2e-chrome:
+      - test-lint-lockfile:
           requires:
             - prep-deps
+      - test-e2e-chrome:
+          requires:
+            - prep-build-test
       - test-e2e-firefox:
           requires:
-            - prep-deps
+            - prep-build-test
       - test-unit:
           requires:
             - prep-deps
@@ -51,17 +57,22 @@ workflows:
           requires:
             - test-lint
             - test-lint-shellcheck
+            - test-lint-lockfile
             - test-unit
             - test-unit-global
             - test-mozilla-lint
             - test-e2e-chrome
             - test-e2e-firefox
             - test-integration-flat-chrome
             - test-integration-flat-firefox
+      - benchmark:
+          requires:
+            - prep-build-test
       - job-publish-prerelease:
           requires:
             - prep-deps
             - prep-build
+            - benchmark
             - all-tests-pass
       - job-publish-release:
           filters:
@@ -70,16 +81,21 @@ workflows:
           requires:
             - prep-deps
             - prep-build
-      #       - prep-docs
             - all-tests-pass
+      - job-publish-storybook:
+          filters:
+            branches:
+              only: develop
+          requires:
+            - prep-build-storybook
       - coveralls-upload:
           requires:
             - test-unit
 
 jobs:
   create_release_pull_request:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - run:
@@ -91,7 +107,7 @@ jobs:
 
   prep-deps:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - run:
@@ -110,7 +126,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -127,24 +143,42 @@ jobs:
             - dist
             - builds
 
-  prep-docs:
+  prep-build-test:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
           at: .
       - run:
-          name: build:dist
-          command: yarn doc
+          name: Build extension for testing
+          command: yarn build:test
+      - run:
+          name: Move test build to 'dist-test' to avoid conflict with production build
+          command: mv ./dist ./dist-test
       - persist_to_workspace:
           root: .
           paths:
-            - docs/jsdocs
+            - dist-test
+
+  prep-build-storybook:
+    docker:
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build Storybook
+          command: yarn storybook:build
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .out
 
   prep-scss:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -163,7 +197,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -177,17 +211,28 @@ jobs:
 
   test-lint-shellcheck:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: koalaman/shellcheck-alpine@sha256:169a51b086af0ab181e32801c15deb78944bb433d4f2c0a21cc30d4e60547065
     steps:
       - checkout
-      - run: sudo apt-get install shellcheck
+      - run: apk add --no-cache bash jq yarn
       - run:
           name: Shellcheck Lint
           command: yarn lint:shellcheck
 
+  test-lint-lockfile:
+    docker:
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: lockfile-lint
+          command: yarn lint:lockfile
+
   test-deps:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -198,40 +243,67 @@ jobs:
 
   test-e2e-chrome:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test ./dist
       - run:
           name: test:e2e:chrome
-          command: yarn build:test && yarn test:e2e:chrome
+          command: yarn test:e2e:chrome
           no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
 
   test-e2e-firefox:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - run:
           name: Install Firefox
           command: ./.circleci/scripts/firefox-install
       - attach_workspace:
           at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test ./dist
       - run:
           name: test:e2e:firefox
-          command: yarn build:test && yarn test:e2e:firefox
+          command: yarn test:e2e:firefox
           no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
 
+  benchmark:
+    docker:
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test ./dist
+      - run:
+          name: Run page load benchmark
+          command: yarn benchmark:chrome --out test-artifacts/chrome/benchmark/pageload.json
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - persist_to_workspace:
+          root: .
+          paths:
+            - test-artifacts
+
   job-publish-prerelease:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -261,7 +333,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -276,16 +348,26 @@ jobs:
       - run:
           name: Create GitHub Pull Request to sync master with develop
           command: .circleci/scripts/release-create-master-pr
-      # - run:
-      #    name: github gh-pages docs publish
-      #    command: >
-      #      git config --global user.name "metamaskbot" &&
-      #      git config --global user.email "[email protected]" &&
-      #      yarn publish-docs
+
+  job-publish-storybook:
+    docker:
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "5e:a3:2d:35:b6:25:b5:87:b1:41:11:0d:77:50:96:73"
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: storybook:deploy
+          command: |
+            git remote add storybook [email protected]:MetaMask/metamask-storybook.git
+            yarn storybook:deploy
 
   test-unit:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -300,7 +382,7 @@ jobs:
             - coverage
   test-unit-global:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -310,7 +392,7 @@ jobs:
           command: yarn test:unit:global
   test-mozilla-lint:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -321,7 +403,7 @@ jobs:
 
   test-integration-flat-firefox:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -337,7 +419,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -348,15 +430,15 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - run:
           name: All Tests Passed
           command: echo 'weew - everything passed!'
 
   coveralls-upload:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:

diff --git a/.circleci/scripts/create-sesify-viz b/.circleci/scripts/create-sesify-viz
@@ -9,5 +9,5 @@ set -o pipefail
 mkdir -p ./build-artifacts/deps-viz/
 
 # generate viz
-SESIFY_AUTOGEN=1 npx gulp build:extension:js:background
+SESIFY_AUTOGEN=1 yarn build scripts:core:prod:background
 npx sesify-viz --deps sesify/deps-background.json --config sesify/background.json --dest ./build-artifacts/deps-viz/background
diff --git a/.circleci/scripts/deps-install.sh b/.circleci/scripts/deps-install.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
+
+# Print commands and their arguments as they are executed.
 set -x
+# Exit immediately if a command exits with a non-zero status.
+set -e
 
 yarn --frozen-lockfile --ignore-scripts --har
 

diff --git a/.dockerignore b/.dockerignore
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,5 @@
+!.eslintrc.js
+
 node_modules/**
 dist/**
 builds/**