Merge pull request #73 from cesine/node_12

node 12

Author: cesine

.browserslistrc

@@ -0,0 +1 @@
+['last 2 versions']

.travis.yml

@@ -1,9 +1,13 @@
 language: node_js
 
 node_js:
-  - 6
+  - 12
+
 script:
-  - yarn lint
-  - yarn lint:es6
-  - yarn test
-  - yarn test:ci
+  - npm run lint
+  - npm run lint:es6
+  - npm run test
+  - npm run test:ci
+  - npm run build:production
+  - npm run test
+  - npm run test:ci

README.md

@@ -13,7 +13,6 @@ Mac:
 
 ```bash
 $ brew install node
-$ brew install yarn # optional, you can also use npm
 ```
 
 Linux:
@@ -31,7 +30,7 @@ You can download node from http://nodejs.org
 ### Install dependancies
 
 ```
-$ yarn install
+$ npm install
 ```
 
 ## Configure
@@ -45,13 +44,13 @@ You can create a `config/local.js` file to point to the corpus service you want
 To turn on the server:
 
 ```bash
-$ yarn watch
+$ npm run watch
 ```
 
 To develop offline with fixture data:
 
 ```bash
-$ OFFLINE=true yarn start --offline
+$ OFFLINE=true npm start --offline
 ```
 
 Then open https://localhost:3182 and accept the security certificate warning since you are developing locally with a self signed certificate.
@@ -126,7 +125,7 @@ Redux server side render is based on from [mz026](https://github.com/mz026/unive
 - [Webpack](https://webpack.github.io/)@2.2
 - [Babel](https://babeljs.io/)@6
 - Express as isomorphic server
-- `yarn` as package manager
+- `npm` as package manager
 
 
 ### Testing:
@@ -152,25 +151,31 @@ To test your production build:
 
 ```bash
 $ gulp build
-$ NODE_ENV=production yarn start
+$ NODE_ENV=production npm start
 ```
 
 ## Deployment:
 
 To deploy this app to production environment:
 
-- Run `$ NODE_ENV=production yarn install` on server
-  - After the installation above, `postinstall` script will run automatically, building front-end related assets and rev-ed server code under `dist/` folder.
+- Run `$ NODE_ENV=development npm install` on server
+  - After the installation above, then run `$ npm run build:production` which will build the front-end related assets and rev-ed server code under `dist/` folder.
 
 - Kick off the server with:
 
-` NODE_ENV=production NODE_PATH=./dist/server-build node dist/server-build/server`
+`$ npm run start:production`
+
+- Once you're sure the server is operational, start the service with forever:
+
+`$./start_service`
 
 ## Release History
 * v1.62  activity heat map
 * v1.72  display of terms of use and elastic search integration
 * v3.19  refactored server.js into routes and updated express 2.x to 4.x
-
+* v3.21.15 migrated public urls from jade to handlebars
+* v5.4.21 migrated public urls from handlebars to react
+* v5.168.15 upgraded to node 12
 
 ## License
 Licensed under the Apache, 2.0 licenses.

gulpfile.js

@@ -1,52 +1,53 @@
-var gulp = require('gulp'),
-  $ = require('gulp-load-plugins')({
-    camelize: true
-  }),
-  runSequence = require('run-sequence')
+var gulp = require('gulp');
+var RevAll = require("gulp-rev-all");
+
+$ = require('gulp-load-plugins')({
+  camelize: true
+});
 
 gulp.task('css', function() {
   return gulp.src('app/components/App/app.scss')
     .pipe($.sourcemaps.init())
     .pipe($.sass().on('error', $.sass.logError))
     .pipe($.autoprefixer({
-      browsers: ['last 2 versions'],
+      // browsers: ['last 2 versions'],
       cascade: false
     }))
     .pipe($.sourcemaps.write())
     .pipe(gulp.dest('./dist'))
 })
 
-gulp.task('css:watch', ['css'], function() {
+gulp.task('css:watch', gulp.series(['css'], function() {
   gulp.watch('app/**/*.scss', ['css'])
-})
+}))
 
 gulp.task('moveAssets', function() {
   return gulp.src('./app/assets/**/*')
     .pipe(gulp.dest('./dist/assets'))
 })
 
-gulp.task('build:revAssets', ['css', 'moveAssets'], function() {
-  var rev = new $.revAll()
+gulp.task('build:revAssets', gulp.series(['css', 'moveAssets'], function() {
+  // var rev = new $.revAll()
   return gulp.src('./dist/**/*')
-    .pipe(rev.revision())
+    .pipe(RevAll.revision())
     .pipe(gulp.dest('./dist/public'))
-    .pipe(rev.manifestFile())
+    .pipe(RevAll.manifestFile())
     .pipe(gulp.dest('./dist'))
-})
+}))
 
 gulp.task('build:cpServer', function() {
   return gulp.src('./app/**/*.{js,jsx,ejs}')
     .pipe(gulp.dest('./dist/server-build'))
 })
-gulp.task('build:revServer', ['build:cpServer'], function() {
+gulp.task('build:revServer', gulp.series(['build:cpServer'], function() {
   var manifest = gulp.src('./dist/rev-manifest.json')
   return gulp.src('./dist/server-build/{components,containers}/**/*')
     .pipe($.revReplace({
       manifest: manifest
     }))
     .pipe(gulp.dest('./dist/server-build'))
-})
+}))
 
-gulp.task('build', function() {
-  runSequence('build:revAssets', 'build:revServer')
-})
+gulp.task('build', gulp.series('build:revAssets', 'build:revServer', function (done) {
+    done();
+}));