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.
This commit is contained in:
lilia
parent
3a1789104e
commit
508c59e05c
37 changed files with 16 additions and 12 deletions
4
.bowerrc
Normal file
4
.bowerrc
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"directory": "components/",
|
||||||
|
"analytics": false
|
||||||
|
}
|
||||||
|
|
@ -3,14 +3,14 @@ module.exports = function(grunt) {
|
||||||
// build the concat config from the preen config
|
// build the concat config from the preen config
|
||||||
var components = [];
|
var components = [];
|
||||||
for (component in grunt.file.readJSON('bower.json').preen) {
|
for (component in grunt.file.readJSON('bower.json').preen) {
|
||||||
components.push('bower_components/' + component + '/**/*.js');
|
components.push('components/' + component + '/**/*.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
grunt.initConfig({
|
grunt.initConfig({
|
||||||
concat: {
|
concat: {
|
||||||
components: {
|
components: {
|
||||||
src: components,
|
src: components,
|
||||||
dest: 'js-deps/bower_components.js',
|
dest: 'js/components.js',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -61,11 +61,11 @@ actually use from the new package, e.g.:
|
||||||
```
|
```
|
||||||
|
|
||||||
Now, run `grunt` to delete unused package files and concatenate the remaining
|
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.
|
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,
|
Finally, stage and commit changes to bower.json, `js/bower_components.js`,
|
||||||
and bower_components/. The latter should be limited to files we actually use.
|
and `components/`. The latter should be limited to files we actually use.
|
||||||
|
|
||||||
Tests
|
Tests
|
||||||
=====
|
=====
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 658 B After Width: | Height: | Size: 658 B |
|
|
@ -125,7 +125,7 @@
|
||||||
<script type="text/javascript" src="js-deps/nacl-common.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/CryptoJS.js"></script>
|
||||||
<script type="text/javascript" src="js-deps/curve255.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/backbone.localStorage.js"></script>
|
||||||
<script type="text/javascript" src="js-deps/libphonenumber_api-compiled.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>
|
<script type="text/javascript" src="js-deps/bootstrap-tagsinput.js"></script>
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
<title>TextSecure Options</title>
|
<title>TextSecure Options</title>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<link rel="stylesheet" href="css/options.css">
|
<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>
|
</head>
|
||||||
<body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="nacl/pnacl/{config}">
|
<body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="nacl/pnacl/{config}">
|
||||||
<div id="listener"></div>
|
<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/nacl-common.js"></script>
|
||||||
<script type="text/javascript" src="js-deps/CryptoJS.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/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/backbone.localStorage.js"></script>
|
||||||
<script type="text/javascript" src="js-deps/libphonenumber_api-compiled.js"></script>
|
<script type="text/javascript" src="js-deps/libphonenumber_api-compiled.js"></script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<title>TextSecure test runner</title>
|
<title>TextSecure test runner</title>
|
||||||
<link rel="stylesheet" href="../bower_components/mocha/mocha.css" />
|
<link rel="stylesheet" href="../components/mocha/mocha.css" />
|
||||||
</head>
|
</head>
|
||||||
<body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="../nacl/pnacl/{config}">
|
<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>
|
<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>
|
</form>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script type="text/javascript" src="../bower_components/mocha/mocha.js"></script>
|
<script type="text/javascript" src="../components/mocha/mocha.js"></script>
|
||||||
<script type="text/javascript" src="../bower_components/chai/chai.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="blanket_mocha.js"></script>
|
||||||
|
|
||||||
<script type="text/javascript" src="../js-deps/nacl-common.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/CryptoJS.js"></script>
|
||||||
<script type="text/javascript" src="../js-deps/curve255.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/backbone.localStorage.js"></script>
|
||||||
<script type="text/javascript" src="../js-deps/libphonenumber_api-compiled.js"></script>
|
<script type="text/javascript" src="../js-deps/libphonenumber_api-compiled.js"></script>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue