Merge pull request #75 from topcoder-platform/dev

Group management and bower removal

Author: ajefts

README.md

@@ -12,12 +12,10 @@ Internal application used to administer specific support tasks related to the To
 
 ## Installation
 
-To install npm and bower dependencies run:
+To install npm  dependencies run:
 
 > npm install
 
-Bower is set to run as a npm postinstall script.
-
 ## Configuration
 
 The configuration is provided in `config.json` in the base directory.
@@ -64,13 +62,12 @@ Before executing the end-to-end (e2e) protractor tests, these environment variab
 
 ### Install global dependencies
 
-```npm install -g [email protected] bower```
+```npm install -g [email protected]```
 
 ### Install project dependencies
 
 ```
 npm install
-bower install
 ```
 
 ### Start the Application

bower.json

@@ -12,7 +12,6 @@ dependencies:
     - curl -s https://raw.githubusercontent.com/chronogolf/circleci-google-chrome/master/use_chrome_stable_version.sh | bash
 
   override:
-    - rm -rf bower_components
     - npm install
 
   post:

circle.yml

@@ -0,0 +1,40 @@
+var gulp = require('gulp');
+
+var paths = gulp.paths;
+
+var browserify = require('browserify');
+var uglify = require('gulp-uglify');
+var buffer = require('vinyl-buffer');
+var source = require('vinyl-source-stream');
+var gutil = require('gulp-util');
+var fs = require('fs');
+
+gulp.task('browserify', ['styles'], function () {
+
+  var cssFilePath = paths.tmp + '/serve/app/bundle.css';
+
+  //delete file if exist
+  if (fs.existsSync(cssFilePath)) {
+    fs.unlinkSync(cssFilePath);
+  }
+
+  browserify('./src/index.js')
+    .transform(require('browserify-css'), {
+      rootDir: 'src',
+      onFlush: function (options, done) {
+        fs.appendFileSync(cssFilePath, options.data);
+
+        // Do not embed CSS into a JavaScript bundle
+        done(null);
+      }
+    })
+    .bundle()
+    .on('error', function (e) {
+      gutil.log("Browserify Error", gutil.colors.red(e.message))
+    })
+    //Pass desired output filename to vinyl-source-stream
+    .pipe(source('bundle.js'))
+    .pipe(buffer())
+    .pipe(uglify())
+    .pipe(gulp.dest(paths.tmp + '/serve/app'));
+});

gulp/browserify.js

@@ -5,7 +5,7 @@ var gulp = require('gulp');
 var paths = gulp.paths;
 
 var $ = require('gulp-load-plugins')({
-  pattern: ['gulp-*', 'main-bower-files', 'uglify-save-license', 'del']
+  pattern: ['gulp-*', 'uglify-save-license', 'del']
 });
 
 gulp.task('partials', function () {
@@ -46,7 +46,7 @@ gulp.task('html', ['inject', 'partials'], function () {
     .pipe($.uglify({preserveComments: $.uglifySaveLicense}))
     .pipe(jsFilter.restore())
     .pipe(cssFilter)
-    .pipe($.replace('../bootstrap/fonts', 'fonts'))
+    .pipe($.replace(/\.?\.?\/node_modules\/\w+-?\/?\w+\/fonts\/?/g, '../fonts/'))
     .pipe($.csso())
     .pipe(cssFilter.restore())
     .pipe(assets.restore())
@@ -69,15 +69,18 @@ gulp.task('images', function () {
 });
 
 gulp.task('fonts', function () {
-  return gulp.src($.mainBowerFiles())
+  return gulp.src([
+    "node_modules/bootstrap/dist/fonts/*.{eot,svg,ttf,woff}",
+    "node_modules/footable/css/fonts/*.{eot,svg,ttf,woff}"
+    ])
     .pipe($.filter('**/*.{eot,svg,ttf,woff}'))
     .pipe($.flatten())
     .pipe(gulp.dest(paths.dist + '/fonts/'))
     .pipe(gulp.dest(paths.dist + '/styles/fonts/'));
 });
 
 gulp.task('fontawesome', function () {
-    return gulp.src('bower_components/font-awesome/fonts/*.{eot,svg,ttf,woff}')
+    return gulp.src('node_modules/font-awesome/fonts/*.{eot,svg,ttf,woff}')
      .pipe(gulp.dest(paths.dist + '/fonts/'));
 });
 

gulp/build.js

@@ -6,9 +6,8 @@ var paths = gulp.paths;
 
 var $ = require('gulp-load-plugins')();
 
-var wiredep = require('wiredep').stream;
 
-gulp.task('inject', ['styles'], function () {
+gulp.task('inject', ['browserify'], function () {
 
   var injectStyles = gulp.src([
     paths.tmp + '/serve/{app,components}/**/*.css',
@@ -26,15 +25,9 @@ gulp.task('inject', ['styles'], function () {
     addRootSlash: false
   };
 
-  var wiredepOptions = {
-    directory: 'bower_components',
-    exclude: [/bootstrap\.js/, /bootstrap\.css/, /bootstrap\.css/, /foundation\.css/]
-  };
-
   return gulp.src(paths.src + '/*.html')
     .pipe($.inject(injectStyles, injectOptions))
     .pipe($.inject(injectScripts, injectOptions))
-    .pipe(wiredep(wiredepOptions))
     .pipe(gulp.dest(paths.tmp + '/serve'));
 
 });

gulp/inject.js

@@ -16,7 +16,7 @@ function browserSyncInit(baseDir, files, browser) {
   var routes = null;
   if(baseDir === paths.src || (util.isArray(baseDir) && baseDir.indexOf(paths.src) !== -1)) {
     routes = {
-      '/bower_components': 'bower_components'
+      '/node_modules': 'node_modules'
     };
   }
 

gulp/server.js

@@ -10,7 +10,7 @@ gulp.task('styles', function () {
 
   var lessOptions = {
     paths: [
-      'bower_components',
+      'node_modules',
       paths.src + '/app',
       paths.src + '/components'
     ]

gulp/styles.js

@@ -10,7 +10,7 @@ var paths = gulp.paths;
 
 function runTests (singleRun, done) {
   var bowerDeps = wiredep({
-    directory: 'bower_components',
+    directory: 'node_modules',
     exclude: ['bootstrap-sass-official'],
     dependencies: true,
     devDependencies: true

gulp/unit-tests.js

@@ -7,8 +7,10 @@ var paths = gulp.paths;
 gulp.task('watch', ['inject'], function () {
   gulp.watch([
     paths.src + '/*.html',
+    paths.src + '/*.css',
+    paths.src + '/*.js',
     paths.src + '/{app,components}/**/*.less',
     paths.src + '/{app,components}/**/*.js',
-    'bower.json'
+    'package.json'
   ], ['inject']);
 });