Skip to content

Commit ed82eb4

Browse files
committed
build(app): Use bower_components directory
1 parent 62677ec commit ed82eb4

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

app/USAGE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Example:
66

77
This will create:
88
Gruntfile.js
9-
component.json
9+
bower.json
1010

1111
app/index.html
1212
app/scripts/your-app-name-here.js
1313
app/scripts/controllers/main.js
14-
app/components/angular/angular.js
14+
app/bower_components/angular/angular.js
1515
app/styles/main.css
1616
app/views/main.html
1717

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"yeoman-generator": "~0.11.0"
2626
},
2727
"peerDependencies": {
28-
"generator-karma": "~0.2.0"
28+
"generator-karma": "~0.3.0"
2929
},
3030
"devDependencies": {
3131
"mocha": "~1.9.0",

templates/common/Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ module.exports = function (grunt) {
137137
imagesDir: '<%%= yeoman.app %>/images',
138138
javascriptsDir: '<%%= yeoman.app %>/scripts',
139139
fontsDir: '<%%= yeoman.app %>/styles/fonts',
140-
importPath: '<%%= yeoman.app %>/components',
140+
importPath: '<%%= yeoman.app %>/bower_components',
141141
relativeAssets: true
142142
},
143143
dist: {},
@@ -257,7 +257,7 @@ module.exports = function (grunt) {
257257
src: [
258258
'*.{ico,txt}',
259259
'.htaccess',
260-
'components/**/*',
260+
'bower_components/**/*',
261261
'images/{,*/}*.{gif,webp}',
262262
'styles/fonts/*'
263263
]

templates/common/gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ node_modules
22
dist
33
.tmp
44
.sass-cache
5-
app/components
5+
app/bower_components

templates/common/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
<![endif]-->
2222

2323
<!--[if lt IE 9]>
24-
<script src="components/es5-shim/es5-shim.js"></script>
25-
<script src="components/json3/lib/json3.min.js"></script>
24+
<script src="bower_components/es5-shim/es5-shim.js"></script>
25+
<script src="bower_components/json3/lib/json3.min.js"></script>
2626
<![endif]-->
2727

2828
<!-- Add your site or application content here -->
2929
<div class="container" ng-view></div>
3030

31-
<script src="components/angular/angular.js"></script><% if (resourceModule) { %>
32-
<script src="components/angular-resource/angular-resource.js"></script><% } %><% if (cookiesModule) { %>
33-
<script src="components/angular-cookies/angular-cookies.js"></script><% } %><% if (sanitizeModule) { %>
34-
<script src="components/angular-sanitize/angular-sanitize.js"></script><% } %>
31+
<script src="bower_components/angular/angular.js"></script><% if (resourceModule) { %>
32+
<script src="bower_components/angular-resource/angular-resource.js"></script><% } %><% if (cookiesModule) { %>
33+
<script src="bower_components/angular-cookies/angular-cookies.js"></script><% } %><% if (sanitizeModule) { %>
34+
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script><% } %>
3535

3636
<!-- build:js scripts/scripts.js -->
3737
<script src="scripts/app.js"></script>

templates/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"grunt-open": "~0.2.0",
2424
"matchdep": "~0.1.2",
2525
"connect-livereload": "~0.1.0",
26-
"grunt-google-cdn": "~0.1.2",
26+
"grunt-google-cdn": "~0.2.0",
2727
"grunt-ngmin": "~0.0.2"
2828
},
2929
"engines": {

templates/common/root/.bowerrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "app/components"
2+
"directory": "app/bower_components"
33
}

test/test-file-creation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('Angular generator', function () {
4747
'app/robots.txt',
4848
'app/styles/main.css',
4949
'app/views/main.html',
50-
['.bowerrc', /"directory": "app\/components"/],
50+
['.bowerrc', /"directory": "app\/bower_components"/],
5151
'Gruntfile.js',
5252
'package.json',
5353
['bower.json', /"name":\s+"temp"/],
@@ -71,7 +71,7 @@ describe('Angular generator', function () {
7171
'app/robots.txt',
7272
'app/styles/main.css',
7373
'app/views/main.html',
74-
['.bowerrc', /"directory": "app\/components"/],
74+
['.bowerrc', /"directory": "app\/bower_components"/],
7575
'Gruntfile.js',
7676
'package.json',
7777
['bower.json', /"name":\s+"temp"/],

0 commit comments

Comments
 (0)