up deps

Author: antelle

Diff for: .eslintrc

@@ -10,7 +10,9 @@
         "no-console": "error",
         "no-alert": "error",
         "no-debugger": "error",
-        "prefer-arrow-callback": "error"
+        "prefer-arrow-callback": "error",
+        "object-property-newline": "off",
+        "no-useless-escape": "off"
     },
     "globals": {
         "_": true,

Diff for: Gruntfile.js

@@ -18,7 +18,7 @@ module.exports = function(grunt) {
     var dt = new Date().toISOString().replace(/T.*/, '');
     var minElectronVersionForUpdate = '1.0.1';
     var zipCommentPlaceholder = 'zip_comment_placeholder_that_will_be_replaced_with_hash';
-    var electronVersion = pkg.devDependencies['electron-prebuilt'].replace(/^\D/, '');
+    var electronVersion = pkg.devDependencies['electron'].replace(/^\D/, '');
 
     while (zipCommentPlaceholder.length < 512) {
         zipCommentPlaceholder += '.';
@@ -86,7 +86,7 @@ module.exports = function(grunt) {
                     pattern: /\r?\n\s*/g,
                     replacement: function() { return '\n'; }
                 }]})},
-                { test: /runtime\-info\.js$/, loader: StringReplacePlugin.replace({ replacements: [
+                { test: /runtime-info\.js$/, loader: StringReplacePlugin.replace({ replacements: [
                     { pattern: /@@VERSION/g, replacement: function() { return pkg.version; } },
                     { pattern: /@@DATE/g, replacement: function() { return dt; } },
                     { pattern: /@@COMMIT/g, replacement: function() { return grunt.config.get('gitinfo.local.branch.current.shortSHA'); } }
@@ -165,7 +165,7 @@ module.exports = function(grunt) {
                 flatten: true
             },
             'desktop-app-content': {
-                cwd: 'electron/',
+                cwd: 'desktop/',
                 src: '**',
                 dest: 'tmp/desktop/app/',
                 expand: true,
@@ -200,7 +200,7 @@ module.exports = function(grunt) {
         },
         eslint: {
             app: ['app/scripts/**/*.js'],
-            electron: ['electron/**/*.js', '!electron/node_modules/**'],
+            desktop: ['desktop/**/*.js', '!desktop/node_modules/**'],
             grunt: ['Gruntfile.js', 'grunt/**/*.js']
         },
         sass: {

Diff for: README.md

@@ -42,7 +42,7 @@ To make Dropbox work in your self-hosted app:
 
 The app can be built with grunt: `grunt` (html file will be in `dist/`).    
 Desktop apps are built with `grunt desktop`. This works only in mac osx as it builds dmg; requires wine.  
-To run Electron app without building installer, install electron package (`npm install electron-prebuilt -g`), build the app with `grunt` and start in this way:
+To run Electron app without building installer, install electron package (`npm install electron -g`), build the app with `grunt` and start in this way:
 ```bash
 $ grunt dev
 $ npm run-script electron

Diff for: electron/app.js renamed to desktop/app.js

@@ -13,6 +13,6 @@
   "license": "MIT",
   "readme": "../README.md",
   "dependencies": {
-    "node-stream-zip": "1.3.3"
+    "node-stream-zip": "1.3.7"
   }
 }