Merge remote-tracking branch 'upstream/master' into codingsh/Integrate-Optimism

Author: developerfred

.circleci/config.yml

@@ -25,9 +25,12 @@ jobs:
           name: Restore PNPM Package Cache
           keys:
             - v3-mask-cache-pnpm
+      - run:
+          name: Install PNPM
+          command: sudo npm install -g [email protected]
       - run:
           name: Install Dependencies
-          command: npx pnpm@6.4.0 install --frozen-lockfile --store-dir ~/.pnpm/
+          command: pnpm install --frozen-lockfile --store-dir ~/.pnpm/
       - save_cache:
           name: Save NPM Package Cache
           key: v3-mask-cache-npm
@@ -41,6 +44,9 @@ jobs:
     executor: mask_node
     steps:
       - restore_workspace
+      - run:
+          name: Install PNPM
+          command: sudo npm install -g [email protected]
       - run:
           name: Build Mask Network
           command: npx gulp build-ci

.eslintrc.json

@@ -23,7 +23,14 @@
         "no-restricted-globals": ["error", "event", "name", "length", "closed"],
         "no-restricted-imports": [
             "error",
-            { "paths": [{ "name": "lodash", "message": "Please use lodash-es instead." }] }
+            {
+                "paths": [
+                    { "name": "lodash", "message": "Please use lodash-unified instead." },
+                    { "name": "lodash-es", "message": "Please use lodash-unified instead." },
+                    { "name": "date-fns", "message": "Please use date-fns/{submodule} instead." },
+                    { "name": "date-fns/esm", "message": "Please use date-fns/{submodule} instead." }
+                ]
+            }
         ],
         "no-return-await": "error",
         "no-sparse-arrays": "error",

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: https://donate.unlock-protocol.com/?r=DimensionDev/Maskbook
+custom: #

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Mask
-    url: https://github.com/DimensionDev/Maskbook/discussions
+    url: https://we.mask.io/
     about: Where talks about Mask happen.

.github/pull_request_template.md

@@ -1,2 +1,35 @@
-<!-- Please refer to the related issue number -->
-closes #
+## Description
+
+<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
+
+Closes # (NO_ISSUE)
+
+## Type of change
+
+<!-- Please remove options that are not relevant. -->
+
+- [ ] Documentation
+- [ ] Code refactoring (Restructuring existing code w/o changing its observable behavior)
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (a fix or feature that would make something no longer possible to do/require old user must upgrade their Mask Network to this new version)
+
+## Previews
+
+<!-- Please attach screenshots if there are any visual changes. -->
+
+## Checklist
+
+- [ ] My code follows the style guidelines of this project.
+- [ ] I have performed a self-review of my own code.
+  - [ ] I have removed all in development `console.log`s
+  - [ ] I have removed all commented code.
+- [ ] I have commented on my code, particularly in hard-to-understand areas.
+- [ ] I have read [Internationalization Guide](https://github.com/DimensionDev/Maskbook/blob/develop/docs/i18n-guide.md) and moved text fields to the i18n JSON file.
+
+If this PR depends on external APIs:
+
+- [ ] I have configured those APIs with CORS headers to let extension requests get passed. <!-- If you don't have permission to modify the server, please let us know it. -->
+  - chrome extension: `chrome-extension://[id]`
+  - firefox extension: `moz-extension://[id]`
+- [ ] I have delegated all web requests to the background service via the internal RPC bridge.

.github/semantic.yml

@@ -0,0 +1,2 @@
+enabled: true
+titleOnly: true

.github/workflows/bot.yml

@@ -6,6 +6,13 @@ on:
   pull_request:
     branches: [master, develop*, released]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   merge_conflict_check:
     runs-on: ubuntu-20.04

.github/workflows/compile.yml

@@ -1,11 +1,18 @@
-name: Build
+name: Compile
 
 on:
   push:
     branches: [master, develop*, released]
   pull_request:
     branches: [master, develop*, released]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-20.04
@@ -21,34 +28,22 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-      - uses: actions/setup-node@v2
-      - name: Restore pnpm cache
-        uses: actions/cache@v2
+      - uses: pnpm/action-setup@v2
         with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-node-
-      - name: Restore TypeScript incremental build cache
-        uses: actions/cache@v2
+          version: '6.23.1'
+      - uses: actions/setup-node@v2
         with:
-          path: packages/**/dist
-          # actions/cache will not upload changes in cache if primary key hits
-          # by adding date to the primary key, we can ensure the cache updates on the first build of the day
-          key: ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
-          # Allow fallback to cache of different dependencies but not allowing fallback to different tsconfig
-          # because that might indicates a structural/flags changes in tsc emit.
-          restore-keys: |
-            ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
-            ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}
+          node-version: '16'
+          cache: 'pnpm'
       - name: Restore Webpack cache
         uses: actions/cache@v2
         with:
-          path: packages/maskbook/node_modules/.cache/
+          path: packages/mask/node_modules/.cache/
           key: ${{ runner.os }}-extension-${{ hashFiles('pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
           # Not fallback to different dependencies. Webpack seems like have bug.
           # An example caused by the webpack cache bug: https://github.com/facebook/react/issues/21587
           restore-keys: ${{ runner.os }}-extension-${{ hashFiles('pnpm-lock.yaml') }}
-      - run: npx pnpm install
+      - run: pnpm install
       - run: npx gulp build-ci
       - name: Upload `MaskNetwork.base.zip`
         uses: actions/upload-artifact@v2

.github/workflows/linters.yml

@@ -6,6 +6,13 @@ on:
   pull_request:
     branches: [master, develop*, released]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   prettier:
     runs-on: ubuntu-20.04
@@ -14,21 +21,21 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: actions/setup-node@v2
-      - run: npx prettier@2.4.0 --list-different .
+      - run: npx prettier@2.5.0 --list-different .
   locale-kit:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+      - uses: pnpm/action-setup@v2
+        with:
+          version: '6.23.1'
       - uses: actions/setup-node@v2
-      - name: pnpm cache
-        uses: actions/cache@v2
         with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-node-
-      - run: npx pnpm install
+          node-version: '16'
+          cache: 'pnpm'
+      - run: pnpm install
       - run: npx gulp locale-kit
   type-check-and-jest:
     runs-on: ubuntu-20.04
@@ -40,46 +47,33 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+      - uses: pnpm/action-setup@v2
+        with:
+          version: '6.23.1'
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
-      - name: pnpm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-node-
-      - name: Restore TypeScript incremental build cache
-        uses: actions/cache@v2
-        with:
-          path: packages/**/dist
-          # actions/cache will not upload changes in cache if primary key hits
-          # by adding date to the primary key, we can ensure the cache updates on the first build of the day
-          key: ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
-          # Allow fallback to cache of different dependencies but not allowing fallback to different tsconfig
-          # because that might indicates a structural/flags changes in tsc emit.
-          restore-keys: |
-            ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
-            ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}
-      - run: npx pnpm install
+          cache: 'pnpm'
+      - run: pnpm install
       - run: npx gulp codegen
+      - run: npx gulp polyfill
       - run: node --experimental-vm-modules ./node_modules/jest/bin/jest.js
   eslint:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+      - uses: pnpm/action-setup@v2
+        with:
+          version: '6.23.1'
       - uses: actions/setup-node@v2
-      - name: pnpm cache
-        uses: actions/cache@v2
         with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-node-
-      - run: npx pnpm install
-      - run: npm run lint:ci -- --max-warnings=0
-      - run: npm run lint:ci -- --format=junit --output-file=reports/junit/eslint-results.xml
+          node-version: '16'
+          cache: 'pnpm'
+      - run: pnpm install
+      - run: pnpm run lint:ci -- --max-warnings=0
+      - run: pnpm run lint:ci -- --format=junit --output-file=reports/junit/eslint-results.xml
       - name: Upload eslint report
         uses: actions/upload-artifact@v2
         with:

.github/workflows/netlify.yml

@@ -6,6 +6,13 @@ on:
   pull_request:
     branches: [master, develop*, released]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   netlify:
     runs-on: ubuntu-20.04
@@ -20,25 +27,13 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-      - uses: actions/setup-node@v2
-      - name: Restore pnpm cache
-        uses: actions/cache@v2
+      - uses: pnpm/action-setup@v2
         with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-node-
-      - name: Restore TypeScript incremental build cache
-        uses: actions/cache@v2
+          version: '6.23.1'
+      - uses: actions/setup-node@v2
         with:
-          path: packages/**/dist
-          # actions/cache will not upload changes in cache if primary key hits
-          # by adding date to the primary key, we can ensure the cache updates on the first build of the day
-          key: ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
-          # Allow fallback to cache of different dependencies but not allowing fallback to different tsconfig
-          # because that might indicates a structural/flags changes in tsc emit.
-          restore-keys: |
-            ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
-            ${{ runner.os }}-tsc-v2-${{ hashFiles('packages/**/tsconfig.json') }}
+          node-version: '16'
+          cache: 'pnpm'
       - name: Restore Webpack cache
         uses: actions/cache@v2
         with:
@@ -49,7 +44,7 @@ jobs:
           # Not fallback to different dependencies. Webpack seems like have bug.
           # An example caused by the webpack cache bug: https://github.com/facebook/react/issues/21587
           restore-keys: ${{ runner.os }}-netlify-${{ hashFiles('pnpm-lock.yaml') }}
-      - run: npx pnpm install
+      - run: pnpm install
       - run: npx gulp build-ci-netlify
       - name: Deploy to Netlify
         uses: nwtgck/[email protected]