Skip to content

Commit 8603dd5

Browse files
committed
Merge branch 'release/1.4.1' into released
2 parents 05e4706 + 123db05 commit 8603dd5

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

Diff for: README.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ For general introductions, see https://Maskbook.com/
1111
- License: AGPL
1212
- Code Style: Use [prettier](https://github.com/prettier/prettier)
1313
- [Git flow](https://github.com/nvie/gitflow) enabled, `master` as the latest branch, `released` as the stable branch
14+
- Use [Conventional Commits](https://www.conventionalcommits.org/) since 1.4.0
1415
- 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
1516
- Data transfer between users: We're using [gun.js](https://gun.eco)
1617

Diff for: config-overrides.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ const path = require('path')
22

33
process.env.BROWSER = 'none'
44
module.exports = function override(/** @type{import("webpack").Configuration} */ config, env) {
5-
// CSP bans eval and non-inline source-map not working
6-
config.devtool = 'inline-source-map'
5+
// CSP bans eval
6+
// And non-inline source-map not working
7+
if (env === 'development') config.devtool = 'inline-source-map'
78
config.entry = {
89
app: path.join(__dirname, './src/index.tsx'),
910
contentscript: path.join(__dirname, './src/content-script.ts'),
@@ -16,8 +17,11 @@ module.exports = function override(/** @type{import("webpack").Configuration} */
1617
// Leads a loading failure in background service
1718
config.optimization.runtimeChunk = false
1819
config.optimization.splitChunks = undefined
20+
1921
// Dismiss warning for gun.js
22+
config.module.wrappedContextCritical = false
2023
config.module.exprContextCritical = false
24+
config.module.unknownContextCritical = false
2125

2226
config.plugins.push(
2327
new (require('write-file-webpack-plugin'))({

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "maskbook",
3-
"version": "1.4.0",
3+
"version": "1.4.1",
44
"private": true,
55
"dependencies": {
66
"@holoflows/kit": "https://github.com/DimensionDev/holoflows-kit",

Diff for: public/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json.schemastore.org/chrome-manifest",
33
"name": "Maskbook",
4-
"version": "1.4.0",
4+
"version": "1.4.1",
55
"manifest_version": 2,
66
"content_scripts": [
77
{

0 commit comments

Comments
 (0)