Merge branch 'release/1.10.10' into released

Author: guanbinrui

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2.1
 executors:
     maskbook_node:
         docker:
-            - image: circleci/node:13.2.0
+            - image: circleci/node:13.2.0-browsers
         working_directory: ~/repo
 commands:
     restore_workspace:
@@ -22,13 +22,13 @@ jobs:
             - restore_cache:
                   name: Restore Yarn Package Cache
                   keys:
-                      - v1-maskbook-cache
+                      - v2-maskbook-cache
             - run:
                   name: Install Dependencies
                   command: yarn install --link-duplicates --frozen-lockfile
             - save_cache:
                   name: Save Yarn Package Cache
-                  key: v1-maskbook-cache
+                  key: v2-maskbook-cache
                   paths:
                       - ~/.cache/yarn
             - persist_to_workspace:
@@ -41,7 +41,7 @@ jobs:
             - restore_workspace
             - run:
                   name: 'TypeScript type check'
-                  command: yarn tsc -p tsconfig_cjs.json --noEmit
+                  command: yarn tsc --noEmit
     eslint:
         executor: maskbook_node
         steps:
@@ -82,6 +82,23 @@ jobs:
                   path: reports/junit
             - store_artifacts:
                   path: coverage
+    e2e:
+        executor: maskbook_node
+        steps:
+            - restore_workspace
+            - run:
+                  name: Setup E2E
+                  command: |
+                      mkdir -p ./screenshots
+                      yarn build:e2e
+            - run:
+                  name: Jest E2E
+                  command: yarn test:e2e
+            - run:
+                  name: Teardown E2E
+                  command: rm -rf ./build
+            - store_artifacts:
+                  path: screenshots
     build:
         executor: maskbook_node
         steps:
@@ -91,7 +108,7 @@ jobs:
                   command: sudo apt-get install zip
             - run:
                   name: Build Maskbook
-                  command: node ./scripts/ci-build.js
+                  command: yarn build-ci
             - store_artifacts:
                   path: Maskbook.base.zip
                   destination: /Maskbook.base.zip
@@ -184,6 +201,10 @@ workflows:
                   requires:
                       # Fail quick with type error.
                       - typescript
+            - e2e:
+                  requires:
+                      # Avoid accessing build/ folder at the same time
+                      - build
             - publish-github-release:
                   requires:
                       - build

.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+    "extends": ["@commitlint/config-conventional"]
+}

.gitignore

@@ -14,11 +14,13 @@ public/polyfill
 
 # testing
 /coverage
+/junit.xml
 
 # production
 /build
 /dist
 /storybook-static
+/Maskbook.*.zip
 
 # misc
 .DS_Store
@@ -31,6 +33,9 @@ public/polyfill
 # contracts
 /contracts
 
+# e2e
+/screenshots
+
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "typescript.tsdk": "node_modules/typescript/lib",
+    "editor.formatOnSave": true,
     "i18n-ally.sourceLanguage": "en",
     "i18n-ally.displayLanguage": "zh",
     "i18n-ally.localesPaths": "src/_locales",

commitlint.config.js

@@ -23,7 +23,9 @@ function chromium(manifest) {}
 /**
  * @param {typeof base} manifest
  */
-function WKWebview(manifest) {}
+function WKWebview(manifest) {
+    manifest['iOS-injected-scripts'] = ['js/injected-script.js']
+}
 function development(manifest, target) {
     manifest.key = // ID：jkoeaghipilijlahjplgbfiocjhldnap
         'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz51rhO1w+wD0EKZJEFJaSMkIcIj0qRadfi0tqcl5nbpuJAsafvLe3MaTbW9LhbixTg9PHybO3tlYUFJrZgUuZlEvt2T6SKIu6Rs9e9B3/brNQG3+hCHudbZkq2WG2IzO44dglrs24bRp/pV5oIif0bLuwrzvYsPQ6hgSp+5gc4pg0LEJPLFp01fbORDknWt8suJmEMz7S0O5+u13+34NvxYzUNeLJF9gYrd4zzrAFYITDEYcqr0OMZvVrKz7IkJasER1uJyoGj4gFJeXNGE8y4Sqb150wBju70lKNKlNevWDRJKasG9CjagAD2+BAfqNyltn7KwK7jAyL1w6d6mOwIDAQAB'

config-overrides/manifest.overrides.js

@@ -0,0 +1,16 @@
+describe('dashboard - setup a account', () => {
+    beforeAll(async () => {
+        await page.goto('chrome-extension://jkoeaghipilijlahjplgbfiocjhldnap/index.html')
+    })
+
+    it('render welcome page', async () => {
+        const setupButton = await page.waitFor('a[href="#/initialize/1s"]')
+        expect(await setupButton.evaluate(e => e.textContent.toLowerCase())).toBe('set up')
+    })
+
+    it('take a screenshot', async () => {
+        await page.screenshot({
+            path: './screenshots/welcome.png',
+        })
+    })
+})

e2e/dashboard.spec.ts

@@ -0,0 +1,5 @@
+const path = require('path')
+module.exports = {
+    preset: 'jest-puppeteer',
+    testRegex: ['/e2e/.*\\.[jt]sx?$'],
+}

jest-e2e.config.js

@@ -0,0 +1,16 @@
+const path = require('path')
+const extPath = path.join(__dirname, './build')
+module.exports = {
+    launch: {
+        dumpio: true,
+        headless: false,
+        args: [
+            '--no-sandbox',
+            '--disable-infobars',
+            `--disable-extensions-except=${extPath}`,
+            `--load-extension=${extPath}`,
+        ],
+    },
+    browser: 'chromium',
+    browserContext: 'default',
+}

jest-puppeteer.config.js

@@ -1,6 +1,7 @@
 const path = require('path')
 
 module.exports = {
+    testRegex: ['/__tests__/.*\\.[jt]sx?$'],
     preset: 'ts-jest',
     testEnvironment: 'jest-environment-jsdom-fourteen',
     globals: {
@@ -9,6 +10,7 @@ module.exports = {
         },
     },
     globalSetup: path.join(__dirname, './scripts/jest-global-setup'),
+    globalTeardown: path.join(__dirname, './scripts/jest-global-teardown'),
     setupFiles: [
         require.resolve('jest-webextension-mock'),
         require.resolve('fake-indexeddb/auto'),