aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorLibravatar Amine Mouafik <amine@mouafik.fr>2020-10-10 00:55:02 +0100
committerLibravatar Amine Mouafik <amine@mouafik.fr>2020-10-10 00:55:02 +0100
commita6ab94d31ae18ae56ed3e5e2f046704e2fe8f833 (patch)
tree87a928f5da65f1238ca6ffa0d27142cd8c65b69b /package.json
parent5.6.0-nightly.4 and trigger AppVeyor nightly build [skip travisci] (diff)
parentUse imagemin to minify images (#1008) (diff)
downloadferdium-app-a6ab94d31ae18ae56ed3e5e2f046704e2fe8f833.tar.gz
ferdium-app-a6ab94d31ae18ae56ed3e5e2f046704e2fe8f833.tar.zst
ferdium-app-a6ab94d31ae18ae56ed3e5e2f046704e2fe8f833.zip
Merge branch 'develop' into nightly
# Conflicts: # recipes
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/package.json b/package.json
index 77fab6d94..fa68cf1ec 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,8 @@
34 "update-submodules": "git submodule update --remote --force && git add .", 34 "update-submodules": "git submodule update --remote --force && git add .",
35 "prepare-code": "npm run update-submodules && npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", 35 "prepare-code": "npm run update-submodules && npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
36 "build-theme-info": "node src/scripts/build-theme-info.js", 36 "build-theme-info": "node src/scripts/build-theme-info.js",
37 "link-readme": "node src/scripts/link-readme.js" 37 "link-readme": "node src/scripts/link-readme.js",
38 "minify-images": "./minify-images.sh"
38 }, 39 },
39 "keywords": [], 40 "keywords": [],
40 "author": "Amine Mouafik <amine@mouafik.fr>", 41 "author": "Amine Mouafik <amine@mouafik.fr>",
@@ -160,7 +161,7 @@
160 "cross-env": "^5.0.5", 161 "cross-env": "^5.0.5",
161 "cz-conventional-changelog": "2.1.0", 162 "cz-conventional-changelog": "2.1.0",
162 "dotenv": "^4.0.0", 163 "dotenv": "^4.0.0",
163 "electron": "9.3.1", 164 "electron": "9.3.2",
164 "electron-builder": "22.8.1", 165 "electron-builder": "22.8.1",
165 "electron-notarize": "0.2.1", 166 "electron-notarize": "0.2.1",
166 "electron-rebuild": "1.11.0", 167 "electron-rebuild": "1.11.0",
@@ -181,6 +182,7 @@
181 "hex-rgb": "3.0.0", 182 "hex-rgb": "3.0.0",
182 "html-webpack-plugin": "4.0.0-beta.5", 183 "html-webpack-plugin": "4.0.0-beta.5",
183 "husky": "^1.1.4", 184 "husky": "^1.1.4",
185 "imagemin-cli": "6.0.0",
184 "jest": "24.9.0", 186 "jest": "24.9.0",
185 "kebab-case": "1.0.0", 187 "kebab-case": "1.0.0",
186 "lerna": "3.19.0", 188 "lerna": "3.19.0",