Skip to content

Commit

Permalink
Merge branch 'release/1.7.0' into released
Browse files Browse the repository at this point in the history
  • Loading branch information
Jack-Works committed Oct 12, 2019
2 parents 11a05e6 + e38cefd commit 484bf36
Show file tree
Hide file tree
Showing 187 changed files with 7,037 additions and 3,791 deletions.
32 changes: 21 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,34 @@ jobs:
- v1-maskbook-
- run:
name: Build Maskbook
command: |
yarn install --link-duplicates --frozen-lockfile
yarn just lint
yarn build
sudo apt-get install zip
cd build
zip -r ../Maskbook.zip ./*
command: node ./scripts/ci-build.js
- save_cache:
paths:
- node_modules
key: v1-maskbook-{{ .Branch }}-{{ checksum "yarn.lock" }}
- store_artifacts:
path: Maskbook.zip
destination: /Maskbook.zip
path: Maskbook.base.zip
destination: /Maskbook.base.zip
- store_artifacts:
path: Maskbook.iOS.zip
destination: /Maskbook.iOS.zip
- store_artifacts:
path: Maskbook.chromium.zip
destination: /Maskbook.chromium.zip
- store_artifacts:
path: Maskbook.firefox.zip
destination: /Maskbook.firefox.zip
- store_artifacts:
path: Maskbook.gecko.zip
destination: /Maskbook.gecko.zip
- persist_to_workspace:
root: ~/repo/
paths:
- Maskbook.zip
- Maskbook.base.zip
- Maskbook.iOS.zip
- Maskbook.chromium.zip
- Maskbook.firefox.zip
- Maskbook.gecko.zip
publish-github-release:
docker:
- image: cibuilds/github:0.10
Expand All @@ -56,7 +66,7 @@ jobs:
🐛 Bug Fixes
👩‍💻 Miscellaneous" -replace -draft -prerelease $(git describe HEAD) ~/repo/Maskbook.zip
👩‍💻 Miscellaneous" -replace -draft $(git describe HEAD) ~/repo/Maskbook.base.zip
# -b BODY \ # Set text describing the contents of the release
# -delete \ # Delete release and its git tag in advance if it exists (same as -recreate)
# -n TITLE \ # Set release title
Expand Down
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
root = true

[*]
indent_size = 4
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space

[*]
indent_size = 4

[{.*rc,ts*.json,package.json}]
indent_size = 2
3 changes: 2 additions & 1 deletion .prettierignore → .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
package.json
package-lock.json
build/
dist/
public/polyfill
src/utils/jss/
src/polyfill
49 changes: 21 additions & 28 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,27 @@
{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 7,
"sourceType": "module",
"project": "./tsconfig.json"
"ecmaVersion": 2020,
"sourceType": "module"
},
"extends": ["plugin:prettier/recommended"],
"env": {
"node": true
},
"extends": [
"plugin:import/typescript"
],
"plugins": ["@typescript-eslint", "import", "react-hooks"],
"rules": {
"@typescript-eslint/await-thenable": 2,
"import/no-deprecated": 2,
"no-plusplus": 2,
"no-bitwise": 2,
"no-new-wrappers": 2,
"constructor-super": 2,
"no-redeclare": 2,
"no-eval": 2,
"@typescript-eslint/no-for-in-array": 2,
"no-template-curly-in-string": 2,
"no-return-await": 2,
"no-sparse-arrays": 2,
"dot-notation": 2,
"no-fallthrough": 2,
"prefer-const": 2,
"eqeqeq": 2,
"no-extra-bind": 2,
"use-isnan": 2,
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn"
"no-plusplus": "error",
"no-bitwise": "error",
"no-new-wrappers": "error",
"constructor-super": "error",
"no-redeclare": "error",
"no-eval": "error",
"no-template-curly-in-string": "error",
"no-return-await": "error",
"no-sparse-arrays": "error",
"dot-notation": "error",
"no-fallthrough": "error",
"prefer-const": "error",
"eqeqeq": "error",
"no-extra-bind": "error",
"use-isnan": "error"
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ yarn-debug.log*
yarn-error.log*

.firefox
.chrome
1 change: 1 addition & 0 deletions .storybook/addons.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ import '@storybook/addon-knobs/register'
import '@storybook/addon-actions/register'
import '@storybook/addon-links/register'
import '@storybook/addon-viewport/register'
import 'storybook-addon-material-ui/register'
2 changes: 1 addition & 1 deletion .storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ addParameters({
// Addons
addDecorator(withKnobs)
// Theme for MUI
addDecorator(muiTheme([MaskbookLightTheme, MaskbookDarkTheme]))
addDecorator(muiTheme([MaskbookDarkTheme, MaskbookLightTheme]))
5 changes: 5 additions & 0 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
const { TsConfigPathsPlugin } = require('awesome-typescript-loader')
module.exports = ({ config }) => {
config.module.rules.push({
test: /\.(ts|tsx)$/,
use: [
{
loader: require.resolve('awesome-typescript-loader'),
options: {
transpileOnly: true,
},
},
],
})
config.resolve.extensions.push('.ts', '.tsx')
config.module.rules = config.module.rules.filter(x => x.enforce !== 'pre')
config.plugins.push(new TsConfigPathsPlugin({ isolatedModules: false }))
return config
}
20 changes: 15 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Maskbook · [![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square)](https://github.com/DimensionDev/Maskbook/blob/master/LICENSE) [![Circle CI](https://img.shields.io/circleci/project/github/DimensionDev/Maskbook.svg?style=flat-square&logo=circleci)](https://circleci.com/gh/DimensionDev/Maskbook) [![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)][crext]
# Maskbook · [![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square)](https://github.com/DimensionDev/Maskbook/blob/master/LICENSE) [![Circle CI](https://img.shields.io/circleci/project/github/DimensionDev/Maskbook.svg?style=flat-square&logo=circleci)](https://circleci.com/gh/DimensionDev/Maskbook) [![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&label=Chrome%20store)][crext] [![Mozilla Add-on](https://img.shields.io/amo/v/maskbook?label=Firefox%20store&style=flat-square)][fxaddon]

Encrypt your posts & chats on You-Know-Where. Allow only your friends to decrypt.

For general introductions, see https://Maskbook.com/

[Install Maskbook on Chrome Web Store][crext]
- [Maskbook on Chrome Web Store][crext]
- [Maskbook on Firefox Addon Store][fxaddon] (Works on Android too!)

[crext]: https://chrome.google.com/webstore/detail/maskbook/jkoeaghipilijlahjplgbfiocjhldnap/
[crext]: https://chrome.google.com/webstore/detail/maskbook/jkoeaghipilijlahjplgbfiocjhldnap/
[fxaddon]: https://addons.mozilla.org/en-US/firefox/addon/maskbook/

## Documentation for developers

Expand All @@ -23,12 +25,20 @@ For general introductions, see https://Maskbook.com/

#### Build and developing

- `yarn firefox` runs extension in a new firefox session.
- `yarn start` runs extension in other browsers, manually loading required.
- `yarn start:firefox` runs extension in a new firefox session.
- `yarn start:android` runs extension in a usb connected android device.
- `yarn start` runs extension in other browsers, manually loading required.
[This](https://chrome.google.com/webstore/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) plugin may help you to reload extension quicker.
- `yarn storybook` to start StoryBook. Used for UI only developing.
- `yarn build` build a production version. Output files in `./build/`

#### Conditional compilation

- If branch name contains `full`, CI will build for all targets
- If branch name contains `ios`, CI will build for target `iOS`
- If branch name contains `android` or `gecko`, CI will build for target `firefox` `gecko`
- For any other branches, CI will build for target `base` `chromium` `firefox`

#### Non-famous libraries we are using

- `@holoflows/kit` - A toolkit for extension developing
Expand Down
3 changes: 3 additions & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: ['@commitlint/config-conventional'],
}

0 comments on commit 484bf36

Please sign in to comment.