Skip to content

Commit

Permalink
[npm] move personal forks into elastic org (#13410)
Browse files Browse the repository at this point in the history
(cherry picked from commit 7e16d19)
  • Loading branch information
spalger committed Aug 9, 2017
1 parent 493fad2 commit 3a876ea
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@
"dependencies": {
"@bigfunger/jsondiffpatch": "0.1.38-webpack",
"@elastic/datemath": "2.3.0",
"@elastic/filesaver": "1.1.2",
"@elastic/leaflet-draw": "0.2.3",
"@elastic/leaflet-heat": "0.1.3",
"@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",
"@spalger/filesaver": "1.1.2",
"@spalger/leaflet-draw": "0.2.3",
"@spalger/leaflet-heat": "0.1.3",
"@spalger/numeral": "^2.0.0",
"@spalger/test-subj-selector": "0.2.1",
"@spalger/ui-ace": "0.2.3",
"JSONStream": "1.1.1",
"accept-language-parser": "1.2.0",
"angular": "1.4.7",
Expand Down Expand Up @@ -158,8 +158,8 @@
"node-fetch": "1.3.2",
"pegjs": "0.9.0",
"postcss-loader": "1.3.3",
"proxy-from-env": "1.0.0",
"prop-types": "15.5.8",
"proxy-from-env": "1.0.0",
"pui-react-overlay-trigger": "7.5.4",
"pui-react-tooltip": "7.5.4",
"querystring-browser": "1.0.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import numeral from '@spalger/numeral';
import numeral from '@elastic/numeral';
import { FieldFormat } from '../../../../../ui/field_formats/field_format';

const numeralInst = numeral();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { saveAs } from '@spalger/filesaver';
import { saveAs } from '@elastic/filesaver';
import { find, flattenDeep, pluck, sortBy } from 'lodash';
import angular from 'angular';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import numeral from '@spalger/numeral';
import numeral from '@elastic/numeral';
import _ from 'lodash';
import handlebars from 'handlebars/dist/handlebars';

Expand Down
2 changes: 1 addition & 1 deletion src/server/logging/log_format.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Stream from 'stream';
import moment from 'moment';
import _ from 'lodash';
import numeral from '@spalger/numeral';
import numeral from '@elastic/numeral';
import ansicolors from 'ansicolors';
import stringify from 'json-stringify-safe';
import querystring from 'querystring';
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_table/agg_table.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ uiModules
controller: function ($scope) {
const self = this;

self._saveAs = require('@spalger/filesaver').saveAs;
self._saveAs = require('@elastic/filesaver').saveAs;
self.csv = {
separator: config.get('csv:separator'),
quoteValues: config.get('csv:quoteValues')
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/jquery/find_test_subject.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import testSubjSelector from '@spalger/test-subj-selector';
import testSubjSelector from '@elastic/test-subj-selector';

// eslint-disable-next-line kibana-custom/no-default-export
export default function bindToJquery($) {
Expand Down
8 changes: 4 additions & 4 deletions tasks/lib/notice/__tests__/notice.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ const NODE_MODULES = resolve(__dirname, '../../../../node_modules');
const NODE_DIR = resolve(process.execPath, '../..');
const PACKAGES = [
{
name: '@spalger/filesaver',
name: '@elastic/filesaver',
version: '1.1.2',
licenses: ['MIT'],
directory: resolve(NODE_MODULES, '@spalger/filesaver'),
relative: 'node_modules/@spalger/filesaver',
directory: resolve(NODE_MODULES, '@elastic/filesaver'),
relative: 'node_modules/@elastic/filesaver',
},
{
name: 'aws-sdk',
Expand Down Expand Up @@ -41,7 +41,7 @@ describe('tasks/lib/notice', () => {
});

it('includes *LICENSE* files from packages', () => {
expect(notice).to.contain(readFileSync(resolve(NODE_MODULES, '@spalger/filesaver/LICENSE.md'), 'utf8'));
expect(notice).to.contain(readFileSync(resolve(NODE_MODULES, '@elastic/filesaver/LICENSE.md'), 'utf8'));
});

it('includes the LICENSE file from node', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/services/test_subjects.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import testSubjSelector from '@spalger/test-subj-selector';
import testSubjSelector from '@elastic/test-subj-selector';
import {
filter as filterAsync,
map as mapAsync,
Expand Down
2 changes: 1 addition & 1 deletion webpackShims/ace.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require('brace');
require('brace/mode/json');
require('node_modules/@spalger/ui-ace/ui-ace');
require('node_modules/@elastic/ui-ace/ui-ace');

require('ui/modules').get('kibana', ['ui.ace']);

Expand Down
6 changes: 3 additions & 3 deletions webpackShims/leaflet.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require('node_modules/leaflet/dist/leaflet.css');
window.L = module.exports = require('node_modules/leaflet/dist/leaflet');

require('node_modules/@spalger/leaflet-heat/dist/leaflet-heat.js');
require('node_modules/@elastic/leaflet-heat/dist/leaflet-heat.js');

require('node_modules/@spalger/leaflet-draw/dist/leaflet.draw.css');
require('node_modules/@spalger/leaflet-draw/dist/leaflet.draw.js');
require('node_modules/@elastic/leaflet-draw/dist/leaflet.draw.css');
require('node_modules/@elastic/leaflet-draw/dist/leaflet.draw.js');
2 changes: 1 addition & 1 deletion webpackShims/numeral.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('@spalger/numeral');
module.exports = require('@elastic/numeral');

0 comments on commit 3a876ea

Please sign in to comment.