Skip to content

Commit

Permalink
Merge pull request #6964 from epixa/npmrison
Browse files Browse the repository at this point in the history
[internal] Use rison dependency rather than hardcoding
  • Loading branch information
w33ble committed Apr 18, 2016
2 parents 04cc98f + 310b812 commit 8f9ec7d
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 506 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
"raw-loader": "0.5.1",
"request": "2.61.0",
"rimraf": "2.4.3",
"rison-node": "1.0.0",
"rjs-repack-loader": "1.0.6",
"script-loader": "0.6.1",
"semver": "5.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'ui/filters/unique';
import 'plugins/kibana/discover/components/field_chooser/discover_field';
import _ from 'lodash';
import $ from 'jquery';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
import IndexPatternsFieldListProvider from 'ui/index_patterns/_field_list';
import uiModules from 'ui/modules';
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/kibana/public/discover/controllers/discover.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import getSort from 'ui/doc_table/lib/get_sort';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import dateMath from 'ui/utils/date_math';
import 'ui/doc_table';
import 'ui/visualize';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import angular from 'angular';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import registry from 'plugins/kibana/settings/saved_object_registry';
import objectViewHTML from 'plugins/kibana/settings/sections/objects/_view.html';
import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type';
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/directives/saved_object_finder.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import keymap from 'ui/utils/key_map';
import SavedObjectsSavedObjectRegistryProvider from 'ui/saved_objects/saved_object_registry';
import uiModules from 'ui/modules';
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/filters/rison.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import uiModules from 'ui/modules';
let module = uiModules.get('kibana');

Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/state_management/_state_sync.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
import rison from 'ui/utils/rison';
import rison from 'rison-node';


// invokable/private angular dep
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/state_management/global_state.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _ from 'lodash';
import angular from 'angular';
import qs from 'ui/utils/query_string';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import StateManagementStateProvider from 'ui/state_management/state';
import uiModules from 'ui/modules';

Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/state_management/state.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import applyDiff from 'ui/utils/diff_object';
import qs from 'ui/utils/query_string';
import EventsProvider from 'ui/events';
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/utils/base_object.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import rison from 'ui/utils/rison';
import rison from 'rison-node';
import angular from 'angular';

function BaseObject(attributes) {
Expand Down
Loading

0 comments on commit 8f9ec7d

Please sign in to comment.