Skip to content

Commit

Permalink
Merge branch 'release/1.4.1' into released
Browse files Browse the repository at this point in the history
  • Loading branch information
Jack-Works committed Jul 8, 2019
2 parents 05e4706 + 123db05 commit 8603dd5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For general introductions, see https://Maskbook.com/
- License: AGPL
- Code Style: Use [prettier](https://github.com/prettier/prettier)
- [Git flow](https://github.com/nvie/gitflow) enabled, `master` as the latest branch, `released` as the stable branch
- Use [Conventional Commits](https://www.conventionalcommits.org/) since 1.4.0
- Crypto: We're using [Elliptic Curve Cryptography (ECC)](https://en.wikipedia.org/wiki/ECC) of the [SECP256-k1](https://en.bitcoin.it/wiki/Secp256k1) parameters for [secret sharing](https://en.wikipedia.org/wiki/Elliptic-curve_Diffie–Hellman) and [AES-GCM](https://en.wikipedia.org/wiki/Galois/Counter_Mode) for encryption
- Data transfer between users: We're using [gun.js](https://gun.eco)

Expand Down
8 changes: 6 additions & 2 deletions config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ const path = require('path')

process.env.BROWSER = 'none'
module.exports = function override(/** @type{import("webpack").Configuration} */ config, env) {
// CSP bans eval and non-inline source-map not working
config.devtool = 'inline-source-map'
// CSP bans eval
// And non-inline source-map not working
if (env === 'development') config.devtool = 'inline-source-map'
config.entry = {
app: path.join(__dirname, './src/index.tsx'),
contentscript: path.join(__dirname, './src/content-script.ts'),
Expand All @@ -16,8 +17,11 @@ module.exports = function override(/** @type{import("webpack").Configuration} */
// Leads a loading failure in background service
config.optimization.runtimeChunk = false
config.optimization.splitChunks = undefined

// Dismiss warning for gun.js
config.module.wrappedContextCritical = false
config.module.exprContextCritical = false
config.module.unknownContextCritical = false

config.plugins.push(
new (require('write-file-webpack-plugin'))({
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "maskbook",
"version": "1.4.0",
"version": "1.4.1",
"private": true,
"dependencies": {
"@holoflows/kit": "https://github.com/DimensionDev/holoflows-kit",
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json.schemastore.org/chrome-manifest",
"name": "Maskbook",
"version": "1.4.0",
"version": "1.4.1",
"manifest_version": 2,
"content_scripts": [
{
Expand Down

0 comments on commit 8603dd5

Please sign in to comment.