Update deps, switch to single package.json, switch to yarn, remove le…

…gacy config migration

.eslintignore

@@ -1,2 +1 @@
 node_modules
-**/node_modules

.gitignore

@@ -1,5 +1,4 @@
 node_modules
-app/node_modules
 dist
 npm-debug.log*
 .DS_Store

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.7.1
+ignore: {}
+patch: {}

Makefile

@@ -1,30 +1,32 @@
-dist: node_modules
-	npm run dist
+PKG := $(shell command -v yarn 2> /dev/null || command -v npm 2> /dev/null)
+
+node_modules: package.json
+	${PKG} install
 
-node_modules: package.json app/package.json
-	npm install
+dist: node_modules
+	${PKG} run dist
 
 clean:
 	rm -Rf ./dist
 
 distclean: clean
-	rm -Rf ./node_modules ./app/node_modules ./.nvm
+	rm -Rf ./node_modules ./.nvm
 
 dev: node_modules
-	npm run app
+	${PKG} run app
 
 test: node_modules
-	npm run test
+	${PKG} run test
 
 mac: node_modules
-	npm run mac
+	${PKG} run mac
 
 win: node_modules
-	npm run win
+	${PKG} run win
 
 ci: test dist
 
 encryptenv:
 	travis encrypt-file .travis.env --add
 
-.PHONY: dist clean distclean dev test ci
+.PHONY: dist clean distclean dev test mac win ci encryptenv

README.md

@@ -27,15 +27,14 @@ documentation](http://electron.atom.io/docs/v0.37.8/).
 
 ### Build Requirements
 * Node JS version 5.3 or higher
-* NPM
+* yarn (recommended upstream) or NPM (works fine)
 
 On Linux, you also need the `icnsutils`, `graphicsmagick`, and
 `xz-utils` packages.
 
 ### Running
 
-Run `npm install` in the root of the repository. `make dev` will run the
-app quickly (without icons).
+Run `make dev` in the root of the repository to run the app quickly (without icons).
 
 To build a full version, `make dist`.
 

app/main.js

@@ -10,15 +10,13 @@ const dialog = electron.dialog;
 const path = require('path');
 const FS = require('fs');
 
-const ConfigStore = require('configstore');
 const Config = require('electron-config');
 const ContextMenu = require('./context_menu');
 const Menu = require('./menu');
 const Tray = electron.Tray;
 
 const _ = require('lodash');
 const is = require('electron-is');
-const mime = require('mime-types');
 const unusedFilename = require('unused-filename');
 require('electron-dl')();
 const log = require('electron-log');
@@ -45,19 +43,6 @@ function setupConfig () {
     'userScriptPath': path.join(app.getPath('userData'), 'user-script.js')
   };
 
-  // Migrate from old config, remove this in time
-  let oldConfig = new ConfigStore(app.getName());
-  try {
-    Object.keys(defaults).concat('x', 'y').forEach(key => {
-      if (oldConfig.has(key)) {
-        defaults[key] = oldConfig.get(key);
-      }
-    });
-    FS.unlinkSync(oldConfig.path);
-  } catch (exc) {
-    // noop
-  }
-
   return new Config({
     defaults: defaults
   });
@@ -489,7 +474,7 @@ function handleProtocolUrls () {
   var isHandler = (
     app.isDefaultProtocolClient('irc') &&
     app.isDefaultProtocolClient('ircs')
-    );
+  );
 
   if (!isHandler && !config.get('neverPromptIrcUrls')) {
     dialog.showMessageBox({

electron-builder.yml

@@ -1,5 +1,6 @@
 {
   "mac": {
+    "category": "public.app-category.productivity",
     "target": [
       "dmg",
       "zip"
@@ -18,7 +19,6 @@
     "icon": null
   },
   "appId": "com.irccloud.desktop",
-  "category": "public.app-category.productivity",
   "protocols": [
     {
       "name": "IRC server URL",

package.json

@@ -1,21 +1,43 @@
 {
-  "name": "irccloud-desktop-build",
+  "name": "irccloud-desktop",
+  "productName": "IRCCloud",
+  "description": "IRCCloud Desktop Client",
+  "author": {
+    "name": "IRCCloud Ltd.",
+    "email": "team@irccloud.com",
+    "url": "https://www.irccloud.com"
+  },
+  "repository": "https://github.com/irccloud/irccloud-desktop",
+  "license": "Apache-2.0",
+  "version": "0.4.0",
+  "main": "app/main.js",
   "scripts": {
-    "postinstall": "install-app-deps",
+    "postinstall": "electron-builder install-app-deps",
     "pack": "build",
     "dist": "build",
-    "test": "eslint .",
-    "app": "electron ./app",
+    "app": "electron .",
     "mas": "build --mac mas",
     "mac": "build --mac dir",
     "dmg": "build --mac dmg",
-    "win": "build --win nsis-web --ia32 --x64"
+    "win": "build --win nsis-web --ia32 --x64",
+    "test": "eslint . && snyk test"
   },
   "devDependencies": {
-    "electron-builder": "^13.9.0",
-    "electron": "^1.4.15",
-    "eslint": "^3.15.0",
-    "devtron": "^1.4.0"
+    "devtron": "^1.4.0",
+    "electron": "^1.7.8",
+    "electron-builder": "^19.31.1",
+    "eslint": "^4.7.2",
+    "snyk": "^1.41.1"
   },
-  "dependencies": {}
+  "dependencies": {
+    "electron-config": "^1.0.0",
+    "electron-dl": "^1.10.0",
+    "electron-is": "^2.4.0",
+    "electron-log": "^2.2.9",
+    "electron-spell-check-provider": "^1.1.0",
+    "electron-updater": "^2.10.1",
+    "lodash": "^4.17.4",
+    "open": "0.0.5",
+    "unused-filename": "^1.0.0"
+  }
 }