From 743daf4dc900ce6c95da642bbb23d0eccdb5cf01 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 11 Feb 2020 00:38:08 +0100 Subject: Upgrade normalize-url to latest major --- package-lock.json | 19 ++++--------------- package.json | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd54e00b0..94e2b995b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.4.3", + "version": "5.4.4-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -19890,15 +19890,9 @@ } }, "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "requires": { - "object-assign": "^4.0.1", - "prepend-http": "^1.0.0", - "query-string": "^4.1.0", - "sort-keys": "^1.0.0" - } + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-5.0.0.tgz", + "integrity": "sha512-bAEm2fx8Dq/a35Z6PIRkkBBJvR56BbEJvhpNtvCZ4W9FyORSna77fn+xtYFjqk5JpBS+fMnAOG/wFgkQBmB7hw==" }, "now-and-later": { "version": "2.0.1", @@ -21006,11 +21000,6 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" - }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", diff --git a/package.json b/package.json index c33bf4f7a..89a8283fe 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "moment": "^2.17.1", "ms": "2.1.2", "node-fetch": "2.6.0", - "normalize-url": "^1.9.1", + "normalize-url": "5.0.0", "pretty-bytes": "^4.0.2", "prop-types": "^15.5.10", "react": "16.12.0", -- cgit v1.2.3-70-g09d2 From a8781e825378cd9583dfae8750c7a5d1a4fdbe1c Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 11 Feb 2020 00:39:07 +0100 Subject: #276 Fix custom URL validation failing due to URL normalization --- src/components/settings/services/EditServiceForm.js | 2 +- src/internal-server | 2 +- src/models/Service.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index fa34ac60b..89c82c7f8 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -169,7 +169,7 @@ export default @observer class EditServiceForm extends Component { if (recipe.validateUrl && values.customUrl) { this.setState({ isValidatingCustomUrl: true }); try { - values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false }); + values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false, removeTrailingSlash: false }); isValid = await recipe.validateUrl(values.customUrl); } catch (err) { console.warn('ValidateURL', err); diff --git a/src/internal-server b/src/internal-server index 65d146890..48cb16fef 160000 --- a/src/internal-server +++ b/src/internal-server @@ -1 +1 @@ -Subproject commit 65d1468901b7394c95e510c5aed1a23c22f0f71d +Subproject commit 48cb16fefe46ab66b1884f18e04c1f701a8e0c09 diff --git a/src/models/Service.js b/src/models/Service.js index 10b54602f..12a2d4af9 100644 --- a/src/models/Service.js +++ b/src/models/Service.js @@ -1,6 +1,6 @@ -import { computed, observable, autorun } from 'mobx'; -import path from 'path'; +import { autorun, computed, observable } from 'mobx'; import normalizeUrl from 'normalize-url'; +import path from 'path'; const debug = require('debug')('Ferdi:Service'); @@ -146,7 +146,7 @@ export default class Service { if (this.recipe.hasCustomUrl && this.customUrl) { let url; try { - url = normalizeUrl(this.customUrl, { stripWWW: false }); + url = normalizeUrl(this.customUrl, { stripWWW: false, removeTrailingSlash: false }); } catch (err) { console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`); } -- cgit v1.2.3-70-g09d2 From 06fe69d94942e31df0894c5c90686ccdddbb6178 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 11 Feb 2020 00:39:27 +0100 Subject: Use npm start command in misty config --- misty.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misty.yml b/misty.yml index a1e024c4e..2b93d025e 100644 --- a/misty.yml +++ b/misty.yml @@ -2,5 +2,5 @@ code: cmd: npm run dev app: - cmd: npx electron ./build - waitOn: http://localhost:8000 \ No newline at end of file + cmd: npm start + waitOn: http://localhost:8000 -- cgit v1.2.3-70-g09d2 From b27c939bce3368f4b5fec92dc6975a049728336b Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 11 Feb 2020 00:42:26 +0100 Subject: Document misty usage to run development app --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 67bac2277..396a678ae 100644 --- a/README.md +++ b/README.md @@ -180,13 +180,19 @@ $ npm run rebuild ### Start development app -Run these two commands **simultaneously** in different console tabs: +Run these two commands **simultaneously** in different terminals: ```bash $ npm run dev $ npm run start ``` +Optionally, you can run both commands in one terminal with [misty](https://github.com/adlk/misty) (see [misty.yml](https://github.com/getferdi/ferdi/blob/develop/misty.yml)): + +```bash +$ npx misty +``` + Be aware that the development database will be reset regularly. ### Packaging -- cgit v1.2.3-70-g09d2 From ba5448cf4f9f6000b6596fc0de67ca1c0fb1d7bf Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 11 Feb 2020 12:00:22 +0100 Subject: Change menu bar logic to be hidden by default when autohide is enabled --- src/stores/SettingsStore.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 8a5ee7204..428b6342c 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -47,9 +47,11 @@ export default class SettingsStore extends Store { reaction( () => this.all.app.autohideMenuBar, - () => remote.getCurrentWindow().setAutoHideMenuBar( - this.all.app.autohideMenuBar, - ), + () => { + const currentWindow = remote.getCurrentWindow(); + currentWindow.setMenuBarVisibility(!this.all.app.autohideMenuBar); + currentWindow.setAutoHideMenuBar(this.all.app.autohideMenuBar); + }, ); reaction( -- cgit v1.2.3-70-g09d2 From 60b686d5e620d9ad5f0df408ab900c32fb578d28 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 12:59:30 +0000 Subject: docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 396a678ae..7b4abef5b 100644 --- a/README.md +++ b/README.md @@ -261,6 +261,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Lennart Weller
📦
Andrzej Ressel
💻 +
Daniel Peukert
💻 -- cgit v1.2.3-70-g09d2 From dcba44aec0433b6a664f87a5b555f9bf3b102a24 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 12:59:31 +0000 Subject: docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 2644b1edb..2da78ea6b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -287,6 +287,15 @@ "contributions": [ "code" ] + }, + { + "login": "dpeukert", + "name": "Daniel Peukert", + "avatar_url": "https://avatars2.githubusercontent.com/u/3451904?v=4", + "profile": "https://gitlab.com/dpeukert", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 6, -- cgit v1.2.3-70-g09d2