Merge branch 'release/1.2.0' into released

Author: Jack-Works

.storybook/addons.js

@@ -1,4 +1,3 @@
 import '@storybook/addon-knobs/register'
 import '@storybook/addon-actions/register'
 import '@storybook/addon-links/register'
-import '@storybook/addon-options/register'

.storybook/config.js

@@ -1,82 +1,27 @@
-import { configure, addDecorator } from '@storybook/react'
+import { addParameters, configure, addDecorator } from '@storybook/react'
 import { withKnobs } from '@storybook/addon-knobs'
-import { withInfo } from '@storybook/addon-info'
 import { muiTheme } from 'storybook-addon-material-ui'
-import { withOptions } from '@storybook/addon-options'
-import { themes } from '@storybook/components'
 import { MaskbookDarkTheme, MaskbookLightTheme } from '../src/utils/theme'
-import { merge } from 'lodash'
+import { create } from '@storybook/theming'
+function loadStories() {
+    require('../src/stories/index')
+}
+configure(loadStories, module)
 
-// UI
-addDecorator(
-    withOptions({
-        name: 'Maskbook',
-        addonPanelInRight: true,
-        // @ts-ignore
-        theme: { ...themes.dark, mainBackground: 'black' },
-    }),
-)
-addDecorator(
-    withInfo({
-        inline: true,
-        header: false,
-        TableComponent,
-        styles: x =>
-            merge(x, {
-                infoBody: { background: 'transparent', filter: 'invert(1)', padding: '0', border: 'none' },
-                infoStory: { background: '#e8e8e8', padding: '2em' },
-                infoContent: { marginTop: 16 },
-                jsxInfoContent: { filter: 'invert(1)', marginTop: 16 },
-                source: {
-                    h1: { fontWeight: 100 },
-                },
-                propTableHead: { fontWeight: 100 },
-            }),
-    }),
-)
+addParameters({
+    options: {
+        theme: create({
+            base: 'dark',
+            brandTitle: 'Maskbook',
+            brandUrl: 'https://maskbook.io/',
+            brandImage: 'https://maskbook.io/img/maskbook--logotype-white.png',
+        }),
+        isFullscreen: false,
+        panelPosition: 'right',
+        isToolshown: true,
+    },
+})
 // Addons
 addDecorator(withKnobs)
 // Theme for MUI
 addDecorator(muiTheme([MaskbookLightTheme, MaskbookDarkTheme]))
-function loadStories() {
-    require('../src/stories')
-}
-
-configure(loadStories, module)
-
-import React from 'react'
-import Table from '@material-ui/core/Table'
-import TableBody from '@material-ui/core/TableBody'
-import TableCell from '@material-ui/core/TableCell'
-import TableHead from '@material-ui/core/TableHead'
-import TableRow from '@material-ui/core/TableRow'
-
-function TableComponent({ propDefinitions }) {
-    const props = propDefinitions.map(({ property, propType, required, description, defaultValue }) => {
-        return (
-            <TableRow key={property}>
-                <TableCell>
-                    {property}
-                    {required ? null : '?'}
-                </TableCell>
-                <TableCell>{propType.name}</TableCell>
-                <TableCell>{defaultValue}</TableCell>
-                <TableCell>{description}</TableCell>
-            </TableRow>
-        )
-    })
-
-    return (
-        <Table>
-            <TableHead>
-                <TableRow>
-                    <TableCell>名称</TableCell>
-                    <TableCell>类型</TableCell>
-                    <TableCell>默认值</TableCell>
-                    <TableCell>描述</TableCell>
-                </TableRow>
-            </TableHead>
-            <TableBody>{props}</TableBody>
-        </Table>
-    )
-}

.storybook/webpack.config.js

@@ -1,5 +1,4 @@
-const path = require('path')
-module.exports = (baseConfig, env, config) => {
+module.exports = ({ config }) => {
     config.module.rules.push({
         test: /\.(ts|tsx)$/,
         use: [
@@ -12,5 +11,6 @@ module.exports = (baseConfig, env, config) => {
         ],
     })
     config.resolve.extensions.push('.ts', '.tsx')
+    config.module.rules = config.module.rules.filter(x => x.enforce !== 'pre')
     return config
 }

.vscode/component.code-snippets

@@ -1,12 +1,11 @@
-# Maskbook · ![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square) ![Ciecle CI](https://img.shields.io/circleci/project/github/project-maskbook/Maskbook.svg?style=flat-square&logo=circleci)
+# Maskbook · ![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square) ![Ciecle CI](https://img.shields.io/circleci/project/github/DimensionDev/Maskbook.svg?style=flat-square&logo=circleci) [![Join the chat at https://gitter.im/Maskbook/community](https://badges.gitter.im/Maskbook/community.svg)](https://gitter.im/Maskbook/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![Chrome Web Store](https://img.shields.io/chrome-web-store/v/jkoeaghipilijlahjplgbfiocjhldnap.svg?logo=Maskbook&logoColor=%231c68f3&style=flat-square)
 
-[![Join the chat at https://gitter.im/Maskbook/community](https://badges.gitter.im/Maskbook/community.svg)](https://gitter.im/Maskbook/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Encrypt your posts & chats on You-Know-Where. Allow only your friends to decrypt.
 
 For general introductions, see https://Maskbook.io/
 
-[Install Maskbook](https://maskbook.io/install/)
+[Install Maskbook on Chrome Web Store](https://chrome.google.com/webstore/detail/maskbook/jkoeaghipilijlahjplgbfiocjhldnap/)
 
 ## Documentation for developers
 

README.md

@@ -21,7 +21,12 @@ module.exports = function override(/** @type{import("webpack").Configuration} */
     config.module.unknownContextCritical = false
 
     // @ts-ignore
-    config.plugins.push(new (require('write-file-webpack-plugin'))())
+    config.plugins.push(
+        new (require('write-file-webpack-plugin'))({
+            test: /(static\/.*|.+\.png|index\.html|manifest\.json)/,
+        }),
+    )
+    // Write files to /public
     config.plugins.push(
         new (require('copy-webpack-plugin'))(
             [
@@ -36,6 +41,7 @@ module.exports = function override(/** @type{import("webpack").Configuration} */
     for (const x of config.module.rules) {
         if (!x.oneOf) continue
         for (const rule of x.oneOf) {
+            // Replace babel-loader with ts-loader
             if (rule.loader === require.resolve('babel-loader')) {
                 if (rule.include) {
                     rule.loader = require.resolve('ts-loader')
@@ -50,7 +56,11 @@ module.exports = function override(/** @type{import("webpack").Configuration} */
         }
     }
     config.module.rules.forEach(rule => {
+        // Remove the babel-loader
         if (rule.oneOf) rule.oneOf = rule.oneOf.filter(x => x.loader !== require.resolve('babel-loader'))
     })
+    // Disable the eslint linter. We have tslint.
+    config.module.rules = config.module.rules.filter(x => x.enforce !== 'pre')
+    config.output.futureEmitAssets = false
     return config
 }

config-overrides.js

@@ -1,39 +1,42 @@
 {
   "name": "maskbook",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "private": true,
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
-    "@types/chrome": "^0.0.81",
+    "@types/chrome": "^0.0.83",
     "@types/classnames": "^2.2.7",
     "@types/gun": "^0.9.1",
     "@types/jest": "^24.0.6",
     "@types/lodash-es": "^4.17.3",
-    "@types/node": "11.9.4",
-    "@types/react": "16.8.4",
-    "@types/react-dom": "16.8.2",
+    "@types/node": "11.13.7",
+    "@types/react": "16.8.14",
+    "@types/react-dom": "16.8.4",
+    "@types/react-jss": "^8.6.3",
     "@types/tiny-secp256k1": "^1.0.0",
     "classnames": "^2.2.6",
+    "construct-style-sheets-polyfill": "^1.0.3",
     "copy-webpack-plugin": "^5.0.0",
     "elliptic": "^6.4.1",
-    "gun": "0.2019.323",
+    "gun": "0.2019.422",
     "lodash-es": "^4.17.11",
     "node-sass": "^4.11.0",
     "npm-run-all": "^4.1.5",
     "pvtsutils": "^1.0.4",
     "react": "^16.8.3",
     "react-app-rewired": "^2.1.0",
     "react-dom": "^16.8.3",
-    "react-scripts": "2.1.5",
+    "react-jss": "^8.6.1",
+    "react-scripts": "3.0.0",
     "reflect-metadata": "^0.1.13",
-    "storybook-addon-material-ui": "0.9.0-alpha.17",
-    "tiny-secp256k1": "^1.0.1",
-    "ts-loader": "^5.3.3",
-    "tslint": "^5.12.1",
+    "storybook-addon-material-ui": "0.9.0-alpha.18",
+    "tiny-secp256k1": "^1.1.0",
+    "ts-loader": "^5.4.3",
+    "tslint": "^5.16.0",
     "typed-db": "^1.0.1-1",
-    "typescript": "^3.4.1",
-    "webcrypto-liner": "^0.1.38",
+    "typescript": "^3.4.4",
+    "webcrypto-liner": "0.1.38",
     "write-file-webpack-plugin": "^4.5.0"
   },
   "scripts": {
@@ -53,21 +56,19 @@
     "not op_mini all"
   ],
   "devDependencies": {
-    "@babel/core": "^7.3.3",
-    "@storybook/addon-actions": "^4.1.13",
-    "@storybook/addon-info": "^4.1.13",
-    "@storybook/addon-knobs": "^4.1.13",
-    "@storybook/addon-links": "^4.1.13",
-    "@storybook/addon-options": "^4.1.13",
-    "@storybook/addons": "^4.1.13",
-    "@storybook/react": "^4.1.13",
+    "@babel/core": "^7.4.3",
+    "@storybook/addon-actions": "^5.1.0-alpha.33",
+    "@storybook/addon-info": "^5.1.0-alpha.33",
+    "@storybook/addon-knobs": "^5.1.0-alpha.33",
+    "@storybook/addon-links": "^5.1.0-alpha.33",
+    "@storybook/addons": "^5.1.0-alpha.33",
+    "@storybook/react": "^5.1.0-alpha.33",
     "@types/storybook__addon-actions": "^3.4.2",
     "@types/storybook__addon-info": "^4.1.0",
-    "@types/storybook__addon-knobs": "^4.0.1",
+    "@types/storybook__addon-knobs": "^5.0.0",
     "@types/storybook__addon-links": "^3.3.4",
-    "@types/storybook__addon-options": "^4.0.1",
     "@types/storybook__react": "^4.0.1",
     "awesome-typescript-loader": "^5.2.1",
-    "react-docgen-typescript-loader": "^3.0.1"
+    "react-docgen-typescript-loader": "^3.1.0"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "http://json.schemastore.org/chrome-manifest",
     "name": "Maskbook",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "manifest_version": 2,
     "content_scripts": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "web_accessible_resources": ["*.css", "*.js", "*.jpg", "*.png"],
-    "permissions": ["https://www.facebook.com/", "storage", "downloads", "background"],
+    "permissions": ["https://*.facebook.com/*", "storage", "downloads", "background"],
     "background": {
         "scripts": ["/static/js/backgroundservice.js"]
     },