diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 00000000..978041dc --- /dev/null +++ b/.bowerrc @@ -0,0 +1,4 @@ +{ + "directory": "components/", + "analytics": false +} diff --git a/Gruntfile.js b/Gruntfile.js index 34cee3ba..edcabed0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,14 +3,14 @@ module.exports = function(grunt) { // build the concat config from the preen config var components = []; for (component in grunt.file.readJSON('bower.json').preen) { - components.push('bower_components/' + component + '/**/*.js'); + components.push('components/' + component + '/**/*.js'); } grunt.initConfig({ concat: { components: { src: components, - dest: 'js-deps/bower_components.js', + dest: 'js/components.js', }, }, }); diff --git a/README.md b/README.md index d71d494b..be56a51a 100644 --- a/README.md +++ b/README.md @@ -61,11 +61,11 @@ actually use from the new package, e.g.: ``` Now, run `grunt` to delete unused package files and concatenate the remaining -javascript files into `js-deps/bower_components.js`. Note that packages will be +javascript files into `js/components.js`. Note that packages will be concatenated **in the order** that they are listed in the preen config. -Finally, stage and commit changes to bower.json, js-deps/bower_components.js, -and bower_components/. The latter should be limited to files we actually use. +Finally, stage and commit changes to bower.json, `js/bower_components.js`, +and `components/`. The latter should be limited to files we actually use. Tests ===== diff --git a/bower_components/backbone/backbone.js b/components/backbone/backbone.js similarity index 100% rename from bower_components/backbone/backbone.js rename to components/backbone/backbone.js diff --git a/bower_components/bootstrap/dist/css/bootstrap.css b/components/bootstrap/dist/css/bootstrap.css similarity index 100% rename from bower_components/bootstrap/dist/css/bootstrap.css rename to components/bootstrap/dist/css/bootstrap.css diff --git a/bower_components/bytebuffer/dist/ByteBufferAB.js b/components/bytebuffer/dist/ByteBufferAB.js similarity index 100% rename from bower_components/bytebuffer/dist/ByteBufferAB.js rename to components/bytebuffer/dist/ByteBufferAB.js diff --git a/bower_components/chai/.bower.json b/components/chai/.bower.json similarity index 100% rename from bower_components/chai/.bower.json rename to components/chai/.bower.json diff --git a/bower_components/chai/CONTRIBUTING.md b/components/chai/CONTRIBUTING.md similarity index 100% rename from bower_components/chai/CONTRIBUTING.md rename to components/chai/CONTRIBUTING.md diff --git a/bower_components/chai/History.md b/components/chai/History.md similarity index 100% rename from bower_components/chai/History.md rename to components/chai/History.md diff --git a/bower_components/chai/README.md b/components/chai/README.md similarity index 100% rename from bower_components/chai/README.md rename to components/chai/README.md diff --git a/bower_components/chai/ReleaseNotes.md b/components/chai/ReleaseNotes.md similarity index 100% rename from bower_components/chai/ReleaseNotes.md rename to components/chai/ReleaseNotes.md diff --git a/bower_components/chai/bower.json b/components/chai/bower.json similarity index 100% rename from bower_components/chai/bower.json rename to components/chai/bower.json diff --git a/bower_components/chai/chai.js b/components/chai/chai.js similarity index 100% rename from bower_components/chai/chai.js rename to components/chai/chai.js diff --git a/bower_components/chai/component.json b/components/chai/component.json similarity index 100% rename from bower_components/chai/component.json rename to components/chai/component.json diff --git a/bower_components/chai/karma.conf.js b/components/chai/karma.conf.js similarity index 100% rename from bower_components/chai/karma.conf.js rename to components/chai/karma.conf.js diff --git a/bower_components/chai/karma.sauce.js b/components/chai/karma.sauce.js similarity index 100% rename from bower_components/chai/karma.sauce.js rename to components/chai/karma.sauce.js diff --git a/bower_components/chai/package.json b/components/chai/package.json similarity index 100% rename from bower_components/chai/package.json rename to components/chai/package.json diff --git a/bower_components/chai/sauce.browsers.js b/components/chai/sauce.browsers.js similarity index 100% rename from bower_components/chai/sauce.browsers.js rename to components/chai/sauce.browsers.js diff --git a/bower_components/jquery/dist/jquery.js b/components/jquery/dist/jquery.js similarity index 100% rename from bower_components/jquery/dist/jquery.js rename to components/jquery/dist/jquery.js diff --git a/bower_components/long/dist/Long.js b/components/long/dist/Long.js similarity index 100% rename from bower_components/long/dist/Long.js rename to components/long/dist/Long.js diff --git a/bower_components/mocha/.bower.json b/components/mocha/.bower.json similarity index 100% rename from bower_components/mocha/.bower.json rename to components/mocha/.bower.json diff --git a/bower_components/mocha/.editorconfig b/components/mocha/.editorconfig similarity index 100% rename from bower_components/mocha/.editorconfig rename to components/mocha/.editorconfig diff --git a/bower_components/mocha/History.md b/components/mocha/History.md similarity index 100% rename from bower_components/mocha/History.md rename to components/mocha/History.md diff --git a/bower_components/mocha/LICENSE b/components/mocha/LICENSE similarity index 100% rename from bower_components/mocha/LICENSE rename to components/mocha/LICENSE diff --git a/bower_components/mocha/Readme.md b/components/mocha/Readme.md similarity index 100% rename from bower_components/mocha/Readme.md rename to components/mocha/Readme.md diff --git a/bower_components/mocha/bower.json b/components/mocha/bower.json similarity index 100% rename from bower_components/mocha/bower.json rename to components/mocha/bower.json diff --git a/bower_components/mocha/media/logo.svg b/components/mocha/media/logo.svg similarity index 100% rename from bower_components/mocha/media/logo.svg rename to components/mocha/media/logo.svg diff --git a/bower_components/mocha/mocha.css b/components/mocha/mocha.css similarity index 100% rename from bower_components/mocha/mocha.css rename to components/mocha/mocha.css diff --git a/bower_components/mocha/mocha.js b/components/mocha/mocha.js similarity index 100% rename from bower_components/mocha/mocha.js rename to components/mocha/mocha.js diff --git a/bower_components/mustache/mustache.js b/components/mustache/mustache.js similarity index 100% rename from bower_components/mustache/mustache.js rename to components/mustache/mustache.js diff --git a/bower_components/protobuf/dist/ProtoBuf.js b/components/protobuf/dist/ProtoBuf.js similarity index 100% rename from bower_components/protobuf/dist/ProtoBuf.js rename to components/protobuf/dist/ProtoBuf.js diff --git a/bower_components/qrcode/qrcode.js b/components/qrcode/qrcode.js similarity index 100% rename from bower_components/qrcode/qrcode.js rename to components/qrcode/qrcode.js diff --git a/bower_components/underscore/underscore.js b/components/underscore/underscore.js similarity index 100% rename from bower_components/underscore/underscore.js rename to components/underscore/underscore.js diff --git a/index.html b/index.html index 16c12f17..ceb214cb 100644 --- a/index.html +++ b/index.html @@ -125,7 +125,7 @@ - + diff --git a/js-deps/bower_components.js b/js/components.js similarity index 100% rename from js-deps/bower_components.js rename to js/components.js diff --git a/options.html b/options.html index 1eb85c3b..8e8d555b 100644 --- a/options.html +++ b/options.html @@ -18,7 +18,7 @@ TextSecure Options - +
@@ -93,7 +93,7 @@ - + diff --git a/test/index.html b/test/index.html index adda39dd..df718489 100644 --- a/test/index.html +++ b/test/index.html @@ -16,7 +16,7 @@ TextSecure test runner - +

Run this out of the chrome-plugin:// namespace (and expect plugin state to be cleared/corrupted), not file://

@@ -119,14 +119,14 @@ - - + + - +