From 9974e35656d419d010004b026547aaaad5fa883d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Luk=C3=A1=C5=A1?= Date: Mon, 12 Mar 2018 15:28:43 +0100 Subject: [PATCH 1/2] Added yarn support --- package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9830360e..9da28d23 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "main": "js/electron.js", "scripts": { "start": "sh run-start.sh", - "install": "cd vendor && npm install", - "install-fonts": "cd fonts && npm install", - "postinstall": "sh installers/postinstall/postinstall.sh && npm run install-fonts", + "install": "cd vendor && yon install", + "install-fonts": "cd fonts && yon install", + "postinstall": "sh installers/postinstall/postinstall.sh && yon run install-fonts", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", @@ -52,7 +52,8 @@ "spectron": "3.7.x", "stylelint": "^8.4.0", "stylelint-config-standard": "latest", - "time-grunt": "latest" + "time-grunt": "latest", + "yarn-or-npm": "^2.0.4" }, "dependencies": { "body-parser": "^1.18.2", From 8ef14f7a545addf1e1a353a5ed517cfed25c4d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Luk=C3=A1=C5=A1?= Date: Mon, 12 Mar 2018 15:33:30 +0100 Subject: [PATCH 2/2] Added changes from [9974e35] to CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eec9207c..2e791c99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add link to GitHub repository which contains the respective Dockerfile. - Optimized automated unit tests cloneObject, cmpVersions - Update notifications use now translation templates instead of normal strings. +- Yarn can be used now as an installation tool ### Fixed - News article in fullscreen (iframe) is now shown in front of modules.