Merge pull request MyEtherWallet#4595 from MyEtherWallet/staging

release: 🔥 v6.7.0-hotfix.2

Author: gamalielhere

.github/workflows/add-to-codecov.yml

@@ -33,10 +33,11 @@ jobs:
 
       - name: add to codecov
         run: |
-          ci_env='-e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID'
+          git config --global --add safe.directory '*'
+          ci_env=`bash <(curl -s https://codecov.io/env)`
           docker run $ci_env --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run codecov"
 
       - name: upload to codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true

.github/workflows/run-on-pr.yml

@@ -35,10 +35,11 @@ jobs:
 
       - name: add to codecov
         run: |
-          ci_env='-e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID'
+          git config --global --add safe.directory '*'
+          ci_env=`bash <(curl -s https://codecov.io/env)`
           docker run $ci_env --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run codecov"
 
       - name: upload to codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true

CHANGELOG.md

@@ -1,3 +1,10 @@
+### Release v6.7.0-hotfix.2
+
+### devop
+
+* sync develop [#4585](https://github.com/MyEtherWallet/MyEtherWallet/pull/4585)
+* seo token pages [#4591](https://github.com/MyEtherWallet/MyEtherWallet/pull/4591)
+
 ### Release v6.7.0-hotfix.1
 
 ### fix

Dockerfile

@@ -1,9 +1,9 @@
-FROM node:12-stretch
+FROM node:14-buster
 RUN apt update
 RUN apt install nasm -y
 ENV HOME /home
 ENV NODE_OPTIONS --max-old-space-size=8192
-RUN npm install [email protected] -g
+RUN npm install npm@^6.14 -g
 RUN node -v && npm -v
 COPY package*.json ./
 COPY package-audit.js ./

builds/liveConfig.js

@@ -13,7 +13,8 @@ const exportObj = {
       importWorkboxFrom: 'local',
       skipWaiting: true,
       clientsClaim: true,
-      navigateFallback: '/index.html'
+      navigateFallback: '/index.html',
+      navigateFallbackBlacklist: [/^\/pages/]
     }
   },
   chainWebpack: config => {

connections.js

@@ -86,5 +86,6 @@ module.exports = [
   'https://eth-mainnet.alchemyapi.io:443', // Unstoppable domains
   'https://polygon-mainnet.g.alchemy.com:443', // Unstoppable domains
   'https://unstoppabledomains.g.alchemy.com:443', // Unstoppable domains
-  'https://metadata.unstoppabledomains.com:443' // Unstoppable domains
+  'https://metadata.unstoppabledomains.com:443', // Unstoppable domains
+  'https://mew-seo-pages.pages.dev:443' //pages
 ];