Merge remote-tracking branch 'origin/develop' into build-sys-2

* origin/develop: (582 commits) Use async/await for seedPhraseVerifier.verifyAccounts (#9100) Use async/await for getRestrictedMethods (#9099) Update dependencies (#9105) update email us to contact us (#9104) Improve source maps (#9101) Update font family globally (#9073) rpc-cap@3.1.0 (#9103) Use environment variable for production Sentry DSN (#9097) Only log error on first occurrence of missing substitution (#9096) Use mixins for typography instead of placeholder selectors (#9072) Update css folder structure (#9071) Disable Sentry in development (#9095) Use environment variable for MetaMetrics project ID (#9094) Use development metametrics project during tests (#9093) json-rpc-engine@5.2.0 (#9091) fixup! call initializeProvider where necessary call initializeProvider where necessary Add euclid fontface (#9018) fix timing-reliant network controller test Robustify permissions controller requestUserApproval tests (#9064) ...
MetaMask · Jul 30, 2020 · 1e042f2 · 1e042f2
2 parents 5dcba37 + 002f021
commit 1e042f2
Show file tree

Hide file tree

Showing 982 changed files with 23,059 additions and 28,975 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,9 +22,6 @@ workflows:
       - prep-build-storybook:
           requires:
             - prep-deps
-      - prep-scss:
-          requires:
-            - prep-deps
       - test-lint:
           requires:
             - prep-deps
@@ -48,14 +45,6 @@ workflows:
           requires:
             - prep-deps
             - prep-build
-      - test-integration-flat-chrome:
-          requires:
-            - prep-deps
-            - prep-scss
-      - test-integration-flat-firefox:
-          requires:
-            - prep-deps
-            - prep-scss
       - all-tests-pass:
           requires:
             - test-lint
@@ -66,8 +55,6 @@ workflows:
             - test-mozilla-lint
             - test-e2e-chrome
             - test-e2e-firefox
-            - test-integration-flat-chrome
-            - test-integration-flat-firefox
       - benchmark:
           requires:
             - prep-build-test
@@ -196,25 +183,6 @@ jobs:
           paths:
             - .out
 
-  prep-scss:
-    docker:
-      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Get Scss Cache key
-          # this allows us to checksum against a whole directory
-          command: find ui/app/css -type f -exec md5sum {} \; | sort -k 2 > scss_checksum
-      - run:
-          name: Build for integration tests
-          command: yarn test:integration:build
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ui/app/css/output
-
   test-lint:
     docker:
       - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
@@ -417,33 +385,6 @@ jobs:
           name: test:mozilla-lint
           command: NODE_OPTIONS=--max_old_space_size=3072 yarn mozilla-lint
 
-  test-integration-flat-firefox:
-    docker:
-      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Install Firefox
-          command: ./.circleci/scripts/firefox-install
-      - run:
-          name: test:integration:flat
-          command: yarn test:flat
-
-  test-integration-flat-chrome:
-    environment:
-      browsers: '["Chrome"]'
-    docker:
-      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: test:integration:flat
-          command: yarn test:flat
-
   all-tests-pass:
     docker:
       - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88

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/.circleci/scripts/release-bump-manifest-version b/.circleci/scripts/release-bump-manifest-version
@@ -19,8 +19,8 @@ fi
 printf '%s\n' 'Updating the manifest version if needed'
 
 version="${CIRCLE_BRANCH/Version-v/}"
-updated_manifest="$(jq ".version = \"$version\"" app/manifest.json)"
-printf '%s\n' "$updated_manifest" > app/manifest.json
+updated_manifest="$(jq ".version = \"$version\"" app/manifest/_base.json)"
+printf '%s\n' "$updated_manifest" > app/manifest/_base.json
 
 if [[ -z $(git status --porcelain) ]]
 then
@@ -32,7 +32,7 @@ git \
     -c user.name='MetaMask Bot' \
     -c user.email='metamaskbot@users.noreply.github.com' \
     commit --message "${CIRCLE_BRANCH/-/ }" \
-        CHANGELOG.md app/manifest.json
+        CHANGELOG.md app/manifest/_base.json
 
 repo_slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
 git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" "$CIRCLE_BRANCH"
diff --git a/.circleci/scripts/release-create-master-pr b/.circleci/scripts/release-create-master-pr
@@ -44,7 +44,6 @@ install_github_cli
 printf '%s\n' "Creating a Pull Request to sync 'master' with 'develop'"
 
 if ! hub pull-request \
-    --reviewer '@MetaMask/extension-release-team' \
     --message "Master => develop" --message 'Merge latest release back into develop' \
     --base "$CIRCLE_PROJECT_USERNAME:$base_branch" \
     --head "$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH";

diff --git a/.circleci/scripts/release-create-release-pr b/.circleci/scripts/release-create-release-pr
@@ -45,7 +45,6 @@ install_github_cli
 printf '%s\n' "Creating a Pull Request for $version on GitHub"
 
 if ! hub pull-request \
-    --reviewer '@MetaMask/extension-release-team' \
     --message "${CIRCLE_BRANCH/-/ } RC" --message ':package: :rocket:' \
     --base "$CIRCLE_PROJECT_USERNAME:$base_branch" \
     --head "$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH";

diff --git a/.eslintignore b/.eslintignore
@@ -7,17 +7,10 @@ test-builds/**
 docs/**
 coverage/
 
-development/bundle.js
-development/states.js
-
 app/scripts/lib/extension-instance.js
 app/scripts/chromereload.js
 app/vendor/**
 
 ui/lib/blockies.js
 
-test/integration/bundle.js
-test/integration/jquery-3.1.0.min.js
-test/integration/helpers.js
-
 package-lock.json
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
     '@metamask/eslint-config/config/nodejs',
     '@metamask/eslint-config/config/mocha',
     'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
   ],
 
   plugins: [
@@ -40,7 +41,14 @@ module.exports = {
   },
 
   rules: {
+    /* TODO: Remove these when upgrading to `@metamask/eslint-config@2` */
+    'array-callback-return': 'error',
+    'callback-return': 'error',
+    'global-require': 'error',
+    'guard-for-in': 'error',
+    /* End v2 rules */
     'arrow-parens': 'error',
+    'no-tabs': 'error',
     'no-mixed-operators': 'error',
     'import/default': 'error',
     'import/export': 'error',
@@ -49,7 +57,7 @@ module.exports = {
     'import/newline-after-import': 'error',
     'import/no-absolute-path': 'error',
     'import/no-amd': 'error',
-    'import/no-anonymous-default-export': ['error', { 'allowObject': true }],
+    'import/no-anonymous-default-export': 'error',
     'import/no-duplicates': 'error',
     'import/no-dynamic-require': 'error',
     'import/no-mutable-exports': 'error',
@@ -91,6 +99,23 @@ module.exports = {
     'mocha/no-setup-in-describe': 'off',
   },
 
+  overrides: [{
+    files: [
+      'app/scripts/migrations/*.js',
+      '*.stories.js',
+    ],
+    rules: {
+      'import/no-anonymous-default-export': ['error', { 'allowObject': true }],
+    },
+  }, {
+    files: [
+      'app/scripts/migrations/*.js',
+    ],
+    rules: {
+      'global-require': 'off',
+    },
+  }],
+
   settings: {
     'react': {
       'version': 'detect',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,10 +1,6 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-package.json                         @danjm @whymarrh @Gudahtt
-yarn.lock                            @danjm @whymarrh @Gudahtt
-ui/                                  @danjm @whymarrh @Gudahtt @jennypollack
-app/scripts/controllers/transactions @whymarrh @jennypollack
-.circleci/scripts/deps-install.sh    @kumavis @Gudahtt
-app/scripts/controllers/network      @jennypollack @rekmarks
-app/scripts/controllers/permissions  @rekmarks @danjm @jennypollack
+*                                    @MetaMask/extension-devs
+.circleci/                           @MetaMask/extension-devs @kumavis
+development/                         @MetaMask/extension-devs @kumavis
diff --git a/.gitignore b/.gitignore
@@ -34,13 +34,6 @@ dist
 builds/
 builds.zip
 
-development/bundle.js
-development/states.js
-test/integration/bundle.js
-test/background.js
-test/bundle.js
-test/test-bundle.js
-
 test-artifacts
 test-builds
 
@@ -51,3 +44,5 @@ notes.txt
 
 .coveralls.yml
 .nyc_output
+
+.metamaskrc
diff --git a/.storybook/preview-body.html b/.storybook/preview-body.html
@@ -0,0 +1,2 @@
+<div id="custom-root"></div>
+<div id="popover-content"></div>
diff --git a/.stylelintignore b/.stylelintignore
@@ -1,9 +1,9 @@
-app/
-development/
-dist/
-docs/
-fonts/
-images/
-node_modules/
-notices/
-test/
+/app
+/development
+/dist
+/docs
+/fonts
+/images
+/node_modules
+/notices
+/test
diff --git a/.stylelintrc b/.stylelintrc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<div id="custom-root"></div>
		<div id="popover-content"></div>