From b024dc5bdd30d4d24dd11a0d019be6bcabd5b2e8 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 30 Oct 2017 10:33:33 -0700
Subject: [PATCH] [flot-charts] move into ui/public

---
 .eslintignore                                       |  1 +
 .../public/visualizations/components/flot_chart.js  |  2 +-
 .../metrics/public/visualizations/lib/flot.js       | 13 -------------
 src/core_plugins/tests_bundle/index.js              |  5 ++++-
 {packages => src/ui/public}/flot-charts/API.md      |  0
 src/ui/public/flot-charts/index.js                  | 13 +++++++++++++
 .../ui/public}/flot-charts/jquery.colorhelpers.js   |  0
 .../ui/public}/flot-charts/jquery.flot.canvas.js    |  0
 .../public}/flot-charts/jquery.flot.categories.js   |  0
 .../ui/public}/flot-charts/jquery.flot.crosshair.js |  0
 .../ui/public}/flot-charts/jquery.flot.errorbars.js |  0
 .../public}/flot-charts/jquery.flot.fillbetween.js  |  0
 .../ui/public}/flot-charts/jquery.flot.image.js     |  0
 .../ui/public}/flot-charts/jquery.flot.js           |  0
 .../ui/public}/flot-charts/jquery.flot.navigate.js  |  0
 .../ui/public}/flot-charts/jquery.flot.pie.js       |  0
 .../ui/public}/flot-charts/jquery.flot.resize.js    |  0
 .../ui/public}/flot-charts/jquery.flot.selection.js |  0
 .../ui/public}/flot-charts/jquery.flot.stack.js     |  0
 .../ui/public}/flot-charts/jquery.flot.symbol.js    |  0
 .../ui/public}/flot-charts/jquery.flot.threshold.js |  0
 .../ui/public}/flot-charts/jquery.flot.time.js      |  0
 tasks/config/copy.js                                |  1 -
 23 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 src/core_plugins/metrics/public/visualizations/lib/flot.js
 rename {packages => src/ui/public}/flot-charts/API.md (100%)
 create mode 100644 src/ui/public/flot-charts/index.js
 rename {packages => src/ui/public}/flot-charts/jquery.colorhelpers.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.canvas.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.categories.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.crosshair.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.errorbars.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.fillbetween.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.image.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.navigate.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.pie.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.resize.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.selection.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.stack.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.symbol.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.threshold.js (100%)
 rename {packages => src/ui/public}/flot-charts/jquery.flot.time.js (100%)

diff --git a/.eslintignore b/.eslintignore
index 8e2ee7fbfd9d3..f4db73169cbb7 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,7 @@
 /optimize
 /src/fixtures/vislib/mock_data
 /src/ui/public/angular-bootstrap
+/src/ui/public/flot-charts
 /test/fixtures/scenarios
 /src/core_plugins/console/public/webpackShims
 /src/core_plugins/console/public/tests/webpackShims
diff --git a/src/core_plugins/metrics/public/visualizations/components/flot_chart.js b/src/core_plugins/metrics/public/visualizations/components/flot_chart.js
index 39ea46731d64d..36e2c2c5f444d 100644
--- a/src/core_plugins/metrics/public/visualizations/components/flot_chart.js
+++ b/src/core_plugins/metrics/public/visualizations/components/flot_chart.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import _ from 'lodash';
-import $ from '../lib/flot';
+import $ from 'ui/flot-charts';
 import eventBus from '../lib/events';
 import Resize from './resize';
 import calculateBarWidth from '../lib/calculate_bar_width';
diff --git a/src/core_plugins/metrics/public/visualizations/lib/flot.js b/src/core_plugins/metrics/public/visualizations/lib/flot.js
deleted file mode 100644
index 72ff9f86376bf..0000000000000
--- a/src/core_plugins/metrics/public/visualizations/lib/flot.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import $ from 'jquery';
-if (window) window.jQuery = $;
-require('packages/flot-charts/jquery.flot');
-require('packages/flot-charts/jquery.flot.time');
-require('packages/flot-charts/jquery.flot.canvas');
-require('packages/flot-charts/jquery.flot.symbol');
-require('packages/flot-charts/jquery.flot.crosshair');
-require('packages/flot-charts/jquery.flot.selection');
-require('packages/flot-charts/jquery.flot.pie');
-require('packages/flot-charts/jquery.flot.stack');
-require('packages/flot-charts/jquery.flot.threshold');
-require('packages/flot-charts/jquery.flot.fillbetween');
-module.exports = $;
diff --git a/src/core_plugins/tests_bundle/index.js b/src/core_plugins/tests_bundle/index.js
index a21c9a014c5bc..223ef39f9536e 100644
--- a/src/core_plugins/tests_bundle/index.js
+++ b/src/core_plugins/tests_bundle/index.js
@@ -17,7 +17,10 @@ export default (kibana) => {
         let modules = [];
         const config = kibana.config;
 
-        const testGlobs = ['src/ui/public/**/*.js'];
+        const testGlobs = [
+          'src/ui/public/**/*.js',
+          '!src/ui/public/flot-charts/**/*',
+        ];
         const testingPluginIds = config.get('tests_bundle.pluginId');
 
         if (testingPluginIds) {
diff --git a/packages/flot-charts/API.md b/src/ui/public/flot-charts/API.md
similarity index 100%
rename from packages/flot-charts/API.md
rename to src/ui/public/flot-charts/API.md
diff --git a/src/ui/public/flot-charts/index.js b/src/ui/public/flot-charts/index.js
new file mode 100644
index 0000000000000..acc3ccf90b4b4
--- /dev/null
+++ b/src/ui/public/flot-charts/index.js
@@ -0,0 +1,13 @@
+import $ from 'jquery';
+if (window) window.jQuery = $;
+require('ui/flot-charts/jquery.flot');
+require('ui/flot-charts/jquery.flot.time');
+require('ui/flot-charts/jquery.flot.canvas');
+require('ui/flot-charts/jquery.flot.symbol');
+require('ui/flot-charts/jquery.flot.crosshair');
+require('ui/flot-charts/jquery.flot.selection');
+require('ui/flot-charts/jquery.flot.pie');
+require('ui/flot-charts/jquery.flot.stack');
+require('ui/flot-charts/jquery.flot.threshold');
+require('ui/flot-charts/jquery.flot.fillbetween');
+module.exports = $;
diff --git a/packages/flot-charts/jquery.colorhelpers.js b/src/ui/public/flot-charts/jquery.colorhelpers.js
similarity index 100%
rename from packages/flot-charts/jquery.colorhelpers.js
rename to src/ui/public/flot-charts/jquery.colorhelpers.js
diff --git a/packages/flot-charts/jquery.flot.canvas.js b/src/ui/public/flot-charts/jquery.flot.canvas.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.canvas.js
rename to src/ui/public/flot-charts/jquery.flot.canvas.js
diff --git a/packages/flot-charts/jquery.flot.categories.js b/src/ui/public/flot-charts/jquery.flot.categories.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.categories.js
rename to src/ui/public/flot-charts/jquery.flot.categories.js
diff --git a/packages/flot-charts/jquery.flot.crosshair.js b/src/ui/public/flot-charts/jquery.flot.crosshair.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.crosshair.js
rename to src/ui/public/flot-charts/jquery.flot.crosshair.js
diff --git a/packages/flot-charts/jquery.flot.errorbars.js b/src/ui/public/flot-charts/jquery.flot.errorbars.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.errorbars.js
rename to src/ui/public/flot-charts/jquery.flot.errorbars.js
diff --git a/packages/flot-charts/jquery.flot.fillbetween.js b/src/ui/public/flot-charts/jquery.flot.fillbetween.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.fillbetween.js
rename to src/ui/public/flot-charts/jquery.flot.fillbetween.js
diff --git a/packages/flot-charts/jquery.flot.image.js b/src/ui/public/flot-charts/jquery.flot.image.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.image.js
rename to src/ui/public/flot-charts/jquery.flot.image.js
diff --git a/packages/flot-charts/jquery.flot.js b/src/ui/public/flot-charts/jquery.flot.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.js
rename to src/ui/public/flot-charts/jquery.flot.js
diff --git a/packages/flot-charts/jquery.flot.navigate.js b/src/ui/public/flot-charts/jquery.flot.navigate.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.navigate.js
rename to src/ui/public/flot-charts/jquery.flot.navigate.js
diff --git a/packages/flot-charts/jquery.flot.pie.js b/src/ui/public/flot-charts/jquery.flot.pie.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.pie.js
rename to src/ui/public/flot-charts/jquery.flot.pie.js
diff --git a/packages/flot-charts/jquery.flot.resize.js b/src/ui/public/flot-charts/jquery.flot.resize.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.resize.js
rename to src/ui/public/flot-charts/jquery.flot.resize.js
diff --git a/packages/flot-charts/jquery.flot.selection.js b/src/ui/public/flot-charts/jquery.flot.selection.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.selection.js
rename to src/ui/public/flot-charts/jquery.flot.selection.js
diff --git a/packages/flot-charts/jquery.flot.stack.js b/src/ui/public/flot-charts/jquery.flot.stack.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.stack.js
rename to src/ui/public/flot-charts/jquery.flot.stack.js
diff --git a/packages/flot-charts/jquery.flot.symbol.js b/src/ui/public/flot-charts/jquery.flot.symbol.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.symbol.js
rename to src/ui/public/flot-charts/jquery.flot.symbol.js
diff --git a/packages/flot-charts/jquery.flot.threshold.js b/src/ui/public/flot-charts/jquery.flot.threshold.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.threshold.js
rename to src/ui/public/flot-charts/jquery.flot.threshold.js
diff --git a/packages/flot-charts/jquery.flot.time.js b/src/ui/public/flot-charts/jquery.flot.time.js
similarity index 100%
rename from packages/flot-charts/jquery.flot.time.js
rename to src/ui/public/flot-charts/jquery.flot.time.js
diff --git a/tasks/config/copy.js b/tasks/config/copy.js
index 84ce13f2bb14a..9b0e24e5dcba7 100644
--- a/tasks/config/copy.js
+++ b/tasks/config/copy.js
@@ -15,7 +15,6 @@ module.exports = function () {
         '!src/es_archiver/**',
         '!src/functional_test_runner/**',
         'bin/**',
-        'packages/flot-charts/**',
         'ui_framework/components/**',
         'ui_framework/services/**',
         'ui_framework/dist/**',