moving away from CI as a build step

Author: perrygovier

Diff for: Gulpfile.js

@@ -16,6 +16,7 @@ var prefix      = require('gulp-autoprefixer');
 var rename      = require('gulp-rename');
 var runSequence = require('run-sequence');
 var sass        = require('gulp-sass');
+var server      = require('gulp-develop-server');
 var shell       = require('gulp-shell');
 var uglify      = require('gulp-uglify');
 
@@ -26,15 +27,13 @@ var messages = {
 };
 
 var AUTOPREFIXER_BROWSERS = [
-  'ie >= 9',
-  'ie_mob >= 9',
-  'ff >= 30',
-  'chrome >= 34',
-  'safari >= 7',
+  'ie >= 10',
+  'ff >= 45',
+  'chrome >= 54',
+  'safari >= 9',
   'opera >= 23',
-  'ios >= 7',
-  'android >= 4.4',
-  'bb >= 10'
+  'ios >= 9',
+  'android >= 4.4'
 ];
 var closureStart =
   '/*!\n' +
@@ -70,7 +69,7 @@ function bustCacheAndReload(done) {
 
 
   bustCache().on('end', function() {
-    // browserSync.reload();
+    browserSync.reload();
     done();
     // apply the template change in the background
     // gulp.start('jekyll-build.incremental');
@@ -178,13 +177,26 @@ gulp.task('jekyll-rebuild', ['jekyll-build'], function() {
   browserSync.reload();
 });
 
+gulp.task('server-listen', function() {
+  return server.listen({ 'path': './server.js', 'execArgv': ['--harmony'] },
+  function(error) {
+    if (!error) {
+      browserSync({ 'proxy': 'http://localhost:3000', 'port': 3003 });
+    }
+  });
+});
+
 /**
  * Wait for jekyll-build, then launch the Server
  */
-gulp.task('server', ['build'], function() {
-  browserSync({
-    server: {
-      baseDir: '_site'
+gulp.task('server', function() {
+  return runSequence('build', 'server-listen');
+});
+
+gulp.task('server:server', function() {
+  server.restart(function(err) {
+    if (!err) {
+      browserSync.reload();
     }
   });
 });
@@ -196,7 +208,8 @@ gulp.task('server:stylesv2', ['styles:v2'], bustCacheAndReload);
 gulp.task('server:js', ['js'], bustCacheAndReload);
 
 gulp.task('watch', ['server'], function() {
-  gulp.watch('scss/**.scss', ['server:stylesv1']);
+  gulp.watch(['server/**/*'], ['server:server']);
+  gulp.watch('content/scss/**.scss', ['server:stylesv1']);
   gulp.watch(['assets/scss/**/*.scss'], ['server:stylesv2']);
   gulp.watch(['assets/img/**/*.{jpg,png,gif}'], ['images']);
   gulp.watch(['assets/js/**/*.js', 'submit-issue/*/*.js'], ['server:js']);

Diff for: Procfile

@@ -1 +1 @@
-web: node app.js
+web: node server.js

Diff for: completer.hist

@@ -1,4 +1,4 @@
-<link href="/css/site.css?v=39ca13080d3e3e289429a4d447d80717" rel="stylesheet">
+<link href="/css/site.css?v=3443c5c831571f5ff4622ceb223bff7c" rel="stylesheet">
 <!--<script src="//cdn.optimizely.com/js/595530035.js"></script>-->
 <script type="text/javascript">var _sf_startpt=(new Date()).getTime()</script>
 

Diff for: content/_includes/head_includes.html

@@ -1,7 +1,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<link href="/css/styles.min.css?v=f8e5c1b98f73d0cc4c21800fd5854047" rel="stylesheet">
+<link href="/css/styles.min.css?v=93371b1bd553705ebe31ae4d8615afa3" rel="stylesheet">
 
 {% if page.category == 'api' %}
   <title>{{page.title}}{% if page.header_sub_title %} - {{ page.header_sub_title}}{% endif %} -  Ionic Framework</title>

Diff for: content/_includes/v2_fluid/head.html

@@ -3857,13 +3857,11 @@ body.modal-open {
   z-index: 1040; }
   .modal.fade .modal-dialog {
     -webkit-transform: translate(0, -25%);
-    -ms-transform: translate(0, -25%);
     transform: translate(0, -25%);
     transition: -webkit-transform 0.3s ease-out;
     transition: transform 0.3s ease-out; }
   .modal.in .modal-dialog {
     -webkit-transform: translate(0, 0);
-    -ms-transform: translate(0, 0);
     transform: translate(0, 0); }
 
 .modal-dialog {

Diff for: content/css/bootstrap/bootstrap.css

@@ -4,7 +4,7 @@
   "description": "Ionic Framework main site - IonicFramework.com",
   "main": "Gulpfile.js",
   "engines": {
-    "node": "6.7.0"
+    "node": "6.9.2"
   },
   "repository": {
     "type": "git",
@@ -15,16 +15,19 @@
     "url": "https://github.com/driftyco/ionic-site/issues"
   },
   "homepage": "https://github.com/driftyco/ionic-site",
-  "devDependencies": {
+  "dependencies": {
     "browser-sync": "^1.3.7",
+    "compression": "^1.4.6",
     "event-stream": "^3.3.1",
+    "express": "^4.12.3",
     "gulp": "^3.8.8",
     "gulp-autoprefixer": "1.0.0",
     "gulp-cache": "^0.4.1",
     "gulp-cache-bust": "perrygovier/gulp-cache-bust",
     "gulp-changed": "^1.0.0",
     "gulp-concat": "^2.2.0",
     "gulp-csso": "^1.0.0",
+    "gulp-develop-server": "^0.5.2",
     "gulp-footer": "^1.0.5",
     "gulp-header": "^1.7.1",
     "gulp-if": "^1.2.1",
@@ -41,16 +44,12 @@
     "gulp-uglify": "^1.4.1",
     "gulp-util": "^3.0.6",
     "htmlparser2": "^3.8.3",
+    "ionicons": "^3.0.0-alpha.3",
     "js-yaml": "^3.4.2",
     "lunr": "^0.5.12",
     "mkdirp": "^0.5.1",
     "psi": "^1.0.4",
     "run-sequence": "^1.2.2",
     "tiny-lr": "0.0.5"
-  },
-  "dependencies": {
-    "compression": "^1.4.6",
-    "express": "^4.12.3",
-    "ionicons": "^3.0.0-alpha.3"
   }
 }

Diff for: content/css/bootstrap/bootstrap.min.css

@@ -30,13 +30,13 @@ app.set('trust proxy', true);
 app.use(compress());
 app.use(processRequest);
 
-app.use(express.static(process.env.PWD, {
+app.use(express.static(process.env.PWD + '/_site/', {
   maxage: 315360000000 // ten years
 }));
 
 app.use(function(req, res, next) {
   res.status(404);
-  res.sendFile(__dirname + '/404.html');
+  res.sendFile(__dirname + '/_site/404.html');
 });
 
 // bind the app to listen for connections on a specified port