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

Corrected object clone

This commit is contained in:
Dennis Ploeger 2019-01-02 09:38:13 +01:00
parent d3e5115500
commit cd09658745
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Gruntfile.js
View File

@ -132,22 +132,24 @@ module.exports = function(grunt) {
}
};
let webpackDevConfig = webpackConfig
webpackDevConfig.resolve.alias = {
backbone: 'backbone/backbone.js',
underscore: 'underscore/underscore.js',
_: 'underscore/underscore.js',
jquery: 'jquery/dist/jquery.js',
kdbxweb: 'kdbxweb/dist/kdbxweb.js',
baron: 'baron/baron.js',
pikaday: 'pikaday/pikaday.js',
filesaver: 'FileSaver.js/FileSaver.js',
qrcode: 'jsqrcode/dist/qrcode.js',
'argon2': 'argon2-browser/docs/dist/argon2.js',
hbs: 'handlebars/runtime.js',
'argon2-wasm': 'argon2-browser/dist/argon2.wasm',
templates: path.join(__dirname, 'app/templates')
};
let webpackDevConfig = Object.assign({}, webpackConfig, {
resolve:
alias = {
backbone: 'backbone/backbone.js',
underscore: 'underscore/underscore.js',
_: 'underscore/underscore.js',
jquery: 'jquery/dist/jquery.js',
kdbxweb: 'kdbxweb/dist/kdbxweb.js',
baron: 'baron/baron.js',
pikaday: 'pikaday/pikaday.js',
filesaver: 'FileSaver.js/FileSaver.js',
qrcode: 'jsqrcode/dist/qrcode.js',
'argon2': 'argon2-browser/docs/dist/argon2.js',
hbs: 'handlebars/runtime.js',
'argon2-wasm': 'argon2-browser/dist/argon2.wasm',
templates: path.join(__dirname, 'app/templates')
}
})
grunt.initConfig({
gitinfo: {