Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Install sinon via npm. Bump version in package.json

Browse Source
This commit is contained in:
JC Brand 2017-02-14 08:21:05 +01:00
parent 3b8431dd7a
commit 1a0cb07098
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bower.json
View File

@ -8,7 +8,6 @@
"bourbon": "~4.2.6",
"crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
"fontawesome": "~4.1.0",
"sinon": "^1.17.3",
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js"
},
"dependencies": {},

4
config.js
View File

@ -213,6 +213,8 @@ require.config({
// define module dependencies for modules not using define
shim: {
'backbone': { deps: ['underscore'] },
'bigint': { deps: ['crypto'] },
'crypto.aes': { deps: ['crypto.cipher-core'] },
'crypto.cipher-core': { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
'crypto.enc-base64': { deps: ['crypto.core'] },
@ -223,10 +225,8 @@ require.config({
'crypto.pad-nopadding': { deps: ['crypto.cipher-core'] },
'crypto.sha1': { deps: ['crypto.core'] },
'crypto.sha256': { deps: ['crypto.core'] },
'bigint': { deps: ['crypto'] },
'strophe.ping': { deps: ['strophe'] },
'strophe.register': { deps: ['strophe'] },
'strophe.vcard': { deps: ['strophe'] },
'backbone': { deps: ['underscore'] }
}
});

3
package.json
View File

@ -1,6 +1,6 @@
{
"name": "converse.js",
"version": "2.0.5",
"version": "3.0.0",
"description": "Browser based XMPP instant messaging client",
"main": "main.js",
"directories": {
@ -49,6 +49,7 @@
"install": "^0.8.4",
"jed": "0.5.4",
"jquery": "2.2.3",
"sinon": "^1.17.3",
"jquery-easing": "0.0.1",
"jquery.browser": ">=0.1.0",
"jshint": "^2.9.4",

2
tests/main.js
View File

@ -1,7 +1,7 @@
// Extra test dependencies
config.paths.mock = "tests/mock";
config.paths.test_utils = "tests/utils";
config.paths.sinon = "components/sinon/lib/sinon";
config.paths.sinon = "node_modules/sinon/lib/sinon";
config.paths.jasmine = "node_modules/jasmine-core/lib/jasmine-core/jasmine";
config.paths.transcripts = "converse-logs/converse-logs";
config.paths["jasmine-html"] = "node_modules/jasmine-core/lib/jasmine-core/jasmine-html";