3 files changed, 30 insertions, 3 deletions

diff --git a/package-lock.json b/package-lock.json
index 9c9b1aeb7..fd54e00b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.4.1-beta.4",
+  "version": "5.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eef920a16..d51f02997 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "react-sortable-hoc": "1.10.1",
     "react-tooltip": "3.11.1",
     "route-parser": "^0.0.5",
-    "semver": "^5.4.1",
+    "semver": "5.7.1",
     "smoothscroll-polyfill": "0.4.4",
     "sqlite3": "4.1.0",
     "tar": "^4.0.2",
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 8b2bde5df..fc7a07dd8 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -1,9 +1,13 @@
 import { action, computed, observable } from 'mobx';
+import fs from 'fs-extra';
+import path from 'path';
+import semver from 'semver';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
+import { RECIPES_PATH } from '../config';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
@@ -83,7 +87,30 @@ export default class RecipesStore extends Store {
 
     if (Object.keys(recipes).length === 0) return;
 
-    const updates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+
+    // Check for local updates
+    const allJsonFile = path.join(RECIPES_PATH, 'all.json');
+    const allJson = await fs.readJSON(allJsonFile);
+    const localUpdates = [];
+
+    Object.keys(recipes).forEach((recipe) => {
+      const version = recipes[recipe];
+
+      // Find recipe in local recipe repository
+      const localRecipe = allJson.find((r) => r.id === recipe);
+
+      if (localRecipe && semver.lt(version, localRecipe.version)) {
+        localUpdates.push(recipe);
+      }
+    });
+
+    const updates = [
+      ...remoteUpdates,
+      ...localUpdates,
+    ];
+    debug('Got update information (local, remote):', localUpdates, remoteUpdates);
+
     const length = updates.length - 1;
     const syncUpdate = async (i) => {
       const update = updates[i];