Merge pull request #4665 from spalger/chore/packageJsonUpkeep

[package.json] clear out old packages and move dev packages into place

package.json

@@ -53,18 +53,16 @@
     "@spalger/leaflet-draw": "^0.2.3",
     "@spalger/leaflet-heat": "^0.1.3",
     "@spalger/ui-ace": "^0.2.3",
-    "Nonsense": "^0.1.2",
     "angular": "1.2.28",
     "angular-bindonce": "0.3.1",
     "angular-elastic": "2.5.0",
-    "angular-mocks": "1.2.28",
     "angular-nvd3": "panda01/angular-nvd3#kibana",
     "angular-route": "1.2.28",
     "ansicolors": "^0.3.2",
     "autoprefixer": "^5.2.0",
     "autoprefixer-loader": "^2.0.0",
     "babel": "^5.8.21",
-    "babel-core": "^5.8.21",
+    "babel-core": "^5.8.22",
     "babel-loader": "^5.3.2",
     "babel-runtime": "^5.8.20",
     "bluebird": "^2.9.27",
@@ -72,7 +70,6 @@
     "bootstrap": "^3.3.5",
     "brace": "^0.5.1",
     "bunyan": "^1.2.3",
-    "chokidar": "^1.0.4",
     "commander": "^2.8.1",
     "css-loader": "^0.15.1",
     "d3": "^3.5.6",
@@ -84,13 +81,11 @@
     "extract-text-webpack-plugin": "^0.8.2",
     "file-loader": "^0.8.4",
     "font-awesome": "^4.3.0",
-    "glob": "^4.3.2",
     "good": "^6.2.0",
     "good-squeeze": "^2.1.0",
     "gridster": "^0.5.6",
     "hapi": "^8.6.1",
     "imports-loader": "^0.6.4",
-    "is-array": "^1.0.1",
     "jade": "^1.7.2",
     "jade-loader": "^0.7.1",
     "joi": "^6.4.3",
@@ -103,11 +98,9 @@
     "less-loader": "^2.2.0",
     "lodash": "^3.10.0",
     "marked": "0.3.3",
-    "memory-fs": "^0.2.0",
     "minimatch": "^2.0.8",
     "mkdirp": "^0.5.1",
     "moment": "^2.10.3",
-    "moment-timezone": "^0.4.0",
     "ng-clip": "^0.2.6",
     "numeral": "^1.5.3",
     "nvd3": "panda01/nvd3#kibana",
@@ -127,11 +120,14 @@
     "zeroclipboard": "^2.2.0"
   },
   "devDependencies": {
+    "angular-mocks": "1.2.28",
     "auto-release-sinon": "^1.0.3",
     "babel-eslint": "^4.0.5",
+    "chokidar": "^1.0.4",
     "eslint": "1.0.x",
     "expect.js": "^0.3.1",
     "faker": "^1.1.0",
+    "glob": "^4.3.2",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.1",
     "grunt-cli": "0.1.13",
@@ -158,6 +154,7 @@
     "marked-text-renderer": "^0.1.0",
     "mocha": "^2.2.5",
     "nock": "^2.9.0",
+    "Nonsense": "^0.1.2",
     "npm": "^2.11.0",
     "portscanner": "^1.0.0",
     "simple-git": "^1.3.0",

src/cli/plugin/__tests__/pluginInstaller.js

@@ -1,7 +1,6 @@
 var expect = require('expect.js');
 var sinon = require('sinon');
 var nock = require('nock');
-var glob = require('glob');
 var rimraf = require('rimraf');
 var fs = require('fs');
 var { join } = require('path');

src/plugins/testsBundle/findSourceFiles.js

@@ -1,10 +1,9 @@
 let { chain, memoize } = require('lodash');
 let { resolve } = require('path');
 let { map, fromNode } = require('bluebird');
-
-let fromRoot = require('./fromRoot');
 let { Glob } = require('glob');
 
+let fromRoot = require('../../utils/fromRoot');
 
 let findSourceFiles = async (patterns, cwd = fromRoot('.')) => {
   patterns = [].concat(patterns || []);

src/plugins/testsBundle/index.js

@@ -3,7 +3,7 @@ module.exports = (kibana) => {
 
   let utils = require('requirefrom')('src/utils');
   let fromRoot = utils('fromRoot');
-  let findSourceFiles = utils('findSourceFiles');
+  let findSourceFiles = require('./findSourceFiles');
 
   return new kibana.Plugin({
     uiExports: {

src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js

@@ -223,7 +223,10 @@ describe('buildHierarchicalData', function () {
         type: 'pie',
         aggs: [
           { type: 'count', schema: 'metric' },
-          { type: 'filters', schema: 'segment', params: {
+          {
+            type: 'filters',
+            schema: 'segment',
+            params: {
               filters: [
                 { input: { query: { query_string: { query: '_type:apache' } } } },
                 { input: { query: { query_string: { query: '_type:nginx' } } } }
@@ -256,7 +259,10 @@ describe('buildHierarchicalData', function () {
         type: 'pie',
         aggs: [
           { type: 'count', schema: 'metric' },
-          { type: 'filters', schema: 'split', params: {
+          {
+            type: 'filters',
+            schema: 'split',
+            params: {
               filters: [
                 { input: { query: { query_string: { query: '_type:apache' } } } },
                 { input: { query: { query_string: { query: '_type:nginx' } } } }

tasks/config/licenses.js

@@ -45,7 +45,6 @@ module.exports = function (grunt) {
         'inherits@1.0.0': ['ISC'],
         'jsonpointer@1.1.0': ['MIT'],
         'leaflet@0.7.2': ['BSD-2-Clause'],
-        'moment-timezone@0.0.6': ['MIT'],
         'Nonsense@0.1.2': ['Public-Domain'],
         'pkginfo@0.2.3': ['MIT'],
         'uglify-js@2.2.5': ['BSD'],