bower_components moved outside of the /app folder

jotka · jotka · commit 69c9dd4408fb · 2016-02-05T19:26:58.000+01:00
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "app/bower_components"
+  "directory": "bower_components"
 }
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 /.idea
-app/bower_components
+bower_components
 /env.properties
 /node_modules
 target
diff --git a/.scss-lint.yml b/.scss-lint.yml
@@ -10,7 +10,7 @@ linters:
 
     SelectorDepth:
         enabled: true
-        max_depth: 5
+        max_depth: 6
 
     ImportantRule:
         enabled: false
diff --git a/README.md b/README.md
@@ -36,14 +36,14 @@ The use of the this Gulp build tool is based on applications code being structur
 
     |---- /app
     |     |
-    |     |---- bower_components
     |     |---- components
     |     |---- sections
     |     |---- img
     |     |---- styles
     |     |---- index.html
     |     |---- app.js
     |     |---- .eslint.rc.yml
+    |---- /bower_components
     |---- /target
     |     |---- dist
     |     |---- tmp
@@ -58,8 +58,8 @@ which means:
 - `app` : contains the application source code
 - `app/sections` : contains the subsections of the application code
 - `app/components`: contains the components (directives, services etc.) embedded in the application
-- `app/bower_components` : libraries downloaded by [Bower](http://bower.io/)
 - `app/app.js` or `app/App.ts` : the entry point of the Angular application
+- `bower_components` : libraries downloaded by [Bower](http://bower.io/)
 - `node_modules` : tools downloaded by [npm](https://www.npmjs.org/)
 - `target/tmp` : contains generated files (compiled TypeScript, compiled Sass styles, Angular templates etc.)
 - `target/dist` : contains app distribution package
diff --git a/app/App.ts b/app/App.ts
@@ -1,5 +1,5 @@
-/// <reference path="bower_components/DefinitelyTyped/angularjs/angular.d.ts" />
-/// <reference path="bower_components/DefinitelyTyped/angularjs/angular-route.d.ts" />
+/// <reference path="../bower_components/DefinitelyTyped/angularjs/angular.d.ts" />
+/// <reference path="../bower_components/DefinitelyTyped/angularjs/angular-route.d.ts" />
 /// <reference path="Routes.ts" />
 /// <reference path='sections/portfolio/PortfolioModule.ts'/>
 
diff --git a/app/Routes.ts b/app/Routes.ts
@@ -1,5 +1,5 @@
-/// <reference path="bower_components/DefinitelyTyped/angularjs/angular.d.ts" />
-/// <reference path="bower_components/DefinitelyTyped/angularjs/angular-route.d.ts" />
+/// <reference path="../bower_components/DefinitelyTyped/angularjs/angular.d.ts" />
+/// <reference path="../bower_components/DefinitelyTyped/angularjs/angular-route.d.ts" />
 module App {
     export class Routes {
         static $inject = ['$routeProvider'];
diff --git a/app/app.scss b/app/app.scss
@@ -1,6 +1,6 @@
 @import "styles/variables";
 
-@import "bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap";
+@import "../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap";
 
 /*import mixins */
 @import "styles/mixins";
diff --git a/app/components/navigation/NavigationController.ts b/app/components/navigation/NavigationController.ts
@@ -1,4 +1,4 @@
-/// <reference path='../../bower_components/DefinitelyTyped/angularjs/angular.d.ts' />
+/// <reference path='../../../bower_components/DefinitelyTyped/angularjs/angular.d.ts' />
 
 module Portfolio {
 
diff --git a/app/components/portfolio/PortfolioServiceTest.ts b/app/components/portfolio/PortfolioServiceTest.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../bower_components/DefinitelyTyped/jasmine/jasmine.d.ts" />
-/// <reference path="../../bower_components/DefinitelyTyped/angularjs/angular-mocks.d.ts" />
+/// <reference path="../../../bower_components/DefinitelyTyped/jasmine/jasmine.d.ts" />
+/// <reference path="../../../bower_components/DefinitelyTyped/angularjs/angular-mocks.d.ts" />
 
 describe('PortfolioService', () => {
     var service;
diff --git a/app/sections/portfolio/PortfolioModule.ts b/app/sections/portfolio/PortfolioModule.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../bower_components/DefinitelyTyped/angularjs/angular.d.ts" />
+/// <reference path="../../../bower_components/DefinitelyTyped/angularjs/angular.d.ts" />
 /// <reference path='PortfolioController.ts' />
 /// <reference path='../../components/portfolio/PortfolioService.ts' />
 /// <reference path='../../components/navigation/NavigationController.ts' />
diff --git a/app/styles/box.scss b/app/styles/box.scss
@@ -7,69 +7,68 @@ $box-table-body-text-color: lighten($box-text-color, 45%) !default;
 $box-table-body-icon-color: lighten($box-text-color, 45%) !default;
 $box-table-hover-color: lighten($box-text-color, 83.7%) !default;
 
-
 /* override feedback variables*/
 $feedback-color: $box-table-body-text-color !default;
 
 @import "styles/feedback";
 
 .box {
-  @include vendor-prefix(background-clip, border-box);
-  @include vendor-prefix(background-origin, padding-box);
-  @include vendor-prefix(background-size, auto);
-  @include vendor-prefix(box-shadow, ((rgba(0, 0, 0, 0.298039) 0px 1px 4px 0px), (rgba(0, 0, 0, 0.0980392) 0px 0px 40px 0px inset)));
-  @include vendor-prefix(backface-visibility, visible);
-  background-color: $box-background-color;
-  color: $box-text-color;
-  height: 100%;
-  display: block;
+    @include vendor-prefix(background-clip, border-box);
+    @include vendor-prefix(background-origin, padding-box);
+    @include vendor-prefix(background-size, auto);
+    @include vendor-prefix(box-shadow, ((rgba(0, 0, 0, 0.298039) 0px 1px 4px 0px), (rgba(0, 0, 0, 0.0980392) 0px 0px 40px 0px inset)));
+    @include vendor-prefix(backface-visibility, visible);
+    background-color: $box-background-color;
+    color: $box-text-color;
+    height: 100%;
+    display: block;
 }
 
 .text-box {
-  @extend .box;
-  padding: 0.75em;
-  margin-bottom: 0.5em;
+    @extend .box;
+    padding: 0.75em;
+    margin-bottom: 0.5em;
 }
 
 .text-box:active {
-  display: block;
-  @include vendor-prefix(box-shadow, ((rgba(0, 0, 0, 0.698039) 0px 1px 4px 0px), (rgba(0, 0, 0, 0.0920392) 0px 0px 40px 0px inset)));
+    display: block;
+    @include vendor-prefix(box-shadow, ((rgba(0, 0, 0, 0.698039) 0px 1px 4px 0px), (rgba(0, 0, 0, 0.0920392) 0px 0px 40px 0px inset)));
 }
 
 .text-box > p:first-letter {
-  color: $box-text-firstletter-color;
-  font-size: larger;
-  font-weight: bolder;
-  margin: 0.05em;
+    color: $box-text-firstletter-color;
+    font-size: larger;
+    font-weight: bolder;
+    margin: 0.05em;
 }
 
 .table-box {
-  @extend .box;
-  padding: 0.85em;
-  margin-top: 1em;
+    @extend .box;
+    padding: 0.85em;
+    margin-top: 1em;
 }
 
 .table-box > table {
-  border: 0;
-  margin-top: 0.25em;
-  margin-bottom: 0;
+    border: 0;
+    margin-top: 0.25em;
+    margin-bottom: 0;
 }
 
 .table-box > table > thead {
-  color: $box-table-header-text-color;
+    color: $box-table-header-text-color;
 }
 
 .table-box > table > tbody > tr {
-  @extend .touch-feedback-on-active;
+    @extend .touch-feedback-on-active;
 }
 
 .table-box > table > tbody > tr > td {
-  height: $finger-size;
-  vertical-align: middle;
-  color: $box-table-body-text-color;
+    height: $finger-size;
+    vertical-align: middle;
+    color: $box-table-body-text-color;
 }
 
 .table-box > table > tbody > tr > td:first-child > i {
-  padding-left: 0.05em;
-  color: $box-table-body-icon-color;
+    padding-left: 0.05em;
+    color: $box-table-body-icon-color;
 }
diff --git a/app/styles/feedback.scss b/app/styles/feedback.scss
@@ -40,9 +40,9 @@
 }
 
 .touch-feedback:focus {
-     background-color: $feedback-color;
-     outline-color: $feedback-color;
-     cursor: pointer;
+    background-color: $feedback-color;
+    outline-color: $feedback-color;
+    cursor: pointer;
  }
 
 /* style only on hover situations */
diff --git a/app/styles/headers.scss b/app/styles/headers.scss
@@ -2,11 +2,10 @@ $header-primary-color: black !default;
 $header-secondary-color : gray !default;
 
 .header-dual {
-  color: $header-primary-color;
+    color: $header-primary-color;
 }
 
 .header-dual > span {
-  font-size: 65%;
-  color: $header-secondary-color;
-  
-}
+    font-size: 65%;
+    color: $header-secondary-color;
+}
diff --git a/package/README.md b/package/README.md
@@ -36,14 +36,14 @@ The use of the this Gulp build tool is based on applications code being structur
 
     |---- /app
     |     |
-    |     |---- bower_components
     |     |---- components
     |     |---- sections
     |     |---- img
     |     |---- styles
     |     |---- index.html
     |     |---- app.js
     |     |---- .eslint.rc.yml
+    |---- /bower_components
     |---- /target
     |     |---- dist
     |     |---- tmp
@@ -58,8 +58,8 @@ which means:
 - `app` : contains the application source code
 - `app/sections` : contains the subsections of the application code
 - `app/components`: contains the components (directives, services etc.) embedded in the application
-- `app/bower_components` : libraries downloaded by [Bower](http://bower.io/)
 - `app/app.js` or `app/App.ts` : the entry point of the Angular application
+- `bower_components` : libraries downloaded by [Bower](http://bower.io/)
 - `node_modules` : tools downloaded by [npm](https://www.npmjs.org/)
 - `target/tmp` : contains generated files (compiled TypeScript, compiled Sass styles, Angular templates etc.)
 - `target/dist` : contains app distribution package
diff --git a/package/sample_configs/.bowerrc b/package/sample_configs/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}
diff --git a/tasks/build.gulp.js b/tasks/build.gulp.js
@@ -24,13 +24,13 @@ module.exports = function (gulp) {
     gulp.task('inject-bower', ['bower-download'], function () {
         return gulp.src('app/index.html')
             .pipe(wiredep({
-                directory: 'app/bower_components'
+                directory: 'bower_components'
             }))
             .pipe(gulp.dest('app'));
     });
 
     gulp.task('bower-download', function () {
-        return bower('app/bower_components');
+        return bower('bower_components');
     });
 
     gulp.task('inject-styles', ['styles'], function () {
@@ -65,7 +65,7 @@ module.exports = function (gulp) {
     });
 
     gulp.task('partials', function () {
-        return gulp.src(['app/**/*.html', '!app/index.html', '!app/bower_components/**/*'])
+        return gulp.src(['app/**/*.html', '!app/index.html'])
             .pipe(htmlmin({
                 removeEmptyAttributes: true,
                 collapseBooleanAttributes: false,
@@ -92,7 +92,7 @@ module.exports = function (gulp) {
                 }
             ))
             .pipe(gulpInject(
-                gulp.src(['app/**/*.js', '!app/bower_components/**/*', '!app/**/*Test.js', '!app/**/*test.js'])
+                gulp.src(['app/**/*.js', '!app/**/*Test.js', '!app/**/*test.js'])
                     .pipe(naturalSort())
                     .pipe(angularFilesort()),
                 {
@@ -104,7 +104,7 @@ module.exports = function (gulp) {
     });
 
     gulp.task('fonts', function () {
-        return gulp.src('app/bower_components/**/*')
+        return gulp.src('bower_components/**/*')
             .pipe(filter('**/*.{eot,ttf,woff,woff2}'))
             .pipe(flatten())
             .pipe(gulp.dest('target/tmp/fonts'))
@@ -113,7 +113,7 @@ module.exports = function (gulp) {
     });
 
     gulp.task('images', function () {
-        return gulp.src(['app/**/img/**/*', '!app/bower_components/**/*'])
+        return gulp.src('app/**/img/**/*')
             .pipe(gulp.dest('target/dist'))
             .pipe(size());
     });
diff --git a/tasks/karma.conf.js b/tasks/karma.conf.js
@@ -7,7 +7,7 @@ module.exports = function (config) {
         files: ['**/*/*_test.js'],
         exclude: ['**/*/bower_components'],
         preprocessors: {
-            'app/!(bower_components)/!(patch)/**/!(*_test).js': ['coverage']
+            '!(patch)/**/!(*_test).js': ['coverage']
         },
         reporters: ['progress', 'junit', 'coverage'],
         junitReporter: {
diff --git a/tasks/lint.gulp.js b/tasks/lint.gulp.js
@@ -6,9 +6,9 @@ module.exports = function (gulp) {
         fs = require('fs'),
         scsslint = require('gulp-scss-lint'),
         tslint = require('gulp-tslint'),
-        srcFiles = ['app/**/*.js', 'gulpfile.js', 'tasks/*.js', '!app/bower_components/**/*', '!node_modules/**/*', '!app/patch/**/*'],
-        scssFiles = ['app/*.scss', 'app/sections/**/*.scss', 'app/components/**/*.scss'],
-        tsFiles = ['app/**/*.ts', '!app/bower_components/**/*'];
+        srcFiles = ['app/**/*.js', 'gulpfile.js', 'tasks/*.js', '!app/patch/**/*'],
+        scssFiles = 'app/**/*.scss',
+        tsFiles = 'app/**/*.ts';
 
     gulp.task('eslint', function () {
         var out;
diff --git a/tasks/server.gulp.js b/tasks/server.gulp.js
@@ -6,7 +6,7 @@ module.exports = function (gulp) {
 
     gulp.task('server', function () {
         connect.server({
-            root: ['app', 'target/tmp'],
+            root: ['app', 'target/tmp', '.'],
             livereload: true
         });
     });
diff --git a/tasks/test.gulp.js b/tasks/test.gulp.js
@@ -12,7 +12,7 @@ module.exports = function (gulp) {
     // Runs the unit tests
     gulp.task('test', ['get-sources'], function (done) {
         bowerDeps = wiredep({
-            directory: 'app/bower_components',
+            directory: 'bower_components',
             dependencies: true,
             devDependencies: true
         });
@@ -26,7 +26,7 @@ module.exports = function (gulp) {
     });
 
     gulp.task('get-sources', ['compile-tests'], function () {
-        return gulp.src(['app/**/*.js', 'target/tmp/js/**/*.js', 'target/tmp/partials/**/*.js', '!app/bower_components/**/*'], {base: '.'})
+        return gulp.src(['app/**/*.js', 'target/tmp/js/**/*.js', 'target/tmp/partials/**/*.js'], {base: '.'})
             .pipe(angularFilesort())
             .pipe(filenames('js'));
     });
@@ -47,7 +47,7 @@ module.exports = function (gulp) {
                 },
                 out: 'all_test.js'
             }),
-            tsResult = gulp.src(['app/**/*Test.ts', 'app/**/*test.ts', '!app/bower_components/**/*'])
+            tsResult = gulp.src(['app/**/*Test.ts', 'app/**/*test.ts'])
                 .pipe(ts(tsProject));
 
         return tsResult.js
diff --git a/tasks/ts.gulp.js b/tasks/ts.gulp.js
@@ -27,7 +27,7 @@ module.exports = function (gulp) {
                 },
                 out: 'all.js'
             }),
-            tsResult = gulp.src(['app/**/*.ts', '!app/**/*Test.ts', '!app/**/*test.ts', '!app/bower_components/**/*'])
+            tsResult = gulp.src(['app/**/*.ts', '!app/**/*Test.ts', '!app/**/*test.ts'])
                 .pipe(sourcemaps.init())
                 .pipe(ts(tsProject));
 
diff --git a/tasks/watch.gulp.js b/tasks/watch.gulp.js

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "directory": "app/bower_components"`
	`2`	`+ "directory": "bower_components"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/// <reference path='../../bower_components/DefinitelyTyped/angularjs/angular.d.ts' />`
	`1`	`+/// <reference path='../../../bower_components/DefinitelyTyped/angularjs/angular.d.ts' />`
`2`	`2`
`3`	`3`	`module Portfolio {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/// <reference path="../../bower_components/DefinitelyTyped/angularjs/angular.d.ts" />`
	`1`	`+/// <reference path="../../../bower_components/DefinitelyTyped/angularjs/angular.d.ts" />`
`2`	`2`	`/// <reference path='PortfolioController.ts' />`
`3`	`3`	`/// <reference path='../../components/portfolio/PortfolioService.ts' />`
`4`	`4`	`/// <reference path='../../components/navigation/NavigationController.ts' />`