Merge branch 'develop' into storybook-fix

DimensionDev · Jun 24, 2021 · 4db369c · 4db369c
2 parents 0c46ca6 + 2308689
commit 4db369c
Show file tree

Hide file tree

Showing 727 changed files with 8,771 additions and 3,977 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [master, released]
+    branches: [master, develop, released]
   pull_request:
-    branches: [master, released]
+    branches: [master, develop, released]
 
 jobs:
   build:
@@ -27,11 +27,11 @@ jobs:
           restore-keys: ${{ runner.os }}-node-
       - uses: actions/cache@v2
         with:
-          path: "**/dist/"
-          key: ${{ runner.os }}-tsc-${{ hashFiles('**/tsconfig.json') }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
+          path: "packages/**/dist/"
+          key: ${{ runner.os }}-tsc-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
           restore-keys: |
-            ${{ runner.os }}-tsc-${{ hashFiles('**/tsconfig.json') }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-            ${{ runner.os }}-tsc-${{ hashFiles('**/tsconfig.json') }}
+            ${{ runner.os }}-tsc-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
+            ${{ runner.os }}-tsc-${{ hashFiles('packages/**/tsconfig.json') }}
       - uses: actions/cache@v2
         with:
           path: ./packages/maskbook/node_modules/.cache/webpack/

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -4,11 +4,11 @@ name: E2E
 # events but only for the master branch
 on:
   push:
-    # branches: [master, released]
+    # branches: [master, develop, released]
     branches-ignore:
       - '**'
   pull_request:
-    # branches: [master, released]
+    # branches: [master, develop, released]
     branches-ignore:
       - '**'
 

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -2,9 +2,9 @@ name: Linters and tests
 
 on:
   push:
-    branches: [master, released]
+    branches: [master, develop, released]
   pull_request:
-    branches: [master, released]
+    branches: [master, develop, released]
 
 jobs:
   prettier:
@@ -48,15 +48,15 @@ jobs:
           restore-keys: ${{ runner.os }}-node-
       - uses: actions/cache@v2
         with:
-          path: "**/dist/"
+          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-${{ hashFiles('**/tsconfig.json') }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }}
+          key: ${{ runner.os }}-tsc-${{ 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-${{ hashFiles('**/tsconfig.json') }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-            ${{ runner.os }}-tsc-${{ hashFiles('**/tsconfig.json') }}
+            ${{ runner.os }}-tsc-${{ hashFiles('packages/**/tsconfig.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
+            ${{ runner.os }}-tsc-${{ hashFiles('packages/**/tsconfig.json') }}
       - run: npx pnpm install
       - run: npx build -- echo "Check tsc"
   eslint:

diff --git a/docs/i18n-guide.md b/docs/i18n-guide.md
@@ -8,5 +8,8 @@
 
    Please use [Add new locale request][request]
 
+3. When add a new i18n text, add English version only,
+   leave the rest to professional translators
+
 [iso-639-1]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 [request]: https://github.com/DimensionDev/Maskbook/issues/new?template=add-locale.md&title=%5BLocale%5D+
diff --git a/docs/npm-scope.md b/docs/npm-scope.md
@@ -0,0 +1,9 @@
+# npm scope
+
+We controlled the following npm scope by [@yisiliu](https://github.com/yisiliu)
+
+- <https://npmjs.com/~dimensiondev>
+- <https://npmjs.com/~holoflows>
+- <https://npmjs.com/~maskbook>
+- <https://npmjs.com/~masknet>
+- <https://npmjs.com/~masknetwork>
diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
     "test:ci": "jest --verbose --ci --collectCoverage=true --reporters=default --reporters=jest-junit -w 1 --forceExit",
     "test:e2e": "jest --verbose --runInBand --config=jest-e2e.config.js",
     "preinstall": "npx only-allow pnpm",
-    "prepare": "husky install",
-    "postinstall": "patch-package"
+    "postinstall": "patch-package",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "*": "prettier --write --ignore-unknown",
@@ -49,9 +49,9 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
-    "@dimensiondev/cli": "workspace:*",
     "@magic-works/commonjs-import.meta": "^1.0.1",
     "@magic-works/i18n-codegen": "^0.0.6",
+    "@masknet/cli": "workspace:*",
     "@nice-labs/git-rev": "^3.5.0",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@dimensiondev/cli",
+  "name": "@masknet/cli",
   "private": true,
   "bin": {
     "build": "./build/build.ts",

diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md
@@ -29,6 +29,15 @@ Mainnet 0xf110fec3075d7531141b6bf16b11604cb028a17b
 Ropsten 0x37c2f41085ff45f54652c359a7de4deb9d125bf2
 ```
 
+> Jun-18-2021
+> branch: <https://github.com/DimensionDev/InitialTwitterOffering/tree/bsc_matic_ito>
+> commit: a6bf007f8cbe024920f32c31479287b79fe53601
+
+```plain
+Bsc 0x54a0A221C25Fc0a347EC929cFC5db0be17fA2a2B
+Polygon 0x981be454a930479d92C91a0092D204b64845A5D6
+```
+
 ## MaskITO
 
 > Feb-21-2021