Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aligns several module versions across the repository #78327

Merged
merged 3 commits into from
Sep 28, 2020
Merged

Aligns several module versions across the repository #78327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ced163
Aligns several module versions across the repository
Sep 23, 2020
1d594e7
Merge remote-tracking branch 'upstream/master' into align-versions
Sep 28, 2020
7a75fc6
Merge branch 'master' into align-versions
elasticmachine Sep 28, 2020
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
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"check-disk-space": "^2.1.0",
"chokidar": "3.2.1",
"color": "1.0.3",
"commander": "3.0.2",
"commander": "^3.0.2",
"core-js": "^3.6.4",
"cypress-promise": "^1.1.0",
"deep-freeze-strict": "^1.1.1",
Expand Down Expand Up @@ -184,12 +184,12 @@
"json-stable-stringify": "^1.0.1",
"json-stringify-safe": "5.0.1",
"lodash": "^4.17.20",
"lru-cache": "4.1.5",
"lru-cache": "^4.1.5",
"minimatch": "^3.0.4",
"moment": "^2.24.0",
"moment-timezone": "^0.5.27",
"mustache": "2.3.2",
"node-fetch": "2.6.1",
"mustache": "^2.3.2",
"node-fetch": "^2.6.1",
"node-forge": "^0.10.0",
"opn": "^5.5.0",
"oppsy": "^2.0.0",
Expand All @@ -212,7 +212,7 @@
"rison-node": "1.0.2",
"rxjs": "^6.5.5",
"seedrandom": "^3.0.5",
"semver": "^5.5.0",
"semver": "^5.7.0",
"style-it": "^2.1.3",
"symbol-observable": "^1.2.0",
"tar": "4.4.13",
Expand All @@ -223,7 +223,7 @@
"uuid": "3.3.2",
"vision": "^5.3.3",
"whatwg-fetch": "^3.0.0",
"yauzl": "2.10.0"
"yauzl": "^2.10.0"
},
"devDependencies": {
"@babel/parser": "^7.11.2",
Expand Down Expand Up @@ -279,7 +279,7 @@
"@types/flot": "^0.0.31",
"@types/getopts": "^2.0.1",
"@types/getos": "^3.0.0",
"@types/glob": "^7.1.1",
"@types/glob": "^7.1.2",
"@types/globby": "^8.0.0",
"@types/graphql": "^0.13.2",
"@types/h2o2": "^8.1.1",
Expand Down Expand Up @@ -312,7 +312,7 @@
"@types/normalize-path": "^3.0.0",
"@types/opn": "^5.1.0",
"@types/pegjs": "^0.10.1",
"@types/pngjs": "^3.3.2",
"@types/pngjs": "^3.4.0",
"@types/podium": "^1.0.0",
"@types/prop-types": "^15.7.3",
"@types/reach__router": "^1.2.6",
Expand Down Expand Up @@ -393,7 +393,7 @@
"fetch-mock": "^7.3.9",
"fp-ts": "^2.3.1",
"geckodriver": "^1.20.0",
"getopts": "^2.2.4",
"getopts": "^2.2.5",
"grunt": "1.0.4",
"grunt-available-tasks": "^0.6.3",
"grunt-cli": "^1.2.0",
Expand Down Expand Up @@ -439,7 +439,7 @@
"multistream": "^2.1.1",
"murmurhash3js": "3.0.1",
"mutation-observer": "^1.0.3",
"ngreact": "0.5.1",
"ngreact": "^0.5.1",
"nock": "12.0.3",
"normalize-path": "^3.0.0",
"nyc": "^15.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-ace/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"devDependencies": {
"@kbn/dev-utils": "1.0.0",
"@kbn/babel-preset": "1.0.0",
"raw-loader": "3.1.0",
"raw-loader": "^3.1.0",
"typescript": "4.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/kbn-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
},
"devDependencies": {
"typescript": "4.0.2",
"tsd": "^0.7.4"
"tsd": "^0.13.1"
}
}
2 changes: 1 addition & 1 deletion packages/kbn-dev-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@babel/core": "^7.11.1",
"@kbn/utils": "1.0.0",
"axios": "^0.19.0",
"axios": "^0.19.2",
"chalk": "^4.1.0",
"cheerio": "0.22.0",
"dedent": "^0.7.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/kbn-es/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
"dependencies": {
"@elastic/elasticsearch": "7.9.0-rc.1",
"@kbn/dev-utils": "1.0.0",
"abort-controller": "^2.0.3",
"abort-controller": "^3.0.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.0.0 just drops IE support

"chalk": "^4.1.0",
"dedent": "^0.7.0",
"del": "^5.1.0",
"execa": "^4.0.2",
"getopts": "^2.2.4",
"getopts": "^2.2.5",
"glob": "^7.1.2",
"node-fetch": "^2.6.1",
"simple-git": "^1.91.0",
"simple-git": "1.116.0",
"tar-fs": "^2.1.0",
"tree-kill": "^1.2.2",
"yauzl": "^2.10.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-eslint-import-resolver-kibana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"debug": "^2.6.9",
"eslint-import-resolver-node": "0.3.2",
"eslint-import-resolver-webpack": "0.11.1",
"glob-all": "^3.1.0",
"glob-all": "^3.2.1",
"lru-cache": "^4.1.5",
"resolve": "^1.7.1",
"webpack": "^4.41.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-i18n/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@types/intl-relativeformat": "^2.1.0",
"@types/react-intl": "^2.3.15",
"del": "^5.1.0",
"getopts": "^2.2.4",
"getopts": "^2.2.5",
"supports-color": "^7.0.0",
"typescript": "4.0.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/kbn-interpreter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@babel/runtime": "^7.11.2",
"@kbn/i18n": "1.0.0",
"lodash": "^4.17.15",
"lodash": "^4.17.20",
"uuid": "3.3.2"
},
"devDependencies": {
Expand All @@ -25,12 +25,12 @@
"copy-webpack-plugin": "^6.0.2",
"css-loader": "^3.4.2",
"del": "^5.1.0",
"getopts": "^2.2.4",
"getopts": "^2.2.5",
"pegjs": "0.10.0",
"sass-loader": "^8.0.2",
"style-loader": "^1.1.3",
"supports-color": "^7.0.0",
"url-loader": "2.2.0",
"url-loader": "^2.2.0",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-monaco/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"babel-loader": "^8.0.6",
"css-loader": "^3.4.2",
"del": "^5.1.0",
"raw-loader": "3.1.0",
"raw-loader": "^3.1.0",
"supports-color": "^7.0.0",
"typescript": "4.0.2",
"webpack": "^4.41.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"jest-diff": "^25.5.0",
"json-stable-stringify": "^1.0.1",
"loader-utils": "^1.2.3",
"node-sass": "^4.13.0",
"node-sass": "^4.13.1",
"normalize-path": "^3.0.0",
"postcss": "^7.0.32",
"postcss-loader": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-plugin-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"devDependencies": {
"@types/extract-zip": "^1.6.2",
"@types/gulp-zip": "^4.0.1",
"@types/inquirer": "^6.5.0",
"@types/inquirer": "^7.3.1",
"extract-zip": "^2.0.1",
"typescript": "4.0.2"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/kbn-pm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/cpy": "^5.1.0",
"@types/dedent": "^0.7.0",
"@types/getopts": "^2.0.1",
"@types/glob": "^5.0.35",
"@types/globby": "^6.1.0",
"@types/glob": "^7.1.2",
"@types/globby": "^8.0.0",
"@types/has-ansi": "^3.0.0",
"@types/lodash": "^4.14.159",
"@types/log-symbols": "^2.0.0",
Expand All @@ -41,12 +41,12 @@
"dedent": "^0.7.0",
"del": "^5.1.0",
"execa": "^4.0.2",
"getopts": "^2.2.4",
"getopts": "^2.2.5",
"glob": "^7.1.2",
"globby": "^8.0.1",
"has-ansi": "^3.0.0",
"is-path-inside": "^3.0.2",
"lodash": "^4.17.15",
"lodash": "^4.17.20",
"log-symbols": "^2.2.0",
"multimatch": "^4.0.0",
"ncp": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-spec-to-console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"prettier": "^2.1.1"
},
"dependencies": {
"commander": "^3.0.0",
"commander": "^3.0.2",
"glob": "^7.1.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/kbn-std/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
},
"dependencies": {
"@kbn/utility-types": "1.0.0",
"lodash": "^4.17.15"
"lodash": "^4.17.20"
}
}
8 changes: 4 additions & 4 deletions packages/kbn-storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"jest-specific-snapshot": "2.0.0",
"jest-styled-components": "^7.0.2",
"mkdirp": "0.5.1",
"mini-css-extract-plugin": "0.7.0",
"normalize-path": "3.0.0",
"react-docgen-typescript-loader": "3.1.0",
"rxjs": "6.5.5",
"mini-css-extract-plugin": "0.8.0",
"normalize-path": "^3.0.0",
"react-docgen-typescript-loader": "^3.1.1",
"rxjs": "^6.5.5",
"serve-static": "1.14.1",
"styled-components": "^5.1.0",
"webpack": "^4.41.5"
Expand Down
5 changes: 2 additions & 3 deletions packages/kbn-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@
"dedent": "^0.7.0",
"del": "^5.1.0",
"exit-hook": "^2.2.0",
"getopts": "^2.2.4",
"getopts": "^2.2.5",
"glob": "^7.1.2",
"joi": "^13.5.2",
"lodash": "^4.17.15",
"lodash": "^4.17.20",
"parse-link-header": "^1.0.1",
"rxjs": "^6.5.5",
"strip-ansi": "^5.2.0",
"tar-fs": "^2.1.0",
"tmp": "^0.1.0",
"xml2js": "^0.4.22",
"zlib": "^1.0.5"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/kbn-ui-framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"classnames": "2.2.6",
"focus-trap-react": "^3.1.1",
"lodash": "^4.17.15",
"lodash": "^4.17.20",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-ace": "^5.9.0",
Expand All @@ -31,7 +31,7 @@
},
"devDependencies": {
"@babel/core": "^7.11.1",
"@elastic/eui": "0.0.55",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♂️

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do the ui-framework docs still work with this change?

Copy link
Contributor Author

@tylersmalley tylersmalley Sep 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point - We have a discussion to remove ui-framework entirely in #46410 (comment).

I will revert this line, and create another PR to remove all but the assets we're currently relying on for ui-framework so we're not in some half working state.

"@elastic/eui": "29.0.0",
"@kbn/babel-preset": "1.0.0",
"@kbn/optimizer": "1.0.0",
"babel-loader": "^8.0.6",
Expand Down Expand Up @@ -62,7 +62,7 @@
"react-router": "^3.2.0",
"react-router-redux": "^4.0.8",
"redux": "3.7.2",
"redux-thunk": "2.2.0",
"redux-thunk": "^2.3.0",
"regenerator-runtime": "^0.13.3",
"sass-loader": "^8.0.2",
"sinon": "^7.4.2",
Expand Down
Loading