diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index e05a87695..000000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "directory": "components"
-}
diff --git a/.gitignore b/.gitignore
index 042ec3d5e..2f13153b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,9 +34,6 @@ stamp-bundler
docs/html
docs/doctrees
-# Bower
-components
-
# Node.js
node_modules
diff --git a/Makefile b/Makefile
index 16a4984df..55a6e1185 100644
--- a/Makefile
+++ b/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
diff --git a/bower.json b/bower.json
index 0c58a24fe..ed031c695 100644
--- a/bower.json
+++ b/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": [
diff --git a/demo/anonymous.html b/demo/anonymous.html
index aaa640f67..4088f2628 100644
--- a/demo/anonymous.html
+++ b/demo/anonymous.html
@@ -10,7 +10,7 @@
-
+
diff --git a/dev.html b/dev.html
index 2be78b9bd..5776da409 100644
--- a/dev.html
+++ b/dev.html
@@ -10,7 +10,7 @@
-
+
diff --git a/docs/source/developer_guidelines.rst b/docs/source/developer_guidelines.rst
index 318400839..5781c9e4a 100644
--- a/docs/source/developer_guidelines.rst
+++ b/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 `_.
.. 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 ** section of your webpage:
.. code-block:: html
-
+
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
diff --git a/embedded.html b/embedded.html
index 7dec900ae..9f982ee2a 100644
--- a/embedded.html
+++ b/embedded.html
@@ -10,7 +10,7 @@
-
+
diff --git a/index.html b/index.html
index 93263f8e7..ef8e3c555 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
-
+
diff --git a/mobile.html b/mobile.html
index f48abd70b..d4dc75a7e 100644
--- a/mobile.html
+++ b/mobile.html
@@ -10,7 +10,7 @@
-
+
diff --git a/non_amd.html b/non_amd.html
index caf6405e0..204f5a834 100755
--- a/non_amd.html
+++ b/non_amd.html
@@ -9,7 +9,7 @@
-
+
@@ -28,9 +28,9 @@
-
-
-
+
+
+
diff --git a/package.json b/package.json
index d1a2f5655..f6291a12e 100644
--- a/package.json
+++ b/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",