Skip to content

Commit

Permalink
[webpack] fix loader query string usage
Browse files Browse the repository at this point in the history
Backports PR #9497

**Commit 1:**
[webpack] pin to fork with fixed loader aliases

* Original sha: a1e3357
* Authored by spalger <[email protected]> on 2016-12-13T21:57:21Z

**Commit 2:**
[optimizer] upgrade to postcss+autoprefixer

* Original sha: bceecd5
* Authored by spalger <[email protected]> on 2016-12-14T23:57:18Z

**Commit 3:**
[timelion] convert uiExports.modules -> webpackShims

* Original sha: 7e90dc6
* Authored by spalger <[email protected]> on 2016-12-15T17:20:54Z

**Commit 4:**
[uiExports] remove implementation-leaking and unused uiExport types

* Original sha: 10016f3
* Authored by spalger <[email protected]> on 2016-12-15T17:59:04Z

**Commit 5:**
[optimizer] remove unused imports

* Original sha: b841c91
* Authored by spalger <[email protected]> on 2016-12-15T18:01:37Z

**Commit 6:**
[uiBundlerEnv] add a method for exporting global import aliases for special cases

* Original sha: 4969d66
* Authored by spalger <[email protected]> on 2016-12-15T18:38:52Z

**Commit 7:**
Merge branch 'master' of github.com:elastic/kibana into fix/webpack-loader-query-strings

* Original sha: bcaf446
* Authored by spalger <[email protected]> on 2016-12-15T19:45:01Z
  • Loading branch information
spalger committed Dec 16, 2016
1 parent da4c0b4 commit dd02bc6
Show file tree
Hide file tree
Showing 210 changed files with 134 additions and 58,062 deletions.
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
/test/fixtures/scenarios
/src/core_plugins/console/public/webpackShims
/src/core_plugins/console/public/tests/webpackShims
/src/core_plugins/timelion/bower_components
/src/core_plugins/timelion/vendor_components
/src/ui/public/utils/decode_geo_hash.js
/src/core_plugins/timelion/public/webpackShims/jquery.flot.*
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@
"angular-elastic": "2.5.0",
"angular-route": "1.4.7",
"angular-sanitize": "1.5.7",
"angular-sortable-view": "0.0.15",
"ansicolors": "0.3.2",
"autoprefixer": "6.3.7",
"autoprefixer": "6.5.4",
"autoprefixer-loader": "2.0.0",
"babel": "5.8.38",
"babel-core": "5.8.38",
Expand Down Expand Up @@ -132,7 +133,7 @@
"json-stringify-safe": "5.0.1",
"jstimezonedetect": "1.0.5",
"leaflet": "0.7.5",
"less": "2.7.0",
"less": "2.7.1",
"less-loader": "2.2.3",
"lodash": "3.10.1",
"marked": "0.3.6",
Expand All @@ -145,7 +146,7 @@
"node-sass": "3.8.0",
"node-uuid": "1.4.7",
"pegjs": "0.9.0",
"postcss-loader": "1.2.0",
"postcss-loader": "1.2.1",
"querystring-browser": "1.0.4",
"raw-loader": "0.5.1",
"request": "2.61.0",
Expand All @@ -163,7 +164,7 @@
"url-loader": "0.5.6",
"validate-npm-package-name": "2.2.2",
"vision": "4.1.0",
"webpack": "1.12.15",
"webpack": "github:spalger/webpack#fix/query-params-for-aliased-loaders",
"webpack-directory-name-as-main": "1.0.0",
"whatwg-fetch": "0.9.0",
"wreck": "6.2.0"
Expand Down
7 changes: 2 additions & 5 deletions src/core_plugins/tests_bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,11 @@ export default (kibana) => {
});
},

modules: {
__globalImportAliases__: {
ng_mock$: fromRoot('src/core_plugins/dev_mode/public/ng_mock'),
'angular-mocks$': require.resolve('./webpackShims/angular-mocks'),
fixtures: fromRoot('src/fixtures'),
test_utils: fromRoot('src/test_utils'),
'angular-mocks': {
path: require.resolve('angular-mocks'),
imports: 'angular'
},
}
}
});
Expand Down
2 changes: 2 additions & 0 deletions src/core_plugins/tests_bundle/webpackShims/angular-mocks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require('angular');
require('../../../../node_modules/angular-mocks/angular-mocks.js');
8 changes: 0 additions & 8 deletions src/core_plugins/timelion/bower.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit dd02bc6

Please sign in to comment.