elastic · spalger · Dec 15, 2016 · Dec 13, 2016 · Dec 14, 2016 · Dec 15, 2016
diff --git a/.eslintignore b/.eslintignore
@@ -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.*
diff --git a/package.json b/package.json
@@ -87,8 +87,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",
@@ -133,7 +134,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",
@@ -146,7 +147,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",
@@ -164,7 +165,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"

diff --git a/src/core_plugins/tests_bundle/index.js b/src/core_plugins/tests_bundle/index.js
@@ -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'
-        },
       }
     }
   });

diff --git a/src/core_plugins/tests_bundle/webpackShims/angular-mocks.js b/src/core_plugins/tests_bundle/webpackShims/angular-mocks.js
@@ -0,0 +1,2 @@
+require('angular');
+require('../../../../node_modules/angular-mocks/angular-mocks.js');
diff --git a/src/core_plugins/timelion/bower.json b/src/core_plugins/timelion/bower.json
diff --git a/src/core_plugins/timelion/bower_components/angular-sortable-view/.bower.json b/src/core_plugins/timelion/bower_components/angular-sortable-view/.bower.json
diff --git a/src/core_plugins/timelion/bower_components/angular-sortable-view/CHANGELOG.md b/src/core_plugins/timelion/bower_components/angular-sortable-view/CHANGELOG.md
diff --git a/src/core_plugins/timelion/bower_components/angular-sortable-view/Gruntfile.js b/src/core_plugins/timelion/bower_components/angular-sortable-view/Gruntfile.js
diff --git a/src/core_plugins/timelion/bower_components/angular-sortable-view/LICENSE b/src/core_plugins/timelion/bower_components/angular-sortable-view/LICENSE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		require('angular');
		require('../../../../node_modules/angular-mocks/angular-mocks.js');
Copy link Contributor kobelb Dec 15, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Any reason this isn't just require('angular-mocks')? Copy link Contributor Author spalger Dec 15, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. That would point to this file :) Copy link Contributor kobelb Dec 15, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I'm afraid I'm missing how `require('angular')` works and `require('angular-mocks')` doesn't, not doubting you, just curious.