Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
116ec49
[timelion] remove last remaining amd modules
spalger Oct 4, 2017
702953d
[eslint-config-kibana] remove env.amd
spalger Oct 4, 2017
d47e226
[webpack] use absolute loader names
spalger Oct 4, 2017
455c1fb
[webpack] remove absolute node_modules/ imports
spalger Oct 4, 2017
73aa596
[webpack] upgrade to webpack 3
spalger Oct 4, 2017
742291f
[uiFramework] make webpack build compatible with v3
spalger Oct 5, 2017
eead1e4
[eslint-import-resolver] use https://github.com/elastic/eslint-import…
spalger Oct 5, 2017
342aa1d
[baseOptimizer] don't break when pkg has no dependencies
spalger Oct 6, 2017
693f934
Merge branch 'master' of github.com:elastic/kibana into upgrade/webpa…
spalger Oct 9, 2017
904b05f
Merge branch 'master' of github.com:elastic/kibana into upgrade/webpa…
spalger Oct 10, 2017
aeedff1
[optimize] remove unnecessary json-loader
spalger Oct 10, 2017
52b7f53
[optimize] remove local references to webpack vars
spalger Oct 10, 2017
19f4723
Merge branch 'master' of github.com:elastic/kibana into upgrade/webpa…
spalger Oct 17, 2017
48a5214
Merge branch 'master' of github.com:elastic/kibana into upgrade/webpa…
spalger Oct 30, 2017
a590af4
Merge branch 'master' of github.com:elastic/kibana into upgrade/webpa…
spalger Oct 30, 2017
fe4c327
[eslint] upgrade to eslint-import-resolver-kibana 0.9.0
spalger Oct 31, 2017
8336b08
[baseOptimizer] comment tweaks
spalger Oct 31, 2017
1e8c367
[baseOptimizer] remove loader pinning
spalger Oct 31, 2017
c3f0f30
[webpack] rely on kibana webpack shims before checking node_modules
spalger Oct 31, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/development/core/development-dependencies.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ webpack shim for jQuery:
-----------
// webpackShims/jquery.js

module.exports = window.jQuery = window.$ = require('node_modules/jquery/dist/jquery');
module.exports = window.jQuery = window.$ = require('../node_modules/jquery/dist/jquery');
require('ui/jquery/findTestSubject')(window.$);
-----------

Expand All @@ -88,8 +88,8 @@ Here is what our webpack shim for angular looks like:
// webpackShims/angular.js

require('jquery');
require('node_modules/angular/angular');
require('node_modules/angular-elastic/elastic');
require('../node_modules/angular/angular');
require('../node_modules/angular-elastic/elastic');
require('ui/modules').get('kibana', ['monospaced.elastic']);
module.exports = window.angular;
-----------
Expand All @@ -100,4 +100,4 @@ What this shim does is fairly simple if you go line by line:
. load the angular.js file from the npm installation
. load the angular-elastic plugin, a plugin we want to always be included whenever we import angular
. use the `ui/modules` module to add the module exported by angular-elastic as a dependency to the `kibana` angular module
. finally, export the window.angular variable. This means that writing `import angular from 'angular';` will properly set the angular variable to the angular library, rather than undefined which is the default behavior.
. finally, export the window.angular variable. This means that writing `import angular from 'angular';` will properly set the angular variable to the angular library, rather than undefined which is the default behavior.
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,9 @@
"angular-translate": "2.13.1",
"ansicolors": "0.3.2",
"autoprefixer": "6.5.4",
"autoprefixer-loader": "2.0.0",
"babel-core": "6.21.0",
"babel-jest": "21.0.0",
"babel-loader": "6.2.10",
"babel-loader": "7.1.2",
"babel-plugin-add-module-exports": "0.2.1",
"babel-plugin-transform-async-generator-functions": "6.24.1",
"babel-plugin-transform-class-properties": "6.24.1",
Expand All @@ -106,10 +105,11 @@
"boom": "5.2.0",
"brace": "0.5.1",
"bunyan": "1.7.1",
"cache-loader": "1.0.3",
"check-hash": "1.0.1",
"color": "1.0.3",
"commander": "2.8.1",
"css-loader": "0.28.1",
"css-loader": "0.28.7",
"d3": "3.5.6",
"d3-cloud": "1.2.1",
"dragula": "3.7.0",
Expand All @@ -118,10 +118,10 @@
"encode-uri-query": "1.0.0",
"even-better": "7.0.2",
"expiry-js": "0.1.7",
"exports-loader": "0.6.2",
"expose-loader": "0.7.0",
"extract-text-webpack-plugin": "0.8.2",
"file-loader": "0.8.4",
"exports-loader": "0.6.4",
"expose-loader": "0.7.3",
"extract-text-webpack-plugin": "3.0.1",
"file-loader": "1.1.4",
"focus-trap-react": "3.0.3",
"font-awesome": "4.4.0",
"glob": "5.0.13",
Expand All @@ -131,22 +131,21 @@
"handlebars": "4.0.5",
"hapi": "14.2.0",
"http-proxy-agent": "1.0.0",
"imports-loader": "0.6.4",
"imports-loader": "0.7.1",
"inert": "4.0.2",
"jade": "1.11.0",
"jade-loader": "0.7.1",
"jade-loader": "0.8.0",
"joi": "10.4.1",
"jquery": "2.2.4",
"js-yaml": "3.4.1",
"json-loader": "0.5.3",
"json-stringify-safe": "5.0.1",
"jstimezonedetect": "1.0.5",
"leaflet": "1.0.3",
"leaflet-draw": "0.4.10",
"leaflet-responsive-popup": "0.2.0",
"leaflet.heat": "0.2.0",
"less": "2.7.1",
"less-loader": "2.2.3",
"less-loader": "4.0.5",
"lodash": "3.10.1",
"lru-cache": "4.1.1",
"markdown-it": "8.3.2",
Expand All @@ -159,7 +158,7 @@
"no-ui-slider": "1.2.0",
"node-fetch": "1.3.2",
"pegjs": "0.9.0",
"postcss-loader": "1.3.3",
"postcss-loader": "2.0.6",
"prop-types": "15.5.8",
"proxy-from-env": "1.0.0",
"pui-react-overlay-trigger": "7.5.4",
Expand Down Expand Up @@ -193,28 +192,29 @@
"resize-observer-polyfill": "1.2.1",
"rimraf": "2.4.3",
"rison-node": "1.0.0",
"rjs-repack-loader": "1.0.6",
"rxjs": "5.4.3",
"script-loader": "0.6.1",
"script-loader": "0.7.2",
"semver": "5.1.0",
"style-loader": "0.12.3",
"style-loader": "0.19.0",
"tabbable": "1.1.0",
"tar": "2.2.0",
"tinygradient": "0.3.0",
"trunc-html": "1.0.2",
"trunc-text": "1.0.2",
"uglifyjs-webpack-plugin": "0.4.6",
"ui-select": "0.19.6",
"url-loader": "0.5.6",
"url-loader": "0.5.9",
"uuid": "3.0.1",
"validate-npm-package-name": "2.2.2",
"vision": "4.1.0",
"webpack": "github:elastic/webpack#fix/query-params-for-aliased-loaders",
"webpack": "3.6.0",
"webpack-merge": "4.1.0",
"wreck": "12.4.0",
"yauzl": "2.7.0"
},
"devDependencies": {
"@elastic/eslint-config-kibana": "0.13.0",
"@elastic/eslint-import-resolver-kibana": "0.8.1",
"@elastic/eslint-import-resolver-kibana": "0.9.0",
"@elastic/eslint-plugin-kibana-custom": "1.0.3",
"angular-mocks": "1.4.7",
"babel-eslint": "7.2.3",
Expand Down Expand Up @@ -253,10 +253,10 @@
"highlight.js": "9.0.0",
"history": "2.1.1",
"html": "1.0.0",
"html-loader": "0.4.3",
"html-loader": "0.5.1",
"husky": "0.8.1",
"image-diff": "1.6.0",
"istanbul-instrumenter-loader": "0.1.3",
"istanbul-instrumenter-loader": "3.0.0",
"jest": "21.0.1",
"jest-cli": "21.0.1",
"jsdom": "9.9.1",
Expand All @@ -278,10 +278,10 @@
"murmurhash3js": "3.0.1",
"ncp": "2.0.0",
"nock": "8.0.0",
"node-sass": "3.8.0",
"node-sass": "4.5.3",
"pixelmatch": "4.0.2",
"proxyquire": "1.7.10",
"sass-loader": "4.0.0",
"sass-loader": "6.0.6",
"simple-git": "1.37.0",
"sinon": "1.17.2",
"source-map": "0.5.6",
Expand All @@ -290,7 +290,7 @@
"supertest": "3.0.0",
"supertest-as-promised": "2.0.2",
"tree-kill": "1.1.0",
"webpack-dev-server": "1.14.1",
"webpack-dev-server": "2.9.1",
"yeoman-generator": "1.1.1",
"yo": "2.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const SenseEditor = require('../sense_editor/editor');
const exampleText = require('raw!./helpExample.txt').trim();
const exampleText = require('raw-loader!./helpExample.txt').trim();
import { useResizeCheckerProvider } from '../sense_editor_resize';

require('ui/modules')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var AceTokenizer = acequire("ace/tokenizer").Tokenizer;

var HighlightRules = require("./input_highlight_rules").InputHighlightRules;

acequire("ace/config").setModuleUrl("sense_editor/mode/worker", require("file!./worker.js"));
acequire("ace/config").setModuleUrl("sense_editor/mode/worker", require("file-loader!./worker.js"));

export function Mode() {
this.$tokenizer = new AceTokenizer(new HighlightRules().getRules());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let _ = require('lodash');
let curl = require('../../src/curl');
let curlTests = require('raw!./curl_parsing_tests.txt');
let curlTests = require('raw-loader!./curl_parsing_tests.txt');

var { test, module, ok, equal } = window.QUnit;

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/console/public/tests/src/editor_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import $ from 'jquery';
import _ from 'lodash';
let ace = require('ace');
import { initializeInput } from '../../src/input';
let editor_input1 = require('raw!./editor_input1.txt');
let editor_input1 = require('raw-loader!./editor_input1.txt');
let utils = require('../../src/utils');

var aceRange = ace.require("ace/range");
Expand Down
4 changes: 2 additions & 2 deletions src/core_plugins/console/public/tests/src/utils_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let _ = require('lodash');
let utils = require('../../src/utils');
let collapsingTests = require('raw!./utils_string_collapsing.txt');
let expandingTests = require('raw!./utils_string_expanding.txt');
let collapsingTests = require('raw-loader!./utils_string_collapsing.txt');
let expandingTests = require('raw-loader!./utils_string_expanding.txt');

var { test, module, deepEqual } = window.QUnit;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import _ from 'lodash';
import $ from 'jquery';
import PEG from 'pegjs';

import grammar from 'raw!../chain.peg';
import grammar from 'raw-loader!../chain.peg';
import './timelion_expression_suggestions/timelion_expression_suggestions';
import timelionExpressionInputTemplate from './timelion_expression_input.html';
import {
Expand Down
Loading