Rename bower_components

To components. Because tab-completion works better when there aren't two things starting with bower, and shorter names are nicer to deal with in general.
10 years ago · 508c59e05c
parent 3a1789104e
commit 508c59e05c
37 changed files with 16 additions and 12 deletions
--- a/.bowerrc
+++ b/.bowerrc
@ -0,0 +1,4 @@
+{
+  "directory": "components/",
+  "analytics": false
+}
--- 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',
      },
    },
  });
--- 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
 =====
--- a/bower_components/backbone/backbone.js
+++ b/bower_components/backbone/backbone.js
--- a/bower_components/bootstrap/dist/css/bootstrap.css
+++ b/bower_components/bootstrap/dist/css/bootstrap.css
--- a/bower_components/bytebuffer/dist/ByteBufferAB.js
+++ b/bower_components/bytebuffer/dist/ByteBufferAB.js
--- a/bower_components/chai/.bower.json
+++ b/bower_components/chai/.bower.json
--- a/bower_components/chai/CONTRIBUTING.md
+++ b/bower_components/chai/CONTRIBUTING.md
--- a/bower_components/chai/History.md
+++ b/bower_components/chai/History.md
--- a/bower_components/chai/README.md
+++ b/bower_components/chai/README.md
--- a/bower_components/chai/ReleaseNotes.md
+++ b/bower_components/chai/ReleaseNotes.md
--- a/bower_components/chai/bower.json
+++ b/bower_components/chai/bower.json
--- a/bower_components/chai/chai.js
+++ b/bower_components/chai/chai.js
--- a/bower_components/chai/component.json
+++ b/bower_components/chai/component.json
--- a/bower_components/chai/karma.conf.js
+++ b/bower_components/chai/karma.conf.js
--- a/bower_components/chai/karma.sauce.js
+++ b/bower_components/chai/karma.sauce.js
--- a/bower_components/chai/package.json
+++ b/bower_components/chai/package.json
--- a/bower_components/chai/sauce.browsers.js
+++ b/bower_components/chai/sauce.browsers.js
--- a/bower_components/jquery/dist/jquery.js
+++ b/bower_components/jquery/dist/jquery.js
--- a/bower_components/long/dist/Long.js
+++ b/bower_components/long/dist/Long.js
--- a/bower_components/mocha/.bower.json
+++ b/bower_components/mocha/.bower.json
--- a/bower_components/mocha/.editorconfig
+++ b/bower_components/mocha/.editorconfig
--- a/bower_components/mocha/History.md
+++ b/bower_components/mocha/History.md
--- a/bower_components/mocha/LICENSE
+++ b/bower_components/mocha/LICENSE
--- a/bower_components/mocha/Readme.md
+++ b/bower_components/mocha/Readme.md
--- a/bower_components/mocha/bower.json
+++ b/bower_components/mocha/bower.json
--- a/bower_components/mocha/media/logo.svg
+++ b/bower_components/mocha/media/logo.svg
--- a/bower_components/mocha/mocha.css
+++ b/bower_components/mocha/mocha.css
--- a/bower_components/mocha/mocha.js
+++ b/bower_components/mocha/mocha.js
--- a/bower_components/mustache/mustache.js
+++ b/bower_components/mustache/mustache.js
--- a/bower_components/protobuf/dist/ProtoBuf.js
+++ b/bower_components/protobuf/dist/ProtoBuf.js
--- a/bower_components/qrcode/qrcode.js
+++ b/bower_components/qrcode/qrcode.js
--- a/bower_components/underscore/underscore.js
+++ b/bower_components/underscore/underscore.js
--- a/index.html
+++ b/index.html
@ -125,7 +125,7 @@
        <script type="text/javascript" src="js-deps/nacl-common.js"></script>
        <script type="text/javascript" src="js-deps/CryptoJS.js"></script>
        <script type="text/javascript" src="js-deps/curve255.js"></script>
-        <script type="text/javascript" src="js-deps/bower_components.js"></script>
+        <script type="text/javascript" src="js/components.js"></script>
        <script type="text/javascript" src="js-deps/backbone.localStorage.js"></script>
        <script type="text/javascript" src="js-deps/libphonenumber_api-compiled.js"></script>
        <script type="text/javascript" src="js-deps/bootstrap-tagsinput.js"></script>
--- a/js-deps/bower_components.js
+++ b/js-deps/bower_components.js
--- a/options.html
+++ b/options.html
@ -18,7 +18,7 @@
  <title>TextSecure Options</title>
  <meta charset="utf-8">
  <link rel="stylesheet" href="css/options.css">
-  <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
+  <link rel="stylesheet" href="components/bootstrap/dist/css/bootstrap.css">
 </head>
 <body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="nacl/pnacl/{config}">
  <div id="listener"></div>
@ -93,7 +93,7 @@
  <script type="text/javascript" src="js-deps/nacl-common.js"></script>
  <script type="text/javascript" src="js-deps/CryptoJS.js"></script>
  <script type="text/javascript" src="js-deps/curve255.js"></script>
-  <script type="text/javascript" src="js-deps/bower_components.js"></script>
+  <script type="text/javascript" src="js/components.js"></script>
  <script type="text/javascript" src="js-deps/backbone.localStorage.js"></script>
  <script type="text/javascript" src="js-deps/libphonenumber_api-compiled.js"></script>

--- a/test/index.html
+++ b/test/index.html
@ -16,7 +16,7 @@

 <head>
  <title>TextSecure test runner</title>
-  <link rel="stylesheet" href="../bower_components/mocha/mocha.css" />
+  <link rel="stylesheet" href="../components/mocha/mocha.css" />
 </head>
 <body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="../nacl/pnacl/{config}">
 	<h2>Run this out of the chrome-plugin:// namespace (and expect plugin state to be cleared/corrupted), not file://</h2>
@ -119,14 +119,14 @@
    </form>
  </script>

-	<script type="text/javascript" src="../bower_components/mocha/mocha.js"></script>
-	<script type="text/javascript" src="../bower_components/chai/chai.js"></script>
+	<script type="text/javascript" src="../components/mocha/mocha.js"></script>
+	<script type="text/javascript" src="../components/chai/chai.js"></script>
 	<script type="text/javascript" src="blanket_mocha.js"></script>

 	<script type="text/javascript" src="../js-deps/nacl-common.js"></script>
 	<script type="text/javascript" src="../js-deps/CryptoJS.js"></script>
 	<script type="text/javascript" src="../js-deps/curve255.js"></script>
-	<script type="text/javascript" src="../js-deps/bower_components.js"></script>
+	<script type="text/javascript" src="../js/components.js"></script>
 	<script type="text/javascript" src="../js-deps/backbone.localStorage.js"></script>
 	<script type="text/javascript" src="../js-deps/libphonenumber_api-compiled.js"></script>