Skip to content

Commit 576269b

Browse files
committed
fix(bower): update bower usage and resources
Changes: - Fix our old code to use bower_components/ as the install dir - Fix the Bootstrap asset to use github.com/twbs/bootstrap (it moved) - Fail the build on Bower failure. Bower should not fail silently.
1 parent e1a8b42 commit 576269b

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ performance/temp*.html
99
angular.js.tmproj
1010
/node_modules/
1111
/components/
12+
/bower_components/
1213
angular.xcodeproj
1314
.idea
1415
.agignore

Gruntfile.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ module.exports = function(grunt) {
106106
bower: {
107107
command: 'node ./node_modules/bower/bin/bower install',
108108
options: {
109-
stdout: false
109+
stdout: true,
110+
stderr: true,
111+
failOnError: true
110112
}
111113
}
112114
},
@@ -116,7 +118,7 @@ module.exports = function(grunt) {
116118
scenario: {
117119
dest: 'build/angular-scenario.js',
118120
src: [
119-
'components/jquery/jquery.js',
121+
'bower_components/jquery/jquery.js',
120122
util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
121123
],
122124
styles: {

angularFiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ angularFiles = {
117117
],
118118

119119
'karma': [
120-
'components/jquery/jquery.js',
120+
'bower_components/jquery/jquery.js',
121121
'test/jquery_remove.js',
122122
'@angularSrc',
123123
'src/publishExternalApis.js',
@@ -154,7 +154,7 @@ angularFiles = {
154154
],
155155

156156
'karmaJquery': [
157-
'components/jquery/jquery.js',
157+
'bower_components/jquery/jquery.js',
158158
'test/jquery_alias.js',
159159
'@angularSrc',
160160
'src/publishExternalApis.js',

bower.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
22
"name": "AngularJS",
3-
"directory": "components",
43
"devDependencies": {
54
"jquery": "git://github.com/components/jquery.git#v1.8.3",
65
"lunr.js": "0.4.0",
76
"google-code-prettify": "1.0.0",
87
"components-font-awesome": "3.1.0",
9-
"bootstrap": "https://raw.github.com/twitter/bootstrap/v2.0.2/docs/assets/bootstrap.zip",
8+
"bootstrap": "https://raw.github.com/twbs/bootstrap/v2.0.2/docs/assets/bootstrap.zip",
109
"closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
1110
"ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.1/assets/ng-closure-runner.zip"
1211
}

docs/src/gen-docs.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ function writeTheRest(writesFuture) {
7979

8080
var manifest = 'manifest="/build/docs/appcache.manifest"';
8181

82-
writesFuture.push(writer.copyDir('components/components-font-awesome/css', 'components/font-awesome/css'));
83-
writesFuture.push(writer.copyDir('components/components-font-awesome/font', 'components/font-awesome/font'));
84-
writesFuture.push(writer.copyDir('components/bootstrap', 'components/bootstrap'));
82+
writesFuture.push(writer.copyDir('bower_components/components-font-awesome/css', 'components/font-awesome/css'));
83+
writesFuture.push(writer.copyDir('bower_components/components-font-awesome/font', 'components/font-awesome/font'));
84+
writesFuture.push(writer.copyDir('bower_components/bootstrap', 'components/bootstrap'));
8585

8686
writesFuture.push(writer.copy('node_modules/marked/lib/marked.js', 'components/marked.js'));
87-
writesFuture.push(writer.copy('components/lunr.js/lunr.js', 'components/lunr.js'));
88-
writesFuture.push(writer.copy('components/lunr.js/lunr.min.js', 'components/lunr.min.js'));
89-
writesFuture.push(writer.copy('components/jquery/jquery.js', 'components/jquery.js'));
90-
writesFuture.push(writer.copy('components/jquery/jquery.min.js', 'components/jquery.min.js'));
91-
writesFuture.push(writer.copy('components/google-code-prettify/src/prettify.js', 'components/google-code-prettify.js'));
87+
writesFuture.push(writer.copy('bower_components/lunr.js/lunr.js', 'components/lunr.js'));
88+
writesFuture.push(writer.copy('bower_components/lunr.js/lunr.min.js', 'components/lunr.min.js'));
89+
writesFuture.push(writer.copy('bower_components/jquery/jquery.js', 'components/jquery.js'));
90+
writesFuture.push(writer.copy('bower_components/jquery/jquery.min.js', 'components/jquery.min.js'));
91+
writesFuture.push(writer.copy('bower_components/google-code-prettify/src/prettify.js', 'components/google-code-prettify.js'));
9292
writesFuture.push(writer.copy('docs/components/angular-bootstrap/bootstrap.js', 'components/angular-bootstrap.js'));
9393
writesFuture.push(writer.copy('docs/components/angular-bootstrap/bootstrap-prettify.js', 'components/angular-bootstrap-prettify.js'));
9494

lib/grunt/utils.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,8 @@ module.exports = {
146146
'java ' +
147147
this.java32flags() + ' ' +
148148
'-Xmx2g ' +
149-
'-cp components/closure-compiler/compiler.jar' + classPathSep +
150-
'components/ng-closure-runner/ngcompiler.jar ' +
151-
// '-classpath ./components/closure-compiler/compiler.jar' + classPathSep +
152-
// './components/ng-closure-runner/ngcompiler.jar ' +
149+
'-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
150+
'bower_components/ng-closure-runner/ngcompiler.jar ' +
153151
'org.angularjs.closurerunner.NgClosureRunner ' +
154152
'--compilation_level SIMPLE_OPTIMIZATIONS ' +
155153
'--language_in ECMASCRIPT5_STRICT ' +

0 commit comments

Comments
 (0)