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.17][Ops] Sync babel-related versions with main #161278

Merged
merged 6 commits into from
Jul 12, 2023
Merged

[7.17][Ops] Sync babel-related versions with main #161278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7ba584
chore: sync babel-related versions with main
delanni Jul 5, 2023
83c8cdd
chore: add some more dependencies, and add them to kbn dev utils
delanni Jul 6, 2023
2d130b9
[CI] Auto-commit changed files from 'yarn kbn run build -i @kbn/pm'
kibanamachine Jul 6, 2023
344ad5c
chore: add fix for storybook for babel 7.21
delanni Jul 6, 2023
5eb0a47
chore: sync a few more babel-related deps from main, fix tests
delanni Jul 6, 2023
f2c9118
Merge branch '7.17' into sync-babel-version-with-main
delanni Jul 7, 2023
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
56 changes: 31 additions & 25 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,14 @@
"yarn": "^1.21.1"
},
"resolutions": {
"**/@babel/runtime": "^7.16.3",
"**/@babel/core": "^7.21.0",
"**/@babel/preset-env": "^7.20.2",
"**/@babel/runtime": "^7.21.0",
"**/@babel/traverse": "^7.21.2",
"**/@babel/types": "^7.21.2",
"**/@jest/console": "29.3.1",
"**/@jest/reporters": "29.3.1",
"**/@types/babel__generator/@babel/types": "^7.21.0",
"**/@types/node": "16.11.7",
"**/@types/react-dom": "^16.9.8",
"**/babel-jest": "29.3.1",
Expand Down Expand Up @@ -102,7 +107,7 @@
"globby/fast-glob": "3.2.7"
},
"dependencies": {
"@babel/runtime": "^7.16.3",
"@babel/runtime": "^7.21.0",
"@dnd-kit/core": "^3.1.1",
"@dnd-kit/sortable": "^4.0.0",
"@dnd-kit/utilities": "^2.0.0",
Expand Down Expand Up @@ -426,25 +431,25 @@
"yauzl": "^2.10.0"
},
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@babel/eslint-parser": "^7.16.3",
"@babel/eslint-plugin": "^7.14.5",
"@babel/generator": "^7.16.0",
"@babel/parser": "^7.16.4",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/plugin-proposal-export-namespace-from": "^7.16.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
"@babel/plugin-proposal-optional-chaining": "^7.16.0",
"@babel/plugin-proposal-private-methods": "^7.16.0",
"@babel/plugin-transform-runtime": "^7.16.4",
"@babel/preset-env": "^7.16.4",
"@babel/preset-react": "^7.16.0",
"@babel/preset-typescript": "^7.16.0",
"@babel/register": "^7.16.0",
"@babel/traverse": "^7.16.3",
"@babel/types": "^7.16.0",
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.19.1",
"@babel/eslint-plugin": "^7.19.1",
"@babel/generator": "^7.21.1",
"@babel/parser": "^7.21.2",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
"@babel/register": "^7.21.0",
"@babel/traverse": "^7.21.2",
"@babel/types": "^7.21.2",
Comment on lines +434 to +452
Copy link
Contributor

Choose a reason for hiding this comment

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

Should these versions match @babel/core? Its the same on main so maybe we address it there first and backport?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe you're right - I wonder why it is not in sync on master - @mistic do you have any opinions on syncing the @babel/* versions to that of the core?

What I also wonder, the specifiers with ^ should be able to move around within the same major version, in theory they could resolve all to the same version.

Copy link
Member

Choose a reason for hiding this comment

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

Thats a good point. I think we can move on with this PR as it is and then open a fix on main to this mismatch with babel/core that we can then backport to the other branches.

Regarding the second question and after thinking a little about this, I think whats is more important is to keep at least what we define in the package.json in sync across the branches, having that said we can keep the ^ and afford to have little differences in the yarn.lock because if we upgrade those things at the same time they will tend to be exact the same in every branch without us to have to be completely strict in the package.json.

Let me know what you think about it 😃

Copy link
Member

Choose a reason for hiding this comment

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

👍 I believe the versions aren't always in sync (e.g. core is 7.22.8 and register is 7.22.5 currently), no-op releases are skipped but future releases will skip numbers to align, if anyone's curious as to why.

"@bazel/ibazel": "^0.16.2",
"@bazel/typescript": "^3.8.0",
"@cypress/snapshot": "^2.1.7",
Expand All @@ -453,7 +458,7 @@
"@elastic/github-checks-reporter": "0.0.20b3",
"@elastic/makelogs": "^6.1.1",
"@elastic/synthetics": "^1.0.0-beta.12",
"@emotion/babel-preset-css-prop": "^11.2.0",
"@emotion/babel-preset-css-prop": "^11.11.0",
"@emotion/jest": "^11.3.0",
"@istanbuljs/schema": "^0.1.2",
"@jest/console": "29.3.1",
Expand Down Expand Up @@ -511,7 +516,8 @@
"@testing-library/react-hooks": "^5.1.1",
"@testing-library/user-event": "^13.1.1",
"@types/archiver": "^5.1.0",
"@types/babel__core": "^7.1.16",
"@types/babel__core": "^7.20.0",
"@types/babel__generator": "^7.6.4",
"@types/base64-js": "^1.2.5",
"@types/bluebird": "^3.1.1",
"@types/chance": "^1.0.0",
Expand Down Expand Up @@ -670,11 +676,11 @@
"autoprefixer": "^10.4.7",
"axe-core": "^4.0.2",
"babel-jest": "29.3.1",
"babel-loader": "^8.2.2",
"babel-loader": "^8.2.5",
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-istanbul": "^6.1.1",
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^1.13.3",
"babel-plugin-styled-components": "^2.0.7",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "^5.6.6",
"callsites": "^3.1.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/kbn-dev-utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ RUNTIME_DEPS = [
"//packages/kbn-std",
"//packages/kbn-utils",
"@npm//@babel/core",
"@npm//@babel/generator",
"@npm//axios",
"@npm//chalk",
"@npm//cheerio",
Expand All @@ -71,6 +72,7 @@ TYPES_DEPS = [
"@npm//@babel/parser",
"@npm//@babel/types",
"@npm//@types/babel__core",
"@npm//@types/babel__generator",
"@npm//@types/cheerio",
"@npm//@types/dedent",
"@npm//@types/flot",
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-dev-utils/src/vscode_config/update_vscode_config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ it('persists comments in the original file', () => {
`);
expect(newJson).toMatchInlineSnapshot(`
// @managed

/**
* This is a top level comment
*/
Expand Down
Loading