Merge pull request #6811 from crookedneighbor/upgrade_babel

chore: upgrade babel to v6

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015"],
+  "plugins": ["syntax-async-functions","transform-regenerator"]
+}

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 website/public/gen
 website/public/common
+website/transpiled-babel/
+common/transpiled-babel/
 node_modules
 *.swp
 .idea*

Gruntfile.js

@@ -1,5 +1,5 @@
 /*global module:false*/
-require('babel-core/register');
+require('babel-register');
 var _ = require('lodash');
 module.exports = function(grunt) {
 

Procfile

@@ -1 +1 @@
-web: node ./website/src/server.js
+web: node ./website/transpiled-babel/server.js

common/browserify.js

@@ -0,0 +1,7 @@
+var shared = require('./script/index');
+var _ = require('lodash');
+var moment = require('moment');
+
+window.habitrpgShared = shared;
+window._ = _;
+window.moment = moment;

common/index.js

@@ -1,9 +1,9 @@
-module.exports = require('./script/index');
-var _ = require('lodash');
-var moment = require('moment');
+var pathToCommon;
 
-if (typeof window !== 'undefined') {
-  window.habitrpgShared = module.exports;
-  window._ = _;
-  window.moment = moment;
+if (process.env.NODE_ENV === 'production') {
+  pathToCommon = './transpiled-babel/index';
+} else {
+  pathToCommon = './script/index';
 }
+
+module.exports = require(pathToCommon);

common/script/content/appearance/backgrounds.js

@@ -1,5 +1,5 @@
 import {forOwn} from 'lodash';
-let t = require('../translation.js');
+import t from '../translation';
 
 /* eslint-disable camelcase */
 let backgrounds = {
@@ -320,4 +320,4 @@ forOwn(backgrounds, function prefillBackgroundSet (value) {
   });
 });
 
-export default backgrounds;
+module.exports = backgrounds;

common/script/content/appearance/hair/bangs.js

@@ -1,6 +1,6 @@
 import prefill from '../prefill.js';
 
-export default prefill({
+module.exports = prefill({
   0: {},
   1: {},
   2: {},

common/script/content/appearance/hair/base.js

@@ -1,6 +1,7 @@
 import prefill from '../prefill.js';
 import sets from '../sets.js';
-export default prefill({
+
+module.exports = prefill({
   0: {},
   1: {},
   2: {price: 2, set: sets.baseHair1},

common/script/content/appearance/hair/beard.js

@@ -1,7 +1,7 @@
 import sets from '../sets.js';
 import prefill from '../prefill.js';
 
-export default prefill({
+module.exports = prefill({
   0: {},
   1: {price: 2, set: sets.facialHair},
   2: {price: 2, set: sets.facialHair},

common/script/content/appearance/hair/color.js

@@ -1,7 +1,7 @@
 import sets from '../sets.js';
 import prefill from '../prefill.js';
 
-export default prefill({
+module.exports = prefill({
   white: {},
   brown: {},
   blond: {},

common/script/content/appearance/hair/flower.js

@@ -1,6 +1,6 @@
 import prefill from '../prefill.js';
 
-export default prefill({
+module.exports = prefill({
   0: {},
   1: {},
   2: {},

common/script/content/appearance/hair/index.js

@@ -5,7 +5,7 @@ import color from './color.js';
 import flower from './flower.js';
 import mustache from './mustache.js';
 
-export default {
+module.exports = {
   color,
   base,
   bangs,

common/script/content/appearance/hair/mustache.js

@@ -1,7 +1,7 @@
 import sets from '../sets.js';
 import prefill from '../prefill.js';
 
-export default prefill({
+module.exports = prefill({
   0: {},
   1: {price: 2, set: sets.facialHair},
   2: {price: 2, set: sets.facialHair},

common/script/content/appearance/prefill.js

@@ -1,6 +1,6 @@
 import {forOwn} from 'lodash';
 
-export default function prefillAppearances (obj) {
+module.exports = function prefillAppearances (obj) {
   forOwn(obj, function prefillAppearance (value, key) {
     value.key = key;
     if (!value.price) {
@@ -8,4 +8,4 @@ export default function prefillAppearances (obj) {
     }
   });
   return obj;
-}
+};

common/script/content/appearance/sets.js

@@ -1,7 +1,7 @@
 import t from '../translation';
 import prefill from './prefill.js';
 
-export default prefill({
+module.exports = prefill({
   baseHair1: {setPrice: 5, text: t('hairSet1')},
   baseHair2: {setPrice: 5, text: t('hairSet2')},
   facialHair: {setPrice: 5, text: t('bodyFacialHair')},

common/script/content/appearance/shirt.js

@@ -1,7 +1,7 @@
 import sets from './sets.js';
 import prefill from './prefill.js';
 
-export default prefill({
+module.exports = prefill({
   black: {},
   blue: {},
   green: {},

common/script/content/appearance/size.js

@@ -1,6 +1,6 @@
 import prefill from './prefill.js';
 
-export default prefill({
+module.exports = prefill({
   slim: {},
   broad: {},
 });

common/script/content/appearance/skin.js

@@ -1,7 +1,7 @@
 import prefill from './prefill.js';
 import sets from './sets.js';
 
-export default prefill({
+module.exports = prefill({
   /* eslint-disable quote-props */
   'ddc994': {},
   'f5a76e': {},

common/script/content/faq.js

@@ -1,10 +1,8 @@
-let t = require('./translation.js');
+import t from './translation';
 
-let NUMBER_OF_QUESTIONS = 12;
+const NUMBER_OF_QUESTIONS = 12;
 
-let faq = {};
-
-faq.questions = [];
+export const questions = [];
 
 for (let i = 0; i <= NUMBER_OF_QUESTIONS; i++) {
   let question = {
@@ -13,12 +11,10 @@ for (let i = 0; i <= NUMBER_OF_QUESTIONS; i++) {
     web: t(`webFaqAnswer${i}`),
   };
 
-  faq.questions.push(question);
+  questions.push(question);
 }
 
-faq.stillNeedHelp = {
+export const stillNeedHelp = {
   ios: t('iosFaqStillNeedHelp'),
   web: t('webFaqStillNeedHelp'),
 };
-
-module.exports = faq;

common/script/content/gear/armor.js

@@ -22,4 +22,4 @@ let armor = {
   armoire: armoireArmor,
 };
 
-export default armor;
+module.exports = armor;

common/script/content/gear/back.js

@@ -9,5 +9,5 @@ let back = {
   special: specialBack,
 };
 
-export default back;
+module.exports = back;
 

common/script/content/gear/body.js

@@ -7,5 +7,5 @@ let body = {
   special: specialBody,
 };
 
-export default body;
+module.exports = body;
 

common/script/content/gear/eyewear.js

@@ -11,4 +11,4 @@ let eyewear = {
   armoire: armoireEyewear,
 };
 
-export default eyewear;
+module.exports = eyewear;

common/script/content/gear/head-accessory.js

@@ -9,5 +9,5 @@ let headAccessory = {
   mystery: mysteryHeadAccessory,
 };
 
-export default headAccessory;
+module.exports = headAccessory;
 

common/script/content/gear/head.js

@@ -22,4 +22,4 @@ let head = {
   armoire: armoireHead,
 };
 
-export default head;
+module.exports = head;

common/script/content/gear/index.js

@@ -78,7 +78,7 @@ each(GEAR_TYPES, (type) => {
   });
 });
 
-export default {
+module.exports = {
   tree: gear,
   flat,
 };

common/script/content/gear/sets/armoire.js

@@ -495,4 +495,4 @@ let armoireSet = {
   weapon,
 };
 
-export default armoireSet;
+module.exports = armoireSet;

common/script/content/gear/sets/base.js

@@ -77,4 +77,4 @@ let baseSet = {
   weapon,
 };
 
-export default baseSet;
+module.exports = baseSet;

common/script/content/gear/sets/healer.js

@@ -155,4 +155,4 @@ let healerSet = {
   weapon,
 };
 
-export default healerSet;
+module.exports = healerSet;

common/script/content/gear/sets/mystery.js

@@ -385,4 +385,4 @@ let mysterySet = {
   weapon,
 };
 
-export default mysterySet;
+module.exports = mysterySet;

common/script/content/gear/sets/rogue.js

@@ -167,4 +167,4 @@ let rogueSet = {
   weapon,
 };
 
-export default rogueSet;
+module.exports = rogueSet;

common/script/content/gear/sets/special/index.js

@@ -1534,4 +1534,4 @@ let specialSet = {
   weapon,
 };
 
-export default specialSet;
+module.exports = specialSet;

common/script/content/gear/sets/special/special-backer.js

@@ -90,4 +90,4 @@ let backerSet = {
   weaponSpecial3,
 };
 
-export default backerSet;
+module.exports = backerSet;

common/script/content/gear/sets/special/special-contributor.js

@@ -76,4 +76,4 @@ let contributorSet = {
   weaponSpecialCritical,
 };
 
-export default contributorSet;
+module.exports = contributorSet;

common/script/content/gear/sets/special/special-wondercon.js

@@ -59,4 +59,4 @@ let wonderconSet = {
   eyewearSpecialWonderconBlack,
 };
 
-export default wonderconSet;
+module.exports = wonderconSet;

common/script/content/gear/sets/warrior.js

@@ -152,4 +152,4 @@ let warriorSet = {
   weapon,
 };
 
-export default warriorSet;
+module.exports = warriorSet;

common/script/content/gear/sets/wizard.js

@@ -138,4 +138,4 @@ let wizardSet = {
   weapon,
 };
 
-export default wizardSet;
+module.exports = wizardSet;

common/script/content/gear/shield.js

@@ -26,4 +26,4 @@ let shield = {
   armoire: armoireShield,
 };
 
-export default shield;
+module.exports = shield;

common/script/content/gear/weapon.js

@@ -22,4 +22,4 @@ let weapon = {
   armoire: armoireWeapon,
 };
 
-export default weapon;
+module.exports = weapon;

common/script/content/index.js

@@ -1,12 +1,6 @@
-var _, api, calculateBonus, diminishingReturns, moment, t;
-
-api = module.exports;
-
-_ = require('lodash');
-
-moment = require('moment');
-
-t = require('./translation.js');
+import _ from 'lodash';
+import moment from 'moment';
+import t from './translation';
 
 import {
   CLASSES,
@@ -16,6 +10,8 @@ import {
   USER_CAN_OWN_QUEST_CATEGORIES,
 } from './constants';
 
+let api = module.exports;
+
 import mysterySets from './mystery-sets';
 
 import gear from './gear';
@@ -23,6 +19,7 @@ import gear from './gear';
 import appearances from './appearance';
 import backgrounds from './appearance/backgrounds.js'
 import spells from './spells';
+import faq from './faq';
 
 api.mystery = mysterySets;
 
@@ -2606,4 +2603,4 @@ api.userDefaults = {
   ]
 };
 
-api.faq = require('./faq.js');
+api.faq = faq;

common/script/content/mystery-sets.js

@@ -1,5 +1,5 @@
 import { each } from 'lodash';
-let t = require('./translation.js');
+import t from './translation';
 
 let mysterySets = {
   201402: {
@@ -122,4 +122,4 @@ each(mysterySets, (value, key) => {
   value.text = t(`mysterySet${key}`);
 });
 
-export default mysterySets;
+module.exports = mysterySets;

common/script/content/spells.js

@@ -506,4 +506,4 @@ _.each(spells, (spellClass) => {
   });
 });
 
-export default spells;
+module.exports = spells;

common/script/content/translation.js

@@ -1,6 +1,6 @@
 import i18n from '../i18n';
 
-export default function translator (string, vars = { a: 'a' }) {
+module.exports = function translator (string, vars = { a: 'a' }) {
   function func (lang) {
     return i18n.t(string, vars, lang);
   }
@@ -8,4 +8,4 @@ export default function translator (string, vars = { a: 'a' }) {
   func.i18nLangFunc = true; // Trick to recognize this type of function
 
   return func;
-}
+};

common/script/count.js

@@ -67,7 +67,7 @@ function questsOfCategory (userQuests, category) {
   return count;
 }
 
-export default {
+module.exports = {
   beastMasterProgress,
   dropPetsCurrentlyOwned,
   mountMasterProgress,

common/script/i18n.js

@@ -60,4 +60,4 @@ function t (stringName) {
   }
 }
 
-export default i18n;
+module.exports = i18n;

common/script/index.js

@@ -1,7 +1,10 @@
+import moment from 'moment';
+import _ from 'lodash';
+
 import {
   daysSince,
   shouldDo,
-} from '../../common/script/cron';
+} from './cron';
 import {
   MAX_HEALTH,
   MAX_LEVEL,
@@ -9,18 +12,13 @@ import {
 } from './constants';
 import * as statHelpers from './statHelpers';
 
-var $w, _, api, content, i18n, preenHistory, moment, sortOrder,
+var $w, preenHistory, sortOrder,
   indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-moment = require('moment');
+import content from './content/index';
+import i18n from './i18n';
 
-_ = require('lodash');
-
-content = require('./content/index');
-
-i18n = require('./i18n');
-
-api = module.exports = {};
+let api = module.exports = {};
 
 api.i18n = i18n;
 api.shouldDo = shouldDo;
@@ -471,7 +469,8 @@ api.appliedTags = function(userTags, taskTags) {
 Various counting functions
  */
 
-api.count = require('./count');
+import count from './count';
+api.count = count;
 
 
 /*

gulpfile.js

@@ -6,7 +6,7 @@
  * directory, and it will automatically be included.
  */
 
-require('babel-core/register');
+require('babel-register');
 
 if (process.env.NODE_ENV === 'production') {
   require('./tasks/gulp-newstuff');

package.json

@@ -9,8 +9,12 @@
     "amplitude": "^2.0.3",
     "async": "~0.9.0",
     "aws-sdk": "^2.0.25",
-    "babel-core": "^5.8.34",
-    "babelify": "^6.x.x",
+    "babel-plugin-syntax-async-functions": "^6.5.0",
+    "babel-plugin-transform-regenerator": "^6.6.0",
+    "babel-polyfill": "^6.6.1",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-register": "^6.6.0",
+    "babelify": "^7.2.0",
     "bower": "~1.3.12",
     "browserify": "~12.0.1",
     "connect-ratelimit": "0.0.7",
@@ -32,6 +36,7 @@
     "grunt-hashres": "~0.4.1",
     "grunt-karma": "~0.12.1",
     "gulp": "^3.9.0",
+    "gulp-babel": "^6.1.2",
     "gulp-eslint": "^1.0.0",
     "gulp-grunt": "^0.5.2",
     "gulp-imagemin": "^2.3.0",
@@ -103,7 +108,7 @@
     "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
   },
   "devDependencies": {
-    "babel-eslint": "^4.1.6",
+    "babel-eslint": "^5.0.0",
     "chai": "^3.4.0",
     "chai-as-promised": "^5.1.0",
     "coveralls": "^2.11.2",
@@ -116,7 +121,7 @@
     "expect.js": "~0.2.0",
     "istanbul": "^0.3.14",
     "karma": "~0.13.15",
-    "karma-babel-preprocessor": "^5.0.0",
+    "karma-babel-preprocessor": "^6.0.1",
     "karma-chai-plugins": "~0.6.0",
     "karma-coverage": "^0.5.3",
     "karma-mocha": "^0.2.0",

tasks/gulp-babelify.js

@@ -8,7 +8,7 @@ import babel from 'babelify';
 
 gulp.task('browserify', function () {
   let bundler = browserify({
-    entries: './common/index.js',
+    entries: './common/browserify.js',
     debug: true,
     transform: [[babel, { compact: false }]],
   });

tasks/gulp-build.js

@@ -1,4 +1,5 @@
 import gulp from 'gulp';
+import babel from 'gulp-babel';
 require('gulp-grunt')(gulp);
 
 gulp.task('build', () => {
@@ -9,6 +10,20 @@ gulp.task('build', () => {
   }
 });
 
+gulp.task('build:src', () => {
+  return gulp.src('website/src/**/*.js')
+    .pipe(babel())
+    .pipe(gulp.dest('website/transpiled-babel/'));
+});
+
+gulp.task('build:common', () => {
+  return gulp.src('common/script/**/*.js')
+    .pipe(babel())
+    .pipe(gulp.dest('common/transpiled-babel/'));
+});
+
+gulp.task('build:server', ['build:src', 'build:common']);
+
 gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => {
   gulp.start('grunt-build:dev', done);
 });
@@ -17,6 +32,6 @@ gulp.task('build:dev:watch', ['build:dev'], () => {
   gulp.watch(['website/public/**/*.styl', 'common/script/*']);
 });
 
-gulp.task('build:prod', ['browserify', 'prepare:staticNewStuff'], (done) => {
+gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff'], (done) => {
   gulp.start('grunt-build:prod', done);
 });

tasks/gulp-tests.js

@@ -72,7 +72,7 @@ gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
   }
 });
 
-gulp.task('test:prepare:build', (cb) => {
+gulp.task('test:prepare:build', ['build'], (cb) => {
   exec(testBin('grunt build:test'), cb);
 });
 

tasks/taskHelper.js

@@ -20,7 +20,7 @@ export var conf = nconf;
  * its tasks.
  */
 export function kill(proc) {
-  ((pid) => {
+  let killProcess = (pid) => {
     psTree(pid, (_, pids) => {
       if(pids.length) {
         pids.forEach(kill); return
@@ -32,7 +32,9 @@ export function kill(proc) {
       }
       catch(e) { console.log(e) }
     });
-  }(proc.PID || proc.pid));
+  }
+
+  killProcess(proc.PID || proc.pid);
 };
 
 /*

test/mocha.opts

@@ -4,6 +4,7 @@
 --check-leaks
 --growl
 --globals io
---compilers js:babel-core/register
+-r babel-polyfill
+--compilers js:babel-register
 --require test/api-legacy/api-helper
 --require ./test/helpers/globals.helper

website/src/server.js

@@ -1,4 +1,6 @@
-require('babel-core/register');
+if (process.env.NODE_ENV !== 'production') {
+  require('babel-register');
+}
 // Only do the minimal amount of work before forking just in case of a dyno restart
 var cluster = require("cluster");
 var _ = require('lodash');