Skip to content

Commit

Permalink
Merge pull request #8214 from elastic/jasper/backport/8209/5.x
Browse files Browse the repository at this point in the history
[backport] PR #8209 to 5.x - [optimizer] move to querystring-browser package for up-to-date api
  • Loading branch information
epixa authored Sep 10, 2016
2 parents 6a404e7 + be6ff7a commit b717844
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
"babel-loader": "5.3.2",
"babel-runtime": "5.8.38",
"bluebird": "2.9.34",
"body-parser": "1.12.0",
"boom": "2.8.0",
"brace": "0.5.1",
"bunyan": "1.7.1",
Expand All @@ -109,6 +110,7 @@
"extract-text-webpack-plugin": "0.8.2",
"file-loader": "0.8.4",
"font-awesome": "4.4.0",
"glob": "5.0.13",
"glob-all": "3.0.1",
"good-squeeze": "2.1.0",
"gridster": "0.5.6",
Expand All @@ -133,8 +135,11 @@
"mkdirp": "0.5.1",
"moment": "2.13.0",
"moment-timezone": "0.5.4",
"node-fetch": "1.3.2",
"node-uuid": "1.4.7",
"papaparse": "4.1.2",
"pegjs": "0.9.0",
"querystring-browser": "1.0.4",
"raw-loader": "0.5.1",
"request": "2.61.0",
"rimraf": "2.4.3",
Expand All @@ -144,19 +149,15 @@
"semver": "5.1.0",
"style-loader": "0.12.3",
"tar": "2.2.0",
"tinygradient": "0.3.0",
"trunc-html": "1.0.2",
"trunc-text": "1.0.2",
"url-loader": "0.5.6",
"validate-npm-package-name": "2.2.2",
"webpack": "1.12.15",
"webpack-directory-name-as-main": "1.0.0",
"whatwg-fetch": "0.9.0",
"wreck": "6.2.0",
"body-parser": "1.12.0",
"glob": "5.0.13",
"node-fetch": "1.3.2",
"pegjs": "0.9.0",
"tinygradient": "0.3.0"
"wreck": "6.2.0"
},
"devDependencies": {
"@elastic/eslint-config-kibana": "0.0.3",
Expand Down
3 changes: 2 additions & 1 deletion src/ui/ui_bundler_env.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ module.exports = class UiBundlerEnv {
// webpack aliases, like require paths, mapping a prefix to a directory
this.aliases = {
ui: fromRoot('src/ui/public'),
test_harness: fromRoot('src/test_harness/public')
test_harness: fromRoot('src/test_harness/public'),
querystring: 'querystring-browser',
};

// map of which plugins created which aliases
Expand Down

0 comments on commit b717844

Please sign in to comment.