update fs

mathieudutour · mathieudutour · commit 8bba06c0e0b5 · 2020-04-22T14:46:38.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
   "dependencies": {
     "@skpm/child_process": "^0.4.2",
     "@skpm/dialog": "^0.4.0",
-    "@skpm/fs": "^0.2.5",
+    "@skpm/fs": "^0.2.6",
     "linkstate": "^1.1.1",
     "preact": "^10.3.4",
     "sketch-module-user-preferences": "^1.0.1",
diff --git a/src/commands/Add.js b/src/commands/Add.js
@@ -3,15 +3,15 @@ import {
   getCurrentFileName,
   checkForFile,
   executeSafely,
-  exec
+  exec,
 } from "../common";
 import { UI } from "sketch";
 
-export default function() {
+export default function () {
   if (!checkForFile()) {
     return;
   }
-  executeSafely(function() {
+  executeSafely(function () {
     const currentFileName = getCurrentFileName();
     if (currentFileName) {
       exec(`git add "${currentFileName}"`);
diff --git a/src/commands/Branches.js b/src/commands/Branches.js
@@ -3,7 +3,7 @@ import { UI } from "sketch";
 import { getCurrentBranch, checkForFile, exec, executeSafely } from "../common";
 import WebUI from "sketch-module-web-view";
 
-export default function() {
+export default function () {
   if (!checkForFile()) {
     return;
   }
@@ -26,7 +26,7 @@ export default function() {
       minimizable: false,
       maximizable: false,
       titleBarStyle: "hidden",
-      show: false
+      show: false,
     });
 
     webUI.loadURL(require("../../Resources/branches.html"));
@@ -42,23 +42,23 @@ export default function() {
       webUI.webContents.executeJavaScript("window.ready=true");
     });
 
-    webUI.webContents.on("checkoutBranch", name => {
-      executeSafely(function() {
+    webUI.webContents.on("checkoutBranch", (name) => {
+      executeSafely(function () {
         exec(`git checkout -q ${name}`);
         const app = NSApp.delegate();
         app.refreshCurrentDocument();
         webUI.close();
         UI.message(`Switched to branch '${name}'`);
       });
     });
-    webUI.webContents.on("deleteBranch", name => {
-      executeSafely(function() {
+    webUI.webContents.on("deleteBranch", (name) => {
+      executeSafely(function () {
         exec(`git branch -d ${name}`);
         UI.message(`Deleted branch '${name}'`);
       });
     });
     webUI.webContents.on("createBranch", () => {
-      executeSafely(function() {
+      executeSafely(function () {
         UI.getInputFromUser(
           "New Branch Name",
           { okButton: "Create Branch" },
diff --git a/src/commands/Commit.js b/src/commands/Commit.js
@@ -5,16 +5,16 @@ import {
   checkForFile,
   executeSafely,
   exec,
-  createInputWithCheckbox
+  createInputWithCheckbox,
 } from "../common";
 import { exportArtboards } from "../exportArtboards";
 import { getUserPreferences } from "../preferences";
 
-export default function() {
+export default function () {
   if (!checkForFile()) {
     return;
   }
-  executeSafely(function() {
+  executeSafely(function () {
     const currentBranch = getCurrentBranch();
     const prefs = getUserPreferences();
     const commitMsg = createInputWithCheckbox(
diff --git a/src/commands/Export.js b/src/commands/Export.js
@@ -4,11 +4,11 @@ import { checkForFile, checkForGitRepository, executeSafely } from "../common";
 import { exportArtboards } from "../exportArtboards";
 import { getUserPreferences } from "../preferences";
 
-export default function() {
+export default function () {
   if (!checkForFile() && !checkForGitRepository()) {
     return;
   }
-  executeSafely(function() {
+  executeSafely(function () {
     exportArtboards(getUserPreferences());
     UI.message("Artboards exported");
   });
diff --git a/src/commands/Init.js b/src/commands/Init.js
@@ -5,14 +5,14 @@ import {
   getCurrentFileName,
   executeSafely,
   exec,
-  createFailAlert
+  createFailAlert,
 } from "../common";
 
-export default function() {
+export default function () {
   if (!checkForFile()) {
     return;
   }
-  executeSafely(function() {
+  executeSafely(function () {
     const currentFileName = getCurrentFileName();
     if (!currentFileName) {
       createFailAlert("Failed...", "Cannot get the current file name");
@@ -26,7 +26,7 @@ export default function() {
       {
         okButton: "Add Remote",
         cancelButton: "Not now",
-        description: "you can create one here: https://github.com/new"
+        description: "you can create one here: https://github.com/new",
       },
       (err, value) => {
         if (err) {
diff --git a/src/commands/OpenTerminal.js b/src/commands/OpenTerminal.js
@@ -2,7 +2,7 @@
 import { getCurrentDirectory } from "../common";
 import { getUserPreferences } from "../preferences";
 
-export default function() {
+export default function () {
   const path = getCurrentDirectory();
   const { terminal } = getUserPreferences();
   NSWorkspace.sharedWorkspace().openFile_withApplication_(path, terminal);
diff --git a/src/commands/Preferences.js b/src/commands/Preferences.js
@@ -4,7 +4,7 @@ import WebUI from "sketch-module-web-view";
 import { executeSafely } from "../common";
 import { getUserPreferences, setUserPreferences } from "../preferences";
 
-export default function() {
+export default function () {
   const preferences = getUserPreferences();
   const webUI = new WebUI({
     identifier: "git-sketch-plugin.preferences",
@@ -14,7 +14,7 @@ export default function() {
     minimizable: false,
     maximizable: false,
     titleBarStyle: "hidden",
-    show: false
+    show: false,
   });
 
   webUI.loadURL(require("../../Resources/preferences.html"));
@@ -27,8 +27,8 @@ export default function() {
     webUI.webContents.executeJavaScript("window.ready=true");
   });
 
-  webUI.webContents.on("savePreferences", prefs => {
-    executeSafely(function() {
+  webUI.webContents.on("savePreferences", (prefs) => {
+    executeSafely(function () {
       setUserPreferences(prefs);
       webUI.close();
       UI.message("Preferences updated");
diff --git a/src/commands/Pull.js b/src/commands/Pull.js
@@ -2,11 +2,11 @@
 import { UI } from "sketch";
 import { checkForFile, executeSafely, exec } from "../common";
 
-export default function() {
+export default function () {
   if (!checkForFile()) {
     return;
   }
-  executeSafely(function() {
+  executeSafely(function () {
     exec("git pull -q");
     UI.message("Changes pulled");
   });
diff --git a/src/commands/Push.js b/src/commands/Push.js
@@ -2,11 +2,11 @@
 import { UI } from "sketch";
 import { checkForFile, executeSafely, exec } from "../common";
 
-export default function() {
+export default function () {
   if (!checkForFile()) {
     return;
   }
-  executeSafely(function() {
+  executeSafely(function () {
     exec("git -c push.default=current push -q");
     UI.message("Changes pushed");
   });
diff --git a/src/commands/autoExportOnSave.js b/src/commands/autoExportOnSave.js
@@ -4,7 +4,7 @@ import { checkForGitRepository, executeSafely } from "../common";
 import { exportArtboards } from "../exportArtboards";
 import { getUserPreferences } from "../preferences";
 
-export default function() {
+export default function () {
   const prefs = getUserPreferences();
 
   if (!prefs.autoExportOnSave || !checkForGitRepository()) {
diff --git a/src/common.js b/src/common.js
@@ -27,24 +27,19 @@ export function exec(command) {
   return execSync(command, {
     cwd: path,
     shell: "/bin/bash",
-    encoding: "utf8"
-  });
+    encoding: "utf8",
+  }).trim();
 }
 
 export function getCurrentDirectory() {
   const document = Document.getSelectedDocument();
   return String(
-    document.sketchObject
-      .fileURL()
-      .URLByDeletingLastPathComponent()
-      .path()
+    document.sketchObject.fileURL().URLByDeletingLastPathComponent().path()
   );
 }
 
 export function getGitDirectory() {
-  return exec("git rev-parse --show-toplevel")
-    .trim()
-    .replace("(B[m", "");
+  return exec("git rev-parse --show-toplevel").trim().replace("(B[m", "");
 }
 
 export function getCurrentFileName() {
@@ -58,7 +53,7 @@ export function createFailAlert(title, error, buttonToReport) {
     type: "error",
     message: title,
     detail: "" + error,
-    buttons: ["OK", ...(buttonToReport ? ["Report Issue"] : [])]
+    buttons: ["OK", ...(buttonToReport ? ["Report Issue"] : [])],
   });
 
   if (responseCode) {
@@ -87,7 +82,7 @@ export function createFailAlert(title, error, buttonToReport) {
   }
 
   return {
-    responseCode
+    responseCode,
   };
 }
 
@@ -120,7 +115,7 @@ export function createInputWithCheckbox(
   return {
     responseCode: responseCode,
     message: String(message),
-    checked: checkbox.state() == 1
+    checked: checkbox.state() == 1,
   };
 }
 
@@ -176,6 +171,6 @@ function TextArea(x, y, width, heigh) {
   scrollView.documentView = input;
   return {
     view: scrollView,
-    getValue: () => input.string()
+    getValue: () => input.string(),
   };
 }
diff --git a/src/exportArtboards.js b/src/exportArtboards.js
@@ -27,7 +27,7 @@ export function exportArtboards(prefs) {
     exportFolder,
     exportFormat,
     exportScale,
-    includeOverviewFile
+    includeOverviewFile,
   } = prefs;
   const bundlePath = NSBundle.mainBundle().bundlePath();
   const fileFolder = path.join(
@@ -39,8 +39,8 @@ export function exportArtboards(prefs) {
   // get list of artboards regex to ignore
   const sketchIgnore = findUpward(".sketchignore", currentDirectory)
     .split("\n")
-    .filter(x => x.trim())
-    .map(x => new RegExp(x));
+    .filter((x) => x.trim())
+    .map((x) => new RegExp(x));
 
   // get list of artboard names to export
   const artboards = [];
@@ -49,10 +49,10 @@ export function exportArtboards(prefs) {
       `"${bundlePath}/Contents/Resources/sketchtool/bin/sketchtool" list artboards "${currentFileName}" --include-symbols=YES`
     )
   );
-  sketchtoolOutput.pages.forEach(page => {
-    page.artboards.forEach(artboard => {
+  sketchtoolOutput.pages.forEach((page) => {
+    page.artboards.forEach((artboard) => {
       const name = page.name + "/" + artboard.name;
-      if (sketchIgnore.every(regex => !regex.test(name))) {
+      if (sketchIgnore.every((regex) => !regex.test(name))) {
         artboards.push(artboard.name);
       }
     });
@@ -87,14 +87,16 @@ export function exportArtboards(prefs) {
   // generate new artboards
   fs.mkdirSync(fileFolder, { recursive: true });
   console.log(
-    `"${bundlePath}/Contents/Resources/sketchtool/bin/sketchtool" export artboards "${currentFileName}" --formats="${exportFormat ||
-      "png"}" --scales="${exportScale}" --output="${fileFolder}" --overwriting=YES --items="${artboards.join(
+    `"${bundlePath}/Contents/Resources/sketchtool/bin/sketchtool" export artboards "${currentFileName}" --formats="${
+      exportFormat || "png"
+    }" --scales="${exportScale}" --output="${fileFolder}" --overwriting=YES --items="${artboards.join(
       ","
     )}" --include-symbols=YES`
   );
   exec(
-    `"${bundlePath}/Contents/Resources/sketchtool/bin/sketchtool" export artboards "${currentFileName}" --formats="${exportFormat ||
-      "png"}" --scales="${exportScale}" --output="${fileFolder}" --overwriting=YES --items="${artboards.join(
+    `"${bundlePath}/Contents/Resources/sketchtool/bin/sketchtool" export artboards "${currentFileName}" --formats="${
+      exportFormat || "png"
+    }" --scales="${exportScale}" --output="${fileFolder}" --overwriting=YES --items="${artboards.join(
       ","
     )}" --include-symbols=YES`
   );
@@ -114,7 +116,7 @@ This is an autogenerated file showing all the artboards. Do not edit it directly
   }
 
   // compare new artboards with the old ones
-  fs.readdirSync(fileFolder).forEach(artboard => {
+  fs.readdirSync(fileFolder).forEach((artboard) => {
     if (fs.existsSync(path.join(currentDirectory, ".oldArtboards", artboard))) {
       const newArtboard = fs.readFileSync(path.join(fileFolder, artboard));
       const oldArtboard = fs.readFileSync(
diff --git a/src/preferences.js b/src/preferences.js
@@ -9,11 +9,11 @@ const LOCAL_PREFS = {
   exportFormat: "png",
   exportScale: "1.0",
   includeOverviewFile: true,
-  autoExportOnSave: false
+  autoExportOnSave: false,
 };
 const GLOBAL_PREFS = {
   terminal: "Terminal",
-  diffByDefault: true
+  diffByDefault: true,
 };
 
 export function getUserPreferences() {
@@ -35,7 +35,7 @@ export function getUserPreferences() {
 export function setUserPreferences(prefs) {
   const localPrefs = {};
   const globalPrefs = {};
-  Object.keys(prefs).forEach(k => {
+  Object.keys(prefs).forEach((k) => {
     if (Object.keys(LOCAL_PREFS).indexOf(k) !== -1) {
       localPrefs[k] = prefs[k];
     } else {
