Install fontawesome via NPM and remove last bower stuff

.bowerrc

@@ -1,3 +0,0 @@
-{
-    "directory": "components"
-}

.gitignore

@@ -34,9 +34,6 @@ stamp-bundler
 docs/html
 docs/doctrees
 
-# Bower
-components
-
 # Node.js
 node_modules
 

Makefile

@@ -116,7 +116,7 @@ stamp-bundler: Gemfile
 .PHONY: clean
 clean:
 	-rm -f stamp-npm stamp-bower stamp-bundler
-	-rm -rf node_modules components .bundle
+	-rm -rf node_modules .bundle
 
 .PHONY: dev
 dev: stamp-bower stamp-bundler
@@ -128,13 +128,13 @@ dev: stamp-bower stamp-bundler
 css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css css/converse-muc-embedded.min.css
 
 css/converse-muc-embedded.css:: stamp-bundler stamp-bower sass
-	$(SASS) -I ./components/bourbon/app/assets/stylesheets/ sass/_muc_embedded.scss css/converse-muc-embedded.css
+	$(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/_muc_embedded.scss css/converse-muc-embedded.css
 
 css/converse-muc-embedded.min.css:: stamp-bundler stamp-bower sass css/converse-muc-embedded.css
 	$(CLEANCSS) css/converse-muc-embedded.css > css/converse-muc-embedded.min.css
 
 css/converse.css:: stamp-bundler stamp-bower sass
-	$(SASS) -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css
+	$(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css
 
 css/converse.min.css:: stamp-npm
 	$(CLEANCSS) css/converse.css > css/converse.min.css
@@ -147,7 +147,7 @@ css/mobile.min.css:: stamp-npm
 
 .PHONY: watch
 watch: stamp-bundler
-	$(SASS) --watch -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss:css/converse.css sass/_muc_embedded.scss:css/converse-muc-embedded.css
+	$(SASS) --watch -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse.scss:css/converse.css sass/_muc_embedded.scss:css/converse-muc-embedded.css
 
 BUILDS = dist/converse.js \
 		 dist/converse.min.js \
@@ -158,21 +158,21 @@ BUILDS = dist/converse.js \
 		 dist/converse-no-dependencies.min.js \
 		 dist/converse-no-dependencies.js
 
-dist/converse.min.js: stamp-bower src locale components *.js
+dist/converse.min.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build.js
-dist/converse.js: stamp-bower src locale components *.js
+dist/converse.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build.js optimize=none out=dist/converse.js
-dist/converse.nojquery.min.js: stamp-bower src locale components *.js
+dist/converse.nojquery.min.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build-no-jquery.js
-dist/converse.nojquery.js: stamp-bower src locale components *.js
+dist/converse.nojquery.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build-no-jquery.js optimize=none out=dist/converse.nojquery.js
-dist/converse-no-dependencies.min.js: stamp-bower src locale components *.js
+dist/converse-no-dependencies.min.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build-no-dependencies.js
-dist/converse-no-dependencies.js: stamp-bower src locale components *.js
+dist/converse-no-dependencies.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build-no-dependencies.js optimize=none out=dist/converse-no-dependencies.js
-dist/converse-mobile.min.js: stamp-bower src locale components *.js
+dist/converse-mobile.min.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build-mobile.js
-dist/converse-mobile.js: stamp-bower src locale components *.js
+dist/converse-mobile.js: stamp-bower src locale node_modules *.js
 	$(RJS) -o src/build-mobile.js optimize=none out=dist/converse-mobile.js
 
 .PHONY: jsmin

bower.json

@@ -1,11 +1,9 @@
 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "2.0.5",
+  "version": "3.0.0",
   "license": "MPL-2.0",
-  "devDependencies": {
-    "fontawesome": "~4.1.0"
-  },
+  "devDependencies": {},
   "dependencies": {},
   "exportsOverride": {},
   "ignore": [

demo/anonymous.html

@@ -10,7 +10,7 @@
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/theme.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
     <script type="text/javascript" src="../analytics.js"></script>

dev.html

@@ -10,7 +10,7 @@
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script src="node_modules/requirejs/require.js"></script>

docs/source/developer_guidelines.rst

@@ -10,7 +10,7 @@ Developer guidelines
    :local:
 
 If you want to work with the non-minified Javascript and CSS files you'll soon
-notice that there are references to missing *components* and *node_modules* directories.
+notice that there are references to a missing *node_modules* directory.
 Please follow the instructions below to create these directories and fetch Converse's
 3rd-party dependencies.
 
@@ -66,8 +66,8 @@ To see the dependencies, take a look at whats under the *devDependencies* key in
     `package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
 
 .. note::
-    After running ```make dev```, you should now have new directories *components*
-    and *node_modules*, which contain all the front-end dependencies of Converse.js.
+    After running ```make dev```, you should now have a new *node_modules* directory
+    which contains all the external dependencies of Converse.js.
     If these directory does NOT exist, something must have gone wrong.
     Double-check the output of ```make dev``` to see if there are any errors
     listed. For support, you can write to the mailing list: conversejs@librelist.com
@@ -88,7 +88,7 @@ Add the following two lines to the *<head>* section of your webpage:
 .. code-block:: html
 
     <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
-    <script data-main="main" src="components/requirejs/require.js"></script>
+    <script data-main="main" src="node_modules/requirejs/require.js"></script>
 
 require.js will then let the main.js file be parsed (because of the *data-main*
 attribute on the *script* tag), which will in turn cause converse.js to be

embedded.html

@@ -10,7 +10,7 @@
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="/css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="/css/converse.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="/css/converse-muc-embedded.css" />

index.html

@@ -10,7 +10,7 @@
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/theme.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
     <script type="text/javascript" src="analytics.js"></script>

mobile.html

@@ -10,7 +10,7 @@
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/2.0.1/css/theme.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/2.0.1/css/converse.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/2.0.1/css/mobile.min.css" />

non_amd.html

@@ -9,7 +9,7 @@
     <meta name="author" content="JC Brand" />
     <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/theme.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
 
@@ -28,9 +28,9 @@
 
     <!-- BEGIN STROPHE -->
     <script type="text/javascript" src="node_modules/strophe.js/strophe.js"></script>
-    <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>
-    <script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script>
-    <script type="text/javascript" src="components/strophejs-plugins/rsm/strophe.rsm.js"></script>
+    <script type="text/javascript" src="node_modules/strophejs-plugins/vcard/strophe.vcard.js"></script>
+    <script type="text/javascript" src="node_modules/strophejs-plugins/disco/strophe.disco.js"></script>
+    <script type="text/javascript" src="node_modules/strophejs-plugins/rsm/strophe.rsm.js"></script>
     <script type="text/javascript" src="src/strophe.ping.js"></script>
     <!-- END STROPHE -->
 

package.json

@@ -39,10 +39,10 @@
     "backbone.overview": "0.0.3",
     "bootstrap": "^3.3.7",
     "bourbon": "^4.3.2",
-    "bower": "latest",
     "clean-css": "^3.4.19",
     "eslint": "^3.14.1",
     "eslint-plugin-lodash": "^2.3.3",
+    "fontawesome": "^4.7.0",
     "greenkeeper": "^4.1.0",
     "grunt": "^1.0.1",
     "grunt-cli": "^1.1.0",