Merge pull request #4815 from spalger/node/downgradeTo012

[node] downgrade to 0.12.7

.node-version

@@ -1 +1 @@
-iojs-v2.5
+0.12.7

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-node_js: 'iojs-v2.5'
+node_js: '0.12.7'
 install:
   - npm install -g npm@3.2
   - npm install

Gruntfile.js

@@ -30,7 +30,7 @@ module.exports = function (grunt) {
       }
     }()),
 
-    nodeVersion: '2.5.0',
+    nodeVersion: grunt.file.read('.node-version').trim(),
 
     meta: {
       banner: '/*! <%= package.name %> - v<%= package.version %> - ' +

src/optimize/babelOptions.js

@@ -4,7 +4,4 @@ exports.webpack = {
   optional: ['runtime']
 };
 
-exports.node = Object.assign({}, exports.webpack, {
-  optional: ['runtime', 'asyncToGenerator'],
-  blacklist: ['regenerator']
-});
+exports.node = Object.assign({}, exports.webpack);

src/plugins/testsBundle/testsEntryTemplate.js

@@ -1,6 +1,14 @@
+module.exports = function ({env, bundle}) {
 
-module.exports = require('lodash').template(
-`
+  let pluginSlug = env.pluginInfo.sort()
+  .map(p => ' *  - ' + p)
+  .join('\n');
+
+  let requires = bundle.modules
+  .map(m => `require('${m}');`)
+  .join('\n');
+
+  return `
 /**
  * Test entry file
  *
@@ -8,14 +16,7 @@ module.exports = require('lodash').template(
  *
  * context: <%= JSON.stringify(env.context) %>
  * includes code from:
-<%
-
-env.pluginInfo.sort().forEach(function (plugin, i) {
-  if (i > 0) print('\\n');
-  print(' *  - ' + plugin);
-});
-
-%>
+${pluginSlug}
  *
  */
 
@@ -27,15 +28,9 @@ window.__KBN__ = {
 };
 
 require('ui/testHarness');
-<%
-
-bundle.modules.forEach(function (id, i) {
-  if (i > 0) print('\\n');
-  print(\`require('\${id.replace(/\\\\/g, '\\\\\\\\')}');\`);
-});
-
-%>
+${requires}
 require('ui/testHarness').bootstrap(/* go! */);
 
-`
-);
+`;
+
+};

src/server/status/Status.js

@@ -17,7 +17,7 @@ class Status extends EventEmitter {
       tags.push(this.state === 'red' ? 'error' : 'info');
 
       server.log(tags, {
-        tmpl: 'Status changed from <%= prevState %> to <%= state %><% message && print(` - ${message}`) %>',
+        tmpl: 'Status changed from <%= prevState %> to <%= state %><%= message ? " - " + message : "" %>',
         name: name,
         state: this.state,
         message: this.message,

src/ui/appEntryTemplate.js

@@ -1,37 +1,29 @@
+module.exports = function ({env, bundle}) {
 
-module.exports = require('lodash').template(
-`
+  let pluginSlug = env.pluginInfo.sort()
+  .map(p => ' *  - ' + p)
+  .join('\n');
+
+  let requires = bundle.modules
+  .map(m => `require('${m}');`)
+  .join('\n');
+
+  return `
 /**
- * Optimized application entry file
+ * Test entry file
  *
  * This is programatically created and updated, do not modify
  *
  * context: <%= JSON.stringify(env.context) %>
  * includes code from:
-<%
-
-  env.pluginInfo.sort().forEach(function (plugin) {
-    print(\` *  - \${plugin}\n\`);
-  });
-
-%> *
+${pluginSlug}
+ *
  */
 
-require('ui/chrome');
-<%
-
-bundle.modules
-.filter(function (id) {
-  return id !== 'ui/chrome';
-})
-.forEach(function (id, i) {
-
-  if (i > 0) print('\\n');
-  print(\`require('\${id}');\`);
-
-});
-
-%>
+require('ui/chrome')
+${requires}
 require('ui/chrome').bootstrap(/* xoxo */);
-`
-);
+
+`;
+
+};

tasks/config/platforms.js

@@ -4,7 +4,7 @@ module.exports = function (grunt) {
   let version = grunt.config.get('pkg.version');
   let nodeVersion = grunt.config.get('nodeVersion');
   let rootPath = grunt.config.get('root');
-  let baseUri = `https://iojs.org/dist/v${nodeVersion}`;
+  let baseUri = `https://nodejs.org/dist/v${nodeVersion}`;
 
   return [
     'darwin-x64',
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
   ].map(function (name) {
     let win = name === 'windows';
 
-    let nodeUrl = win ? `${baseUri}/win-x86/iojs.exe` : `${baseUri}/iojs-v${nodeVersion}-${name}.tar.gz`;
+    let nodeUrl = win ? `${baseUri}/node.exe` : `${baseUri}/node-v${nodeVersion}-${name}.tar.gz`;
     let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${name}`);
 
     let buildName = `kibana-${version}-${name}`;