Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-08 08:58:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make the concat list explicit

Browse Source 
Since I decided to preen mocha and chai, we can no longer generate the
concat file list from the preen config. We must instead explicitly list
the modules we want to concatenate. I placed this config in bower.json
so that most of the time, we won't need to change the Gruntfile.

Also added a concatenation task for test page dependencies.
This commit is contained in:
lilia
2014-10-30 17:57:37 -07:00
parent 756fdd2383
commit 6b034e951a
6 changed files with 10922 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bower.json
+27 -38
View File
@@ -5,52 +5,41 @@
"license": "GPLV3",
"private": true,
"dependencies": {
"backbone": "~1.1.2",
"jquery": "liliakai/jquery#2.1.1-ajax-nativetransport",
"underscore": "~1.7.0",
"backbone": "~1.1.2",
"protobuf": "~3.8.0",
"bootstrap": "~3.3.0",
"jquery": "liliakai/jquery#2.1.1-ajax-nativetransport",
"mustache": "~0.8.2",
"qrcode": "git://github.com/davidshimjs/qrcodejs.git"
},
"preen": {
"jquery": [
"dist/jquery.js"
],
"long": [
"dist/Long.js"
],
"bytebuffer": [
"dist/ByteBufferAB.js"
],
"protobuf": [
"dist/ProtoBuf.js"
],
"mustache": [
"mustache.js"
],
"underscore": [
"underscore.js"
],
"backbone": [
"backbone.js"
],
"bootstrap": [
"dist/css/bootstrap.css"
],
"qrcode": [
"qrcode.js"
],
"mocha": [
"mocha.js",
"mocha.css"
],
"chai": [
"chai.js"
]
},
"devDependencies": {
"mocha": "~2.0.1",
"chai": "~1.9.2"
},
"preen": {
"jquery" : [ "dist/jquery.js" ],
"long" : [ "dist/Long.js" ],
"bytebuffer" : [ "dist/ByteBufferAB.js" ],
"protobuf" : [ "dist/ProtoBuf.js" ],
"mustache" : [ "mustache.js" ],
"underscore" : [ "underscore.js" ],
"backbone" : [ "backbone.js" ],
"qrcode" : [ "qrcode.js" ],
"mocha" : [ "mocha.js", "mocha.css" ],
"chai" : [ "chai.js" ],
"bootstrap" : [ "dist/css/bootstrap.css" ]
},
"concat": {
"app": [
"jquery",
"long",
"bytebuffer",
"protobuf",
"mustache",
"underscore",
"backbone",
"qrcode"
]
}
}