Master => develop

.circleci/config.yml

@@ -13,9 +13,9 @@ workflows:
       - prep-build:
           requires:
             - prep-deps
-      # - prep-docs:
-      #    requires:
-      #      - prep-deps
+      - prep-build-test:
+          requires:
+            - prep-deps
       - prep-scss:
           requires:
             - prep-deps
@@ -28,10 +28,10 @@ workflows:
             - prep-deps
       - test-e2e-chrome:
           requires:
-            - prep-deps
+            - prep-build-test
       - test-e2e-firefox:
           requires:
-            - prep-deps
+            - prep-build-test
       - test-unit:
           requires:
             - prep-deps
@@ -62,10 +62,14 @@ workflows:
             # - 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:
@@ -74,16 +78,21 @@ workflows:
           requires:
             - prep-deps
             - prep-build
-      #       - prep-docs
             - all-tests-pass
+      # - job-publish-storybook:
+      #     filters:
+      #       branches:
+      #         only: develop
+      #     requires:
+      #       - prep-deps
       - coveralls-upload:
           requires:
             - test-unit
 
 jobs:
   create_release_pull_request:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - run:
@@ -95,7 +104,7 @@ jobs:
 
   prep-deps:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - run:
@@ -114,7 +123,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -131,24 +140,27 @@ jobs:
             - dist
             - builds
 
-  prep-docs:
+  prep-build-test:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     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-scss:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -167,7 +179,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -181,17 +193,17 @@ jobs:
 
   test-lint-shellcheck:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: koalaman/shellcheck-alpine:stable
     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:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -202,7 +214,7 @@ jobs:
 
   test-deps:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -213,40 +225,67 @@ jobs:
 
   test-e2e-chrome:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     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:10.18-browsers
     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:10.18-browsers
+    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:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -276,7 +315,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -291,16 +330,20 @@ 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 "admin@metamask.io" &&
-      #      yarn publish-docs
+  # job-publish-storybook:
+  #   docker:
+  #     - image: circleci/node:10.18-browsers
+  #   steps:
+  #     - checkout
+  #     - attach_workspace:
+  #         at: .
+  #     - run:
+  #         name: storybook:deploy
+  #         command: yarn storybook:deploy
 
   test-unit:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -315,7 +358,7 @@ jobs:
             - coverage
   test-unit-global:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -325,7 +368,7 @@ jobs:
           command: yarn test:unit:global
   test-mozilla-lint:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -336,7 +379,7 @@ jobs:
 
   test-integration-flat-firefox:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -352,7 +395,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -363,15 +406,15 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - run:
           name: All Tests Passed
           command: echo 'weew - everything passed!'
 
   coveralls-upload:
     docker:
-      - image: circleci/node:10.17-browsers
+      - image: circleci/node:10.18-browsers
     steps:
       - checkout
       - attach_workspace:

.circleci/scripts/release-create-gh-release

@@ -38,8 +38,8 @@ then
     release_body="$(awk -v version="${tag##v}" -f .circleci/scripts/show-changelog.awk CHANGELOG.md)"
     pushd builds
         hub release create \
-            --attach metamask-chrome-*.zip \
-            --attach metamask-firefox-*.zip \
+            --attach conflux-portal-chrome-*.zip \
+            --attach conflux-portal-firefox-*.zip \
             --message "Version ${tag##v}" \
             --message "$release_body" \
             --commitish "$CIRCLE_SHA1" \

.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";

.eslintignore

@@ -1,3 +1,5 @@
+!.eslintrc.js
+
 node_modules/**
 dist/**
 builds/**
@@ -21,4 +23,4 @@ test/e2e/contract-test/sha3.min.js
 
 package-lock.json
 
-test/e2e/contract-test/metamask-onboarding.bundle.js
+test/e2e/contract-test/conflux-portal-onboarding.bundle.js