Browse Source

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.
lilia 9 years ago
parent
commit
508c59e05c

+ 4 - 0
.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "components/",
+  "analytics": false
+}

+ 2 - 2
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',
       },
     },
   });

+ 3 - 3
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
 =====

+ 0 - 0
bower_components/backbone/backbone.js → components/backbone/backbone.js


+ 0 - 0
bower_components/bootstrap/dist/css/bootstrap.css → components/bootstrap/dist/css/bootstrap.css


+ 0 - 0
bower_components/bytebuffer/dist/ByteBufferAB.js → components/bytebuffer/dist/ByteBufferAB.js


+ 0 - 0
bower_components/chai/.bower.json → components/chai/.bower.json


+ 0 - 0
bower_components/chai/CONTRIBUTING.md → components/chai/CONTRIBUTING.md


+ 0 - 0
bower_components/chai/History.md → components/chai/History.md


+ 0 - 0
bower_components/chai/README.md → components/chai/README.md


+ 0 - 0
bower_components/chai/ReleaseNotes.md → components/chai/ReleaseNotes.md


+ 0 - 0
bower_components/chai/bower.json → components/chai/bower.json


+ 0 - 0
bower_components/chai/chai.js → components/chai/chai.js


+ 0 - 0
bower_components/chai/component.json → components/chai/component.json


+ 0 - 0
bower_components/chai/karma.conf.js → components/chai/karma.conf.js


+ 0 - 0
bower_components/chai/karma.sauce.js → components/chai/karma.sauce.js


+ 0 - 0
bower_components/chai/package.json → components/chai/package.json


+ 0 - 0
bower_components/chai/sauce.browsers.js → components/chai/sauce.browsers.js


+ 0 - 0
bower_components/jquery/dist/jquery.js → components/jquery/dist/jquery.js


+ 0 - 0
bower_components/long/dist/Long.js → components/long/dist/Long.js


+ 0 - 0
bower_components/mocha/.bower.json → components/mocha/.bower.json


+ 0 - 0
bower_components/mocha/.editorconfig → components/mocha/.editorconfig


+ 0 - 0
bower_components/mocha/History.md → components/mocha/History.md


+ 0 - 0
bower_components/mocha/LICENSE → components/mocha/LICENSE


+ 0 - 0
bower_components/mocha/Readme.md → components/mocha/Readme.md


+ 0 - 0
bower_components/mocha/bower.json → components/mocha/bower.json


+ 0 - 0
bower_components/mocha/media/logo.svg → components/mocha/media/logo.svg


+ 0 - 0
bower_components/mocha/mocha.css → components/mocha/mocha.css


+ 0 - 0
bower_components/mocha/mocha.js → components/mocha/mocha.js


+ 0 - 0
bower_components/mustache/mustache.js → components/mustache/mustache.js


+ 0 - 0
bower_components/protobuf/dist/ProtoBuf.js → components/protobuf/dist/ProtoBuf.js


+ 0 - 0
bower_components/qrcode/qrcode.js → components/qrcode/qrcode.js


+ 0 - 0
bower_components/underscore/underscore.js → components/underscore/underscore.js


+ 1 - 1
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>

+ 0 - 0
js-deps/bower_components.js → js/components.js


+ 2 - 2
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>
 

+ 4 - 4
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>