mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

up deps

pull/542/head
antelle 2017-01-28 23:13:39 +01:00
parent 3e01a8eaa2
commit 2602a50b80
9 changed files with 3304 additions and 2645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc
View File

@ -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,

8
Gruntfile.js
View File

@ -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: {

2
README.md
View File

@ -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

0
electron/app.js → desktop/app.js
View File

0
electron/icon.png → desktop/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
electron/main.js → desktop/main.js
View File

2
electron/package.json → desktop/package.json
View File

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

5884
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

49
package.json
View File

@ -10,25 +10,26 @@
},
"dependencies": {},
"devDependencies": {
"babel-core": "6.14.0",
"babel-loader": "6.2.5",
"babel-preset-es2015": "6.14.0",
"babel-core": "6.22.1",
"babel-loader": "6.2.10",
"babel-preset-es2015": "6.22.0",
"base64-loader": "1.0.0",
"cssnano": "3.7.4",
"electron-prebuilt": "1.4.0",
"eslint-config-standard": "5.3.5",
"eslint-plugin-promise": "2.0.1",
"eslint-plugin-standard": "2.0.0",
"cssnano": "3.10.0",
"electron": "^1.4.15",
"eslint": "^3.14.1",
"eslint-config-standard": "6.2.1",
"eslint-plugin-promise": "3.4.0",
"eslint-plugin-standard": "2.0.1",
"exports-loader": "0.6.3",
"get-folder-size": "1.0.0",
"grunt": "1.0.1",
"grunt-bower-install-simple": "1.2.3",
"grunt-concurrent": "2.3.1",
"grunt-contrib-clean": "1.0.0",
"grunt-contrib-compress": "1.3.0",
"grunt-contrib-compress": "1.4.1",
"grunt-contrib-copy": "1.0.0",
"grunt-contrib-deb": "github:keeweb/grunt-contrib-deb#e9b6e9f",
"grunt-contrib-htmlmin": "2.0.0",
"grunt-contrib-htmlmin": "2.1.0",
"grunt-contrib-uglify": "2.0.0",
"grunt-contrib-watch": "1.0.0",
"grunt-electron": "5.0.0",
@ -36,24 +37,24 @@
"grunt-gitinfo": "0.1.8",
"grunt-inline-alt": "0.3.10",
"grunt-postcss": "0.8.0",
"grunt-sass": "1.2.1",
"grunt-string-replace": "1.3.0",
"grunt-webpack": "1.0.14",
"handlebars": "4.0.5",
"grunt-sass": "2.0.0",
"grunt-string-replace": "1.3.1",
"grunt-webpack": "1.0.18",
"handlebars": "4.0.6",
"handlebars-loader": "1.4.0",
"html-minifier": "3.0.3",
"html-minifier": "3.3.0",
"json-loader": "^0.5.4",
"load-grunt-tasks": "3.5.2",
"node-sass": "3.10.0",
"node-stream-zip": "^1.3.4",
"node-sass": "4.4.0",
"node-stream-zip": "1.3.7",
"raw-loader": "0.5.1",
"stats-webpack-plugin": "^0.4.2",
"string-replace-webpack-plugin": "0.0.3",
"stats-webpack-plugin": "0.4.3",
"string-replace-webpack-plugin": "0.0.5",
"strip-sourcemap-loader": "0.0.1",
"time-grunt": "1.4.0",
"uglify-loader": "1.3.0",
"webpack": "1.13.2",
"webpack-dev-server": "1.16.1"
"uglify-loader": "1.4.0",
"webpack": "1.14.0",
"webpack-dev-server": "1.16.2"
},
"optionalDependencies": {
"grunt-appdmg": "0.4.0",
@ -62,9 +63,9 @@
"scripts": {
"start": "grunt",
"test": "grunt test",
"postinstall": "cd electron && npm install",
"postinstall": "cd desktop && npm install",
"copy-beta": "grunt && sed 's/<html manifest=\"manifest.appcache\">//' dist/index.html > ../keeweb-beta/diy/index.html && cd ../keeweb-beta && git add diy/index.html && git commit -a -m 'beta' && git push origin master",
"electron": "electron electron --htmlpath=http://localhost:8085/tmp/"
"electron": "electron desktop --htmlpath=http://localhost:8085/tmp/"
},
"author": {
"name": "Antelle",