Pull deps from npm

This commit is contained in:
Devin Wilson 2015-09-10 11:15:56 -06:00
parent 097c008a63
commit b1760fad12
4 changed files with 96 additions and 28 deletions

View File

@ -3,7 +3,7 @@ BROWSERIFY = ./node_modules/.bin/browserify
UGLIFYJS = ./node_modules/.bin/uglifyjs
EXORCIST = ./node_modules/.bin/exorcist
DEPLOY_DIR = libs
BROWSERIFY_FLAGS = -d -x jquery
BROWSERIFY_FLAGS = -d
OUTPUT_DIR = .
all: compile uglify deploy clean

11
app.js
View File

@ -1,6 +1,17 @@
/* jshint -W117 */
/* application specific logic */
require("jquery");
require("jquery-ui");
require("strophe");
require("strophe-disco");
require("strophe-caps");
require("tooltip");
require("popover");
window.toastr = require("toastr");
require("jQuery-Impromptu");
require("autosize");
var APP =
{
init: function () {

View File

@ -10,15 +10,15 @@
<meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
<meta itemprop="image" content="/images/jitsilogo.png"/>
<script src="https://api.callstats.io/static/callstats.min.js"></script>
<script src="libs/jquery-2.1.1.min.js"></script>
<!--<script src="libs/jquery-2.1.1.min.js"></script>-->
<script src="config.js?v=14"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
<script src="libs/strophe/strophe.min.js?v=2"></script>
<script src="libs/strophe/strophe.disco.min.js?v=1"></script>
<script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>
<script src="libs/jquery-ui.min.js"></script>
<script src="libs/tooltip.min.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/popover.min.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.min.js?v=1"></script><!-- notifications lib -->
<!--<script src="libs/strophe/strophe.min.js?v=2"></script>-->
<!--<script src="libs/strophe/strophe.disco.min.js?v=1"></script>-->
<!--<script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>-->
<!--<script src="libs/jquery-ui.min.js"></script>-->
<!--<script src="libs/tooltip.min.js?v=1"></script>&lt;!&ndash; bootstrap tooltip lib &ndash;&gt;-->
<!--<script src="libs/popover.min.js?v=1"></script>&lt;!&ndash; bootstrap tooltip lib &ndash;&gt;-->
<!--<script src="libs/toastr.min.js?v=1"></script>&lt;!&ndash; notifications lib &ndash;&gt;-->
<script src="interface_config.js?v=6"></script>
<script src="libs/app.bundle.min.js?v=138"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
@ -42,8 +42,8 @@
Link used for inline installation of chrome desktop streaming extension,
is updated automatically from the code with the value defined in config.js -->
<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/diibjkoicjeejcmhdnailmkgecihlobk">
<script src="libs/jquery-impromptu.min.js?v=2"></script>
<script src="libs/jquery.autosize.min.js"></script>
<!--<script src="libs/jquery-impromptu.min.js?v=2"></script>-->
<!--<script src="libs/jquery.autosize.min.js"></script>-->
<!--#include virtual="plugin.head.html" -->
</head>
<body>

View File

@ -16,27 +16,84 @@
"readmeFilename": "README.md",
"//": "Callstats.io does not work with recent versions of jsSHA (2.0.1 in particular)",
"dependencies": {
"events": "*",
"pako": "*",
"i18next-client": "1.7.7",
"sdp-interop": "0.1.10",
"sdp-transform": "1.4.1",
"sdp-simulcast": "0.1.0",
"async": "0.9.0",
"retry": "0.6.1",
"jssha": "1.5.0",
"socket.io-client": "1.3.6"
"async": "0.9.0",
"autosize": "^1.18.13",
"bootstrap": "^3.1.1",
"events": "*",
"i18next-client": "1.7.7",
"jquery": "^2.1.1",
"jQuery-Impromptu": "git+https://github.com/trentrichardson/jQuery-Impromptu.git#v6.0.0",
"jquery-ui": "^1.10.5",
"jssha": "1.5.0",
"pako": "*",
"retry": "0.6.1",
"sdp-interop": "0.1.10",
"sdp-simulcast": "0.1.0",
"sdp-transform": "1.4.1",
"socket.io-client": "1.3.6",
"strophe": "^1.2.2",
"strophejs-plugins": "^0.0.6",
"toastr": "^2.0.3"
},
"devDependencies": {
"precommit-hook": "3.0.0",
"jshint": "2.8.0",
"uglify-js": "2.4.24",
"browserify": "11.1.x",
"exorcist": "*"
"browserify": "11.1.x",
"browserify-shim": "^3.8.10",
"exorcist": "*",
"jshint": "2.8.0",
"precommit-hook": "3.0.0",
"uglify-js": "2.4.24"
},
"license": "Apache-2.0",
"scripts": {
"lint": "./node_modules/.bin/jshint ."
"lint": "./node_modules/.bin/jshint .",
"validate": "npm ls"
},
"pre-commit": ["lint"]
"pre-commit": [
"lint"
],
"browserify": {
"transform": [
"browserify-shim"
]
},
"browser": {
"jquery": "./node_modules/jquery/dist/jquery.js",
"jquery-ui": "./node_modules/jquery-ui/jquery-ui.js",
"strophe": "./node_modules/strophe/strophe.js",
"strophe-disco": "./node_modules/strophejs-plugins/disco/strophe.disco.js",
"strophe-caps": "./node_modules/strophejs-plugins/caps/strophe.caps.jsonly.js",
"toastr": "./node_modules/toastr/toastr.js",
"tooltip": "./node_modules/bootstrap/js/tooltip.js",
"popover": "./node_modules/bootstrap/js/popover.js",
"jQuery-Impromptu": "./node_modules/jQuery-Impromptu/dist/jquery-impromptu.js",
"autosize": "./node_modules/autosize/build/jquery.autosize.js"
},
"browserify-shim": {
"jquery": [
"$"
],
"strophe": {
"exports": "Strophe",
"depends": [
"jquery:$"
]
},
"strophe-disco": {
"depends": [
"strophe:Strophe"
]
},
"tooltip": {
"depends": "jquery:jQuery"
},
"popover": {
"depends": "jquery:jQuery"
},
"jQuery-Impromptu": {
"depends": "jquery:jQuery"
},
"autosize": {
"depends": "jquery:jQuery"
}
}
}