Babel fixes

doc/app.js

@@ -2,7 +2,6 @@
 /* eslint-disable no-console */
 
 var Documentation = require('./model/Documentation');
-var Component = require('../ui/Component');
 var DocumentationReader = require('./DocumentationReader');
 var importDocumentation = require('./model/importDocumentation');
 var request = require('../util/request');

doc/generator/parseFile.js

@@ -161,7 +161,6 @@ Parser.Prototype = function() {
     return nodes;
   };
 
-  var STATIC_PROP = /(.+)\.static/;
   var _typeTagMatcher = /^\s*(\{[^@][^{]+\})\s+([\w\/]+)\s+(.+)/;
 
   /**

test/ui/Clipboard.test.js

@@ -7,7 +7,6 @@ var Registry = require('../../util/Registry');
 var ComponentRegistry = require('../../ui/ComponentRegistry');
 var Clipboard = require('../../ui/Clipboard');
 var DOMElement = require('../../ui/DOMElement');
-var Component = require('../../ui/Component');
 var StubSurface = require('./StubSurface');
 var TestContainerEditor = require('./TestContainerEditor');
 

test/ui/Surface.test.js

@@ -7,7 +7,6 @@ var Registry = require('../../util/Registry');
 var createAnnotation = require('../../model/transform/createAnnotation');
 var DocumentSession = require('../../model/DocumentSession');
 var SurfaceManager = require('../../ui/SurfaceManager');
-var Component = require('../../ui/Component');
 
 var TestContainerEditor = require('./TestContainerEditor');
 var fixture = require('../fixtures/createTestArticle');

test/ui/TextPropertyComponent.test.js

@@ -1,8 +1,6 @@
 "use strict";
 
 var test = require('../test').module('ui/TextPropertyComponent');
-
-var Component = require('../../ui/Component');
 var TextPropertyComponent = require('../../ui/TextPropertyComponent');
 
 var fixture = require('../fixtures/createTestArticle');

ui/Command.js

@@ -8,7 +8,7 @@ var oo = require('../util/oo');
  @class
 */
 
-var Command = function(params) {
+function Command(params) {
   this.params = params || {};
   this.name = this.params.name;
   if (!this.name) {

util/_bundleStyles.js

@@ -2,6 +2,7 @@
 
 // worker for sub-process
 
+var cloneDeep = require('lodash/cloneDeep');
 var path = require('path');
 
 process.on('message', function(paramStr) {
@@ -12,24 +13,10 @@ process.on('message', function(paramStr) {
   // ATTENTION: if someone wants to use es6 in their project
   // they must use node6 and have babel-plugin-transfprm-es2015-
   // they must have babel-register and es2015 installed
-  if (params.es6 || params.jsx) {
-    var plugins = [];
-    if (params.es6) {
-      plugins = plugins.concat(require('./_es6-babel-plugins'));
-    }
-    if (params.jsx) {
-      plugins.push("syntax-jsx");
-      plugins.push(
-        [ "transform-react-jsx", {
-          // this will generate calls such as in
-          // $$(MyComp, props, ...children)
-          "pragma": "$$"
-        }]
-      );
-    }
-    require(path.join(params.rootDir, 'node_modules', 'babel-register'))({
-      plugins: plugins
-    });
+  if (params.babel) {
+    var babelParams = cloneDeep(params.babel);
+    var babelRegister = path.join(params.rootDir, 'node_modules', 'babel-register');
+    require(babelRegister)(babelParams);
   }
   var Configurator = require(configuratorPath);
   var MainPackage = require(mainPackagePath);

util/bundleJS.js

@@ -1,58 +1,16 @@
 'use strict';
 
+var cloneDeep = require('lodash/cloneDeep');
 var extend = require('lodash/extend');
 var browserify = require('browserify');
 
 module.exports = function bundleJS(params, cb) {
   if (!params.sourcePath) throw new Error("'sourcePath' is required");
-  params = extend({
-    jsx: false,
-    es6: false,
-    cache: true,
-  }, params);
-  var opts = {
-    debug: true,
-    extensions: []
-  };
-  if (params.cache) {
-    opts.cache = {};
-    opts.packageCache = {};
-  }
-  if (params.jsx) {
-    opts.extensions.push('.jsx');
-  }
+  var opts = extend({}, params.browserify);
+  // console.log('#### browserify options', opts);
   var b = browserify(opts).add(params.sourcePath);
-
-  var useBabelify = params.jsx || params.es6;
-  if (useBabelify) {
-    var plugins = [];
-    var presets = [];
-    if (params.jsx) {
-      plugins.push("syntax-jsx");
-      plugins.push(
-        [ "transform-react-jsx", {
-          // this will generate calls such as in
-          // $$(MyComp, props, ...children)
-          "pragma": "$$"
-        }]
-      );
-    }
-    if (params.es6 === true || params.es6 === "full") {
-      plugins = plugins.concat(require('./_es6-babel-plugins'));
-    } else if (params.es6 === "modules") {
-      plugins.push(
-        // support for es6 import/export
-        // Note: the rest of es6 is supported natively by chrome
-        ["transform-es2015-modules-commonjs-simple", {
-          "noMangle": true,
-          "addExports": true
-        }]
-      );
-    }
-    b = b.transform("babelify", {
-      presets: presets,
-      plugins: plugins
-    });
+  if (params.babel) {
+    b = b.transform("babelify", cloneDeep(params.babel));
   }
   b.bundle(function(err, buf) {
     if (err) {
@@ -61,4 +19,5 @@ module.exports = function bundleJS(params, cb) {
       cb(null, buf);
     }
   });
-}
+};
+

util/bundleStyles.js

@@ -27,6 +27,7 @@ module.exports = function(params, cb) {
         else cb(null, result.css);
       });
     } else {
+      console.info('Bundling styles for package %s', params.mainPackagePath);
       var cp = require('child_process');
       var child = cp.fork(require.resolve('./_bundleStyles'));
       child.on('message', function(resultStr) {

util/oo.js

@@ -191,7 +191,7 @@ function _afterClassInitHook() {
   extend(Function, Function) -> inheritance with prototype function
 */
 function _extendClass() {
-  var ParentClass = this;
+  var ParentClass = this; // eslint-disable-line
   // this ctor is used when extend is not provided with a constructor function.
   function AnonymousClass() {
     ParentClass.apply(this, arguments);
@@ -257,8 +257,8 @@ function _mixin(Clazz, mixin) {
 
 function _createExtend(clazz) {
   return function() {
-    return _extendClass.apply(clazz, arguments)
-  }
+    return _extendClass.apply(clazz, arguments);
+  };
 }
 
 function _makeExtensible(clazz) {

util/server.js

@@ -35,11 +35,13 @@ server.serveJS = function(expressApp, route, sourcePath, options) {
   var params = extend(options, { sourcePath: sourcePath });
   expressApp.get(route, function(req, res) {
     var startTime = Date.now();
+    console.log('### Serving %s using browserify', sourcePath);
     bundleJS(params, function(err, buf) {
-      console.info('browserify finished after %s ms', Date.now()-startTime);
       if (err) {
+        console.error('browserify failed:');
         console.error(err.message);
       } else {
+        console.info('browserify finished after %s ms', Date.now()-startTime);
         res.status(200).send(buf);
       }
     });