Version v11.1.0 RC

.circleci/config.yml

@@ -3,16 +3,16 @@ version: 2.1
 executors:
   node-browsers:
     docker:
-      - image: cimg/node:16.20-browsers
+      - image: cimg/node:18.17-browsers
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:16.20-browsers
+      - image: cimg/node:18.17-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-large:
     docker:
-      - image: cimg/node:16.20-browsers
+      - image: cimg/node:18.17-browsers
     resource_class: large
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
@@ -101,6 +101,9 @@ workflows:
               build-type: [main, beta, flask, mmi, desktop]
           requires:
             - prep-deps
+      - prep-build-mmi:
+          requires:
+            - prep-deps
       - prep-build:
           requires:
             - prep-deps
@@ -144,6 +147,9 @@ workflows:
       - test-e2e-firefox:
           requires:
             - prep-build-test
+      - test-e2e-chrome-rpc:
+          requires:
+            - prep-build-test
       - test-e2e-chrome-snaps:
           requires:
             - prep-build-test
@@ -192,6 +198,9 @@ workflows:
               ignore: master
           requires:
             - prep-build-desktop
+      - validate-source-maps-mmi:
+          requires:
+            - prep-build-mmi
       - validate-source-maps-flask:
           requires:
             - prep-build-flask
@@ -212,6 +221,7 @@ workflows:
             - prep-build-flask
       - all-tests-pass:
           requires:
+            - test-deps-depcheck
             - validate-lavamoat-allow-scripts
             - validate-lavamoat-policy-build
             - validate-lavamoat-policy-webapp
@@ -228,6 +238,7 @@ workflows:
             - validate-source-maps-beta
             - validate-source-maps-desktop
             - validate-source-maps-flask
+            - validate-source-maps-mmi
             - test-mozilla-lint
             - test-mozilla-lint-desktop
             - test-mozilla-lint-flask
@@ -251,6 +262,7 @@ workflows:
             - prep-build
             - trigger-beta-build
             - prep-build-desktop
+            - prep-build-mmi
             - prep-build-flask
             - prep-build-storybook
             - prep-build-ts-migration-dashboard
@@ -267,6 +279,7 @@ workflows:
             - prep-deps
             - prep-build
             - prep-build-desktop
+            - prep-build-mmi
             - prep-build-flask
             - all-tests-pass
       - job-publish-storybook:
@@ -347,27 +360,9 @@ jobs:
             # required and add the new dependencies, and the cache will be persisted.
             - dependency-cache-v1-
       - gh/install
-      - run:
-          name: Set IS_DRAFT environment variable
-          command: |
-            PR_NUMBER="${CIRCLE_PULL_REQUEST##*/}"
-            if [ -n "$PR_NUMBER" ]
-            then
-              echo "IS_DRAFT=$(gh pr view --json isDraft --jq '.isDraft' "$PR_NUMBER")" >> "$BASH_ENV"
-              source "$BASH_ENV"
-            else
-              echo "Not a PR; skipping"
-            fi
       - run:
           name: Install dependencies
-          command: |
-            if [[ $IS_DRAFT == 'true' ]]
-            then
-              # Use GitHub registry on draft PRs, allowing the use of preview builds
-              METAMASK_NPM_REGISTRY=https://npm.pkg.github.com yarn --immutable
-            else
-              yarn --immutable
-            fi
+          command: .circleci/scripts/install-dependencies.sh
       - save_cache:
           key: dependency-cache-v1-{{ checksum "yarn.lock" }}
           paths:
@@ -478,6 +473,49 @@ jobs:
             - dist-desktop
             - builds-desktop
 
+  prep-build-mmi:
+    executor: node-browsers-medium-plus
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - when:
+          condition:
+            not:
+              matches:
+                pattern: /^master$/
+                value: << pipeline.git.branch >>
+          steps:
+            - run:
+                name: build:dist
+                command: yarn build --build-type mmi dist
+      - when:
+          condition:
+            matches:
+              pattern: /^master$/
+              value: << pipeline.git.branch >>
+          steps:
+            - run:
+                name: build:prod
+                command: yarn build --build-type mmi prod
+      - run:
+          name: build:debug
+          command: find dist/ -type f -exec md5sum {} \; | sort -k 2
+      - run:
+          name: Move mmi build to 'dist-mmi' to avoid conflict with production build
+          command: mv ./dist ./dist-mmi
+      - run:
+          name: Move mmi zips to 'builds-mmi' to avoid conflict with production build
+          command: mv ./builds ./builds-mmi
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist-mmi
+            - builds-mmi
+      - store_artifacts:
+          path: builds-mmi
+          destination: builds-mmi
+
   prep-build-flask:
     executor: node-browsers-medium-plus
     steps:
@@ -663,6 +701,9 @@ jobs:
       - run:
           name: lockfile-lint
           command: yarn lint:lockfile
+      - run:
+          name: check yarn resolutions
+          command: yarn --check-resolutions
 
   test-lint-changelog:
     executor: node-browsers
@@ -698,7 +739,7 @@ jobs:
           at: .
       - run:
           name: yarn audit
-          command: .circleci/scripts/yarn-audit.sh
+          command: yarn audit
 
   test-deps-depcheck:
     executor: node-browsers
@@ -775,6 +816,43 @@ jobs:
           path: test-artifacts
           destination: test-artifacts
 
+  test-e2e-chrome-rpc:
+    executor: node-browsers
+    parallelism: 1
+    steps:
+      - checkout
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test ./builds
+      - run:
+          name: test:e2e:chrome:rpc
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              yarn test:e2e:chrome:rpc --retries 2
+            fi
+          no_output_timeout: 20m
+      - run:
+          name: Merge JUnit report
+          command: |
+            if [ "$(ls -A test/test-results/e2e)" ]; then
+              yarn test:e2e:report
+            fi
+          when: always
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e.xml
+
   test-e2e-firefox-snaps:
     executor: node-browsers
     parallelism: 4
@@ -1079,6 +1157,9 @@ jobs:
       - store_artifacts:
           path: builds-flask
           destination: builds-flask
+      - store_artifacts:
+          path: builds-mmi
+          destination: builds-mmi
       - store_artifacts:
           path: coverage
           destination: coverage
@@ -1121,6 +1202,9 @@ jobs:
       - run:
           name: Publish Flask release to Sentry
           command: yarn sentry:publish --build-type flask
+      - run:
+          name: Publish MMI release to Sentry
+          command: yarn sentry:publish --build-type mmi
       - run:
           name: Create GitHub release
           command: |
@@ -1268,6 +1352,22 @@ jobs:
           name: Validate source maps
           command: yarn validate-source-maps
 
+  validate-source-maps-mmi:
+    executor: node-browsers
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move mmi build to dist
+          command: mv ./dist-mmi ./dist
+      - run:
+          name: Move mmi zips to builds
+          command: mv ./builds-mmi ./builds
+      - run:
+          name: Validate source maps
+          command: yarn validate-source-maps
+
   validate-source-maps-flask:
     executor: node-browsers
     steps:

.circleci/scripts/install-dependencies.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+IS_NON_FORK_DRAFT='false'
+
+if [[ -n $CIRCLE_PULL_REQUEST ]] && gh auth status
+then
+  PR_NUMBER="${CIRCLE_PULL_REQUEST##*/}"
+  if [ -n "$PR_NUMBER" ]
+  then
+    IS_NON_FORK_DRAFT="$(gh pr view --json isDraft --jq '.isDraft' "$PR_NUMBER")"
+  fi
+fi
+
+# Build query to see whether there are any "preview-like" packages in the manifest
+# A "preview-like" package is a `@metamask`-scoped package with a prerelease version that has no period.
+QUERY='.dependencies + .devDependencies'                            # Get list of all dependencies
+QUERY+=' | with_entries( select(.key | startswith("@metamask") ) )' # filter to @metamask-scoped packages
+QUERY+=' | to_entries[].value'                                      # Get version ranges
+QUERY+=' | select(test("^\\d+\\.\\d+\\.\\d+-[^.]+$"))'              # Get pinned versions where the prerelease part has no "."
+
+# Use `-e` flag so that exit code indicates whether any matches were found
+if jq -e "${QUERY}" < ./package.json
+then
+  echo "Preview builds detected"
+  HAS_PREVIEW_BUILDS='true'
+else
+  echo "No preview builds detected"
+  HAS_PREVIEW_BUILDS='false'
+fi
+
+if [[ $IS_NON_FORK_DRAFT == 'true' && $HAS_PREVIEW_BUILDS == 'true' ]]
+then
+  # Use GitHub registry on draft PRs, allowing the use of preview builds
+  echo "Installing with preview builds"
+  METAMASK_NPM_REGISTRY=https://npm.pkg.github.com yarn --immutable
+else
+  echo "Installing without preview builds"
+  yarn --immutable
+fi

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

@@ -26,37 +26,42 @@ function install_github_cli ()
     popd
 }
 
-function print_flask_version ()
+function print_build_version ()
 {
-  local flask_filename
-  flask_filename="$(find ./builds-flask -type f -name 'metamask-flask-chrome-*.zip' -exec basename {} .zip \;)"
+  local build_type="${1}"; shift
 
-  local flask_build_filename_prefix
-  flask_build_filename_prefix='metamask-flask-chrome-'
-  local flask_build_filename_prefix_size
-  flask_build_filename_prefix_size="${#flask_build_filename_prefix}"
+  local filename
+  filename="$(find "./builds-${build_type}" -type f -name "metamask-${build_type}-chrome-*.zip" -exec basename {} .zip \;)"
+
+  local build_filename_prefix
+  build_filename_prefix="metamask-${build_type}-chrome-"
+  local build_filename_prefix_size
+  build_filename_prefix_size="${#build_filename_prefix}"
 
   # Use substring parameter expansion to remove the filename prefix, leaving just the version
-  echo "${flask_filename:$flask_build_filename_prefix_size}"
+  echo "${filename:$build_filename_prefix_size}"
 }
 
-function publish_flask_tag ()
+
+function publish_tag ()
 {
-    local flask_version="${1}"; shift
+    local build_name="${1}"; shift
+    local build_version="${1}"; shift
 
     git config user.email "[email protected]"
     git config user.name "MetaMask Bot"
-    git tag -a "v${flask_version}" -m "Flask version ${flask_version}"
+    git tag -a "v${build_version}" -m "${build_name} version ${build_version}"
     repo_slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
-    git push "https://[email protected]/$repo_slug" "v${flask_version}"
+    git push "https://[email protected]/$repo_slug" "v${build_version}"
 }
 
 current_commit_msg=$(git show -s --format='%s' HEAD)
 
 if [[ $current_commit_msg =~ Version[-[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+) ]]
 then
     tag="${BASH_REMATCH[1]}"
-    flask_version="$(print_flask_version)"
+    flask_version="$(print_build_version 'flask')"
+    mmi_version="$(print_build_version 'mmi')"
 
     install_github_cli
 
@@ -67,12 +72,15 @@ then
         --attach builds/metamask-firefox-*.zip \
         --attach builds-flask/metamask-flask-chrome-*.zip \
         --attach builds-flask/metamask-flask-firefox-*.zip \
+        --attach builds-mmi/metamask-mmi-chrome-*.zip \
+        --attach builds-mmi/metamask-mmi-firefox-*.zip \
         --message "Version ${tag##v}" \
         --message "$release_body" \
         --commitish "$CIRCLE_SHA1" \
         "$tag"
 
-    publish_flask_tag "${flask_version}"
+    publish_tag 'Flask' "${flask_version}"
+    publish_tag 'MMI' "${mmi_version}"
 else
     printf '%s\n' 'Version not found in commit message; skipping GitHub Release'
     exit 0