Skip to content

Commit

Permalink
Removes webpack-directory-name-as-main dependency (#13584)
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Smalley <[email protected]>
  • Loading branch information
tylersmalley authored and Tyler Smalley committed Aug 25, 2017
1 parent 9d2f3ae commit 854f795
Show file tree
Hide file tree
Showing 89 changed files with 119 additions and 37 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"@elastic/numeral": "2.2.1",
"@elastic/test-subj-selector": "0.2.1",
"@elastic/ui-ace": "0.2.3",
"@elastic/webpack-directory-name-as-main": "2.0.2",
"JSONStream": "1.1.1",
"accept-language-parser": "1.2.0",
"angular": "1.4.7",
Expand Down
1 change: 1 addition & 0 deletions src/core_plugins/console/public/tests/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './tests';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './loading_button';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './size_picker';
1 change: 1 addition & 0 deletions src/core_plugins/kibana/public/dashboard/panel/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './panel';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './saved_searches';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './saved_visualizations';
4 changes: 0 additions & 4 deletions src/optimize/base_optimizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { writeFile } from 'fs';

import webpack from 'webpack';
import Boom from 'boom';
import DirectoryNameAsMain from '@elastic/webpack-directory-name-as-main';
import ExtractTextPlugin from 'extract-text-webpack-plugin';
import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin';
import DefinePlugin from 'webpack/lib/DefinePlugin';
Expand Down Expand Up @@ -109,9 +108,6 @@ export default class BaseOptimizer {
recordsPath: resolve(this.env.workingDir, 'webpack.records'),

plugins: [
new webpack.ResolverPlugin([
new DirectoryNameAsMain()
]),
new webpack.NoErrorsPlugin(),
new ExtractTextPlugin('[name].style.css', {
allChunks: true
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/agg_response/geo_json/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { AggResponseGeoJsonProvider } from './geo_json';
1 change: 1 addition & 0 deletions src/ui/public/agg_response/point_series/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { AggResponsePointSeriesProvider } from './point_series';
1 change: 1 addition & 0 deletions src/ui/public/agg_response/tabify/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { AggResponseTabifyProvider } from './tabify';
1 change: 1 addition & 0 deletions src/ui/public/agg_table/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './agg_table';
39 changes: 19 additions & 20 deletions src/ui/public/angular-bootstrap/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,25 @@ angular.module('ui.bootstrap.tpls', [
'template/typeahead/typeahead-popup.html'
]);

import './accordion';
import './alert';
import './bindHtml';
import './buttons';
import './collapse';
import './dateparser';
import './datepicker';
import './dropdown';
import './modal';
import './pagination';
import './popover';
import './position';
import './progressbar';
import './rating';
import './tabs';
import './timepicker';
import './tooltip';
import './transition';
import './typeahead';
import './accordion/accordion';
import './alert/alert';
import './bindHtml/bindHtml';
import './buttons/buttons';
import './collapse/collapse';
import './dateparser/dateparser';
import './datepicker/datepicker';
import './dropdown/dropdown';
import './modal/modal';
import './pagination/pagination';
import './popover/popover';
import './position/position';
import './progressbar/progressbar';
import './rating/rating';
import './tabs/tabs';
import './timepicker/timepicker';
import './tooltip/tooltip';
import './transition/transition';
import './typeahead/typeahead';

import alert from './alert/alert.html';

Expand Down Expand Up @@ -210,4 +210,3 @@ import typeaheadPopup from './typeahead/typeahead-popup.html';
angular.module('template/typeahead/typeahead-popup.html', []).run(['$templateCache', function($templateCache) {
$templateCache.put('template/typeahead/typeahead-popup.html', typeaheadPopup);
}]);

1 change: 1 addition & 0 deletions src/ui/public/bind/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './bind';
1 change: 1 addition & 0 deletions src/ui/public/binder/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Binder } from './binder';
5 changes: 1 addition & 4 deletions src/ui/public/chrome/chrome.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import themeApi from './api/theme';
import translationsApi from './api/translations';
import { initChromeXsrfApi } from './api/xsrf';

const chrome = {};
export const chrome = {};
const internals = _.defaults(
_.cloneDeep(metadata),
{
Expand Down Expand Up @@ -50,6 +50,3 @@ chrome.bootstrap = function () {
chrome.setupAngular();
angular.bootstrap(document, ['kibana']);
};

// eslint-disable-next-line kibana-custom/no-default-export
export default chrome;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './app_switcher';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './global_nav_link';
1 change: 1 addition & 0 deletions src/ui/public/chrome/directives/global_nav/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './global_nav';
1 change: 1 addition & 0 deletions src/ui/public/chrome/directives/loading_indicator/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './loading_indicator';
4 changes: 4 additions & 0 deletions src/ui/public/chrome/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { chrome } from './chrome';

// eslint-disable-next-line kibana-custom/no-default-export
export default chrome;
1 change: 1 addition & 0 deletions src/ui/public/collapsible_sidebar/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './collapsible_sidebar';
1 change: 1 addition & 0 deletions src/ui/public/config/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './config';
1 change: 1 addition & 0 deletions src/ui/public/courier/fetch/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { FetchProvider } from './fetch';
1 change: 1 addition & 0 deletions src/ui/public/courier/fetch/request/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { AbstractRequestProvider } from './request';
1 change: 1 addition & 0 deletions src/ui/public/courier/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './courier';
1 change: 1 addition & 0 deletions src/ui/public/courier/saved_object/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { SavedObjectProvider } from './saved_object';
1 change: 1 addition & 0 deletions src/ui/public/debounce/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './debounce';
1 change: 1 addition & 0 deletions src/ui/public/doc_table/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './doc_table';
3 changes: 3 additions & 0 deletions src/ui/public/doc_title/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import './doc_title';

export { DocTitleProvider } from './doc_title';
1 change: 1 addition & 0 deletions src/ui/public/doc_viewer/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './doc_viewer';
2 changes: 2 additions & 0 deletions src/ui/public/error_url_overflow/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import './error_url_overflow';
export { UrlOverflowServiceProvider } from './url_overflow_service';
1 change: 1 addition & 0 deletions src/ui/public/fancy_forms/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './fancy_forms';
1 change: 1 addition & 0 deletions src/ui/public/field_editor/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './field_editor';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/editors/color/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { colorEditor } from './color';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/editors/date/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { dateEditor } from './date';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { durationEditor } from './duration';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/editors/string/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { stringEditor } from './string';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { truncateEditor } from './truncate';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/editors/url/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { urlEditor } from './url';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './field_format_editor';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/pattern/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './pattern';
1 change: 1 addition & 0 deletions src/ui/public/field_format_editor/samples/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './samples';
1 change: 1 addition & 0 deletions src/ui/public/field_wildcard/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { FieldWildcardProvider } from './field_wildcard';
1 change: 1 addition & 0 deletions src/ui/public/filter_bar/filter_pill/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './filter_pill';
3 changes: 3 additions & 0 deletions src/ui/public/filter_bar/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import './filter_bar'; // directive

export { disableFilter, enableFilter, toggleFilterDisabled } from './lib/disable_filter';
1 change: 1 addition & 0 deletions src/ui/public/filter_editor/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './filter_editor';
1 change: 1 addition & 0 deletions src/ui/public/filter_manager/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { FilterManagerProvider } from './filter_manager';
2 changes: 2 additions & 0 deletions src/ui/public/index_patterns/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { IndexPatternsProvider } from './index_patterns';
export { IndexPatternsApiClientProvider } from './index_patterns_api_client_provider';
2 changes: 0 additions & 2 deletions src/ui/public/index_patterns/index_patterns.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana/index_patterns');

export { IndexPatternsApiClientProvider } from './index_patterns_api_client_provider';

export function IndexPatternsProvider(Notifier, Private) {
const self = this;

Expand Down
1 change: 1 addition & 0 deletions src/ui/public/indexed_array/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { IndexedArray } from './indexed_array';
1 change: 1 addition & 0 deletions src/ui/public/kbn_top_nav/bread_crumbs/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './bread_crumbs';
1 change: 1 addition & 0 deletions src/ui/public/kbn_top_nav/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './kbn_top_nav';
1 change: 1 addition & 0 deletions src/ui/public/listen/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './listen';
2 changes: 2 additions & 0 deletions src/ui/public/notify/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { notify } from './notify';
export { Notifier } from './notifier';
1 change: 0 additions & 1 deletion src/ui/public/notify/notify.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { metadata } from 'ui/metadata';

const module = uiModules.get('kibana/notify');
export const notify = new Notifier();
export { Notifier } from 'ui/notify/notifier';

module.factory('createNotifier', function () {
return function (opts) {
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/number_list/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './number_list';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './tool_bar_pager_buttons';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './tool_bar_pager_text';
1 change: 1 addition & 0 deletions src/ui/public/paginated_table/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './paginated_table';
1 change: 1 addition & 0 deletions src/ui/public/parse_query/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './parse_query';
1 change: 1 addition & 0 deletions src/ui/public/pattern_checker/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './pattern_checker';
1 change: 1 addition & 0 deletions src/ui/public/persisted_log/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './persisted_log';
1 change: 1 addition & 0 deletions src/ui/public/private/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './private';
1 change: 1 addition & 0 deletions src/ui/public/render_directive/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './render_directive';
4 changes: 4 additions & 0 deletions src/ui/public/routes/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { uiRoutes } from './routes';

// eslint-disable-next-line kibana-custom/no-default-export
export default uiRoutes;
3 changes: 1 addition & 2 deletions src/ui/public/routes/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { uiModules } from 'ui/modules';
import { WAIT_FOR_URL_CHANGE_TOKEN } from './route_setup_manager';
const defaultRouteManager = new RouteManager();

// eslint-disable-next-line kibana-custom/no-default-export
export default Object.create(defaultRouteManager, {
export const uiRoutes = Object.create(defaultRouteManager, {
WAIT_FOR_URL_CHANGE_TOKEN: {
value: WAIT_FOR_URL_CHANGE_TOKEN
},
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/storage/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Storage } from './storage';
1 change: 1 addition & 0 deletions src/ui/public/style_compile/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './style_compile';
1 change: 1 addition & 0 deletions src/ui/public/system_api/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { addSystemApiHeader, isSystemApiRequest } from './system_api';
3 changes: 3 additions & 0 deletions src/ui/public/test_harness/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import './test_harness';

export { bootstrap } from './test_harness';
1 change: 1 addition & 0 deletions src/ui/public/time_buckets/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { TimeBucketsProvider } from './time_buckets';
1 change: 1 addition & 0 deletions src/ui/public/timefilter/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './timefilter';
1 change: 1 addition & 0 deletions src/ui/public/timepicker/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './timepicker';
1 change: 1 addition & 0 deletions src/ui/public/tooltip/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './tooltip';
1 change: 1 addition & 0 deletions src/ui/public/typeahead/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './typeahead';
1 change: 1 addition & 0 deletions src/ui/public/vis/components/color/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { VislibComponentsColorColorProvider } from './color';
1 change: 1 addition & 0 deletions src/ui/public/vis/components/tooltip/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Tooltip, TooltipProvider } from './tooltip';
1 change: 1 addition & 0 deletions src/ui/public/vis/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { VisProvider } from './vis';
1 change: 1 addition & 0 deletions src/ui/public/vislib/components/labels/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { VislibComponentsLabelsLabelsProvider } from './labels';
4 changes: 4 additions & 0 deletions src/ui/public/vislib/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { VislibProvider } from './vislib';

// eslint-disable-next-line kibana-custom/no-default-export
export default VislibProvider;
1 change: 1 addition & 0 deletions src/ui/public/vislib/lib/axis/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { VislibLibAxisProvider } from './axis';
1 change: 1 addition & 0 deletions src/ui/public/vislib/lib/layout/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { VislibLibLayoutLayoutProvider } from './layout';
3 changes: 1 addition & 2 deletions src/ui/public/vislib/vislib.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { VislibVisProvider } from './vis';
* @main vislib
* @return {Object} Contains the version number and the Vis Class for creating visualizations
*/
// eslint-disable-next-line kibana-custom/no-default-export
export default function VislibProvider(Private) {
export function VislibProvider(Private) {
return {
version: '0.0.0',
Vis: Private(VislibVisProvider)
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/visualize/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './visualize';
1 change: 1 addition & 0 deletions src/ui/public/watch_multi/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './watch_multi';
2 changes: 1 addition & 1 deletion webpackShims/ui-bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require('angular');
require('ui/angular-bootstrap');
var uiModules = require('ui/modules').uiModules;
var chrome = require('../src/ui/public/chrome/chrome');
var chrome = require('ui/chrome');

var kibana = uiModules.get('kibana', ['ui.bootstrap', 'pascalprecht.translate']);

Expand Down

0 comments on commit 854f795

Please sign in to comment.