fix recreating files order

kactus-io · Jul 11, 2017 · 1c33e64 · 1c33e64
1 parent a544fab
commit 1c33e64
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/app/package.json b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "Kactus",
   "bundleID": "io.kactus.KactusClient",
   "companyName": "Kactus.io",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "./main.js",
   "repository": {
     "type": "git",

diff --git a/app/src/lib/dispatcher/app-store.ts b/app/src/lib/dispatcher/app-store.ts
@@ -2072,15 +2072,15 @@ export class AppStore {
     const gitStore = this.getGitStore(repository)
     await gitStore.discardChanges(files)
 
-    await this._refreshRepository(repository)
-
     // rebuild sketch files
     const { kactus } = this.getRepositoryState(repository)
     await Promise.all(
       kactus.files
         .filter(f => f.parsed)
         .map(f => importSketchFile(f.path, kactus.config))
     )
+
+    await this._refreshRepository(repository)
   }
 
   public async _undoCommit(
@@ -2273,7 +2273,15 @@ export class AppStore {
     const gitStore = this.getGitStore(repository)
     await gitStore.merge(branch)
 
-    return this._refreshRepository(repository)
+    // rebuild sketch files
+    const { kactus } = this.getRepositoryState(repository)
+    await Promise.all(
+      kactus.files
+        .filter(f => f.parsed)
+        .map(f => importSketchFile(f.path, kactus.config))
+    )
+
+    await this._refreshRepository(repository)
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */

diff --git a/changelog.json b/changelog.json
@@ -1,6 +1,9 @@
 {
   "unreleased": [],
   "releases": {
+    "0.1.5": [
+      "[Fixed] Recreate the sketch files before get the git status when merging a branch"
+    ],
     "0.1.4": [
       "[Fixed] Remove kactus previews cache when removing a repo",
       "[Fixed] Fix link to help",

diff --git a/plugin/package.json b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "kactus",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"description": "Kactus plugin",
 	"main": "../out/plugin.sketchplugin",
 	"scripts": {