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

[7.x] Storybook 6 and config changes (#75357) #78894

Merged
merged 12 commits into from
Oct 5, 2020
+2,597 −2,584
Merged

[7.x] Storybook 6 and config changes (#75357) #78894

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f98760f
Storybook 6 and config changes (#75357)
smith Sep 30, 2020
0389551
Storybook 6 and config changes (#75357)
smith Sep 30, 2020
c84e51f
pm update
smith Sep 30, 2020
3058741
Updates kbn-pm dist
Oct 1, 2020
7dd9199
Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-75357
Oct 1, 2020
d483f3b
Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-75357
Oct 2, 2020
c522728
Align types between optimizer and storybook
smith Oct 2, 2020
c8ce93c
Align webpack and loader-utils types with master
smith Oct 2, 2020
6f6bcf7
Lock correct webpack version in kbn-optimizer
smith Oct 5, 2020
712b76f
Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-75357
smith Oct 5, 2020
515260d
pm update
smith Oct 5, 2020
813c0a1
change ts-expect-error to ts-ignore
smith Oct 5, 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
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ module.exports = {
*/
{
files: [
'**/*.stories.tsx',
'x-pack/test/apm_api_integration/**/*.ts',
'x-pack/test/functional/apps/**/*.js',
'x-pack/plugins/apm/**/*.js',
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,16 @@
"@types/styled-components": "^5.1.0",
"@types/supertest": "^2.0.5",
"@types/supertest-as-promised": "^2.0.38",
"@types/tapable": "^1.0.6",
"@types/tar": "^4.0.3",
"@types/testing-library__jest-dom": "^5.9.2",
"@types/testing-library__react-hooks": "^3.4.0",
"@types/type-detect": "^4.0.1",
"@types/uuid": "^3.4.4",
"@types/vinyl": "^2.0.4",
"@types/vinyl-fs": "^2.4.11",
"@types/webpack": "^4.41.21",
"@types/webpack-env": "^1.15.2",
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "^3.10.0",
"@typescript-eslint/parser": "^3.10.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-optimizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
},
"devDependencies": {
"@types/compression-webpack-plugin": "^2.0.2",
"@types/loader-utils": "^1.1.3",
"@types/loader-utils": "^2.0.1",
"@types/watchpack": "^1.1.5",
"@types/webpack": "^4.41.3"
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like master has "@types/webpack": "^4.41.3" and "@types/loader-utils": "^1.1.3",. Mind aligning with those to keep the branches consistent?

"@types/webpack": "^4.41.21"
}
}
Loading