Skip to content

Commit

Permalink
fix: hotfixed TypeScript compatibility issues with custom Babel plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinGhadyani-Okta
KevinGhadyani-Okta committed Sep 27, 2022
1 parent 8f8f6b2 commit 78d1a7b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 166 deletions.
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"packages/*"
],
"resolutions": {
"@babel/plugin-transform-typescript": "^7.19.1"
"@babel/plugin-transform-typescript": "^7.19.1",
"@types/babel__traverse": "^7.18.1"
},
"engines": {
"yarn": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-preset/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"@okta/odyssey-lifecycle": "^0.15.0",
"@okta/odyssey-typescript": "^0.15.0",
"@types/babel__core": "^7.1.15",
"@types/babel__core": "^7.1.19",
"typescript": "^4.8.3"
}
}
1 change: 0 additions & 1 deletion packages/odyssey-react-mui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"@types/jest-axe": "^3.5.1",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.5",
"babel-jest": "^26.6.3",
"babel-plugin-import": "^1.13.5",
"eslint": "^7.27.0",
"jest": "^29.0.3",
Expand Down
1 change: 0 additions & 1 deletion packages/odyssey-react-theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@types/hoist-non-react-statics": "^3.3.1",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.5",
"babel-jest": "^26.6.3",
"eslint": "^7.27.0",
"jest": "^29.0.3",
"jest-environment-jsdom": "^29.0.3",
Expand Down
1 change: 0 additions & 1 deletion packages/odyssey-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"@types/jest-axe": "^3.5.1",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.5",
"babel-jest": "^26.6.3",
"chokidar": "^3.4.0",
"eslint": "^7.27.0",
"jest": "^29.0.3",
Expand Down
179 changes: 18 additions & 161 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,20 +1416,20 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-validator-identifier@npm:^7.16.7":
version: 7.16.7
resolution: "@babel/helper-validator-identifier@npm:7.16.7"
checksum: dbb3db9d184343152520a209b5684f5e0ed416109cde82b428ca9c759c29b10c7450657785a8b5c5256aa74acc6da491c1f0cf6b784939f7931ef82982051b69
languageName: node
linkType: hard

"@babel/helper-validator-identifier@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/helper-validator-identifier@npm:7.18.6"
checksum: e295254d616bbe26e48c196a198476ab4d42a73b90478c9842536cf910ead887f5af6b5c4df544d3052a25ccb3614866fa808dc1e3a5a4291acd444e243c0648
languageName: node
linkType: hard

"@babel/helper-validator-identifier@npm:^7.19.1":
version: 7.19.1
resolution: "@babel/helper-validator-identifier@npm:7.19.1"
checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a
languageName: node
linkType: hard

"@babel/helper-validator-option@npm:^7.12.17":
version: 7.12.17
resolution: "@babel/helper-validator-option@npm:7.12.17"
Expand Down Expand Up @@ -3753,76 +3753,14 @@ __metadata:
languageName: node
linkType: hard

"@babel/types@npm:^7.0.0, @babel/types@npm:^7.10.4, @babel/types@npm:^7.4.4":
version: 7.11.5
resolution: "@babel/types@npm:7.11.5"
dependencies:
"@babel/helper-validator-identifier": ^7.10.4
lodash: ^4.17.19
to-fast-properties: ^2.0.0
checksum: de2c1302f7c459d5786e8e3775c9162c07db86b4abac73368d4dfaea876bd4284241793b1f096685f74baab17b34f6c00d4a7ff03fb1bbea4d9fc46c9cae4b33
languageName: node
linkType: hard

"@babel/types@npm:^7.12.1, @babel/types@npm:^7.12.7, @babel/types@npm:^7.13.0, @babel/types@npm:^7.13.16, @babel/types@npm:^7.14.2, @babel/types@npm:^7.2.0":
version: 7.14.2
resolution: "@babel/types@npm:7.14.2"
dependencies:
"@babel/helper-validator-identifier": ^7.14.0
to-fast-properties: ^2.0.0
checksum: b8e4796ba859e038c05b2cab20f029a017e881a97eaf53be431b617c4e4c5370d8a4701950866e526b8177053fa943db1b2d6e6c7269ad869e5a0c62e67e1274
languageName: node
linkType: hard

"@babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.14.8, @babel/types@npm:^7.15.0":
version: 7.15.0
resolution: "@babel/types@npm:7.15.0"
dependencies:
"@babel/helper-validator-identifier": ^7.14.9
to-fast-properties: ^2.0.0
checksum: 6d6bcdfce94b5446520a24087c6dede453e28425af092965b304d4028e9bca79712fd691cdad031e3570c7667bf3206e5f642bcccbfccb33d42ca4a8203587f9
languageName: node
linkType: hard

"@babel/types@npm:^7.12.13, @babel/types@npm:^7.13.12, @babel/types@npm:^7.14.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3":
version: 7.14.0
resolution: "@babel/types@npm:7.14.0"
dependencies:
"@babel/helper-validator-identifier": ^7.14.0
to-fast-properties: ^2.0.0
checksum: e69829ade45feb140d5e146be5203533edff1ad41a892870e1c6e323a06cafaf5b7e4d83dcae1222deff3bff73cf095b48c2cbf8864b77140196879fafaaf859
languageName: node
linkType: hard

"@babel/types@npm:^7.12.5":
version: 7.12.6
resolution: "@babel/types@npm:7.12.6"
dependencies:
"@babel/helper-validator-identifier": ^7.10.4
lodash: ^4.17.19
to-fast-properties: ^2.0.0
checksum: bde2453ec5811d00a1e744e9dfdc98108fd2693318c5c5fa8b722e13ac11eb205f3d270ff3b557d7554c8dfdba0958d47bec4fd56d999a8b72dc02d915cd7926
languageName: node
linkType: hard

"@babel/types@npm:^7.14.5":
version: 7.14.5
resolution: "@babel/types@npm:7.14.5"
dependencies:
"@babel/helper-validator-identifier": ^7.14.5
to-fast-properties: ^2.0.0
checksum: 7c1ab6e8bdf438d44236034cab10f7d0f1971179bc405dca26733a9b89dd87dd692dc49a238a7495075bc41a9a17fb6f08b4d1da45ea6ddcce1e5c8593574aea
languageName: node
linkType: hard

"@babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9":
version: 7.18.10
resolution: "@babel/types@npm:7.18.10"
"@babel/types@npm:^7.0.0, @babel/types@npm:^7.10.4, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.13, @babel/types@npm:^7.12.5, @babel/types@npm:^7.12.6, @babel/types@npm:^7.12.7, @babel/types@npm:^7.13.0, @babel/types@npm:^7.13.12, @babel/types@npm:^7.13.16, @babel/types@npm:^7.14.0, @babel/types@npm:^7.14.2, @babel/types@npm:^7.14.5, @babel/types@npm:^7.14.8, @babel/types@npm:^7.15.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
version: 7.19.3
resolution: "@babel/types@npm:7.19.3"
dependencies:
"@babel/helper-string-parser": ^7.18.10
"@babel/helper-validator-identifier": ^7.18.6
"@babel/helper-validator-identifier": ^7.19.1
to-fast-properties: ^2.0.0
checksum: 11632c9b106e54021937a6498138014ebc9ad6c327a07b2af3ba8700773945aba4055fd136431cbe3a500d0f363cbf9c68eb4d6d38229897c5de9d06e14c85e8
checksum: 34a5b3db3b99a1a80ec2a784c2bb0e48769a38f1526dc377a5753a3ac5e5704663c405a393117ecc7a9df9da07b01625be7c4c3fee43ae46aba23b0c40928d77
languageName: node
linkType: hard

Expand All @@ -3837,16 +3775,6 @@ __metadata:
languageName: node
linkType: hard

"@babel/types@npm:^7.8.3":
version: 7.17.0
resolution: "@babel/types@npm:7.17.0"
dependencies:
"@babel/helper-validator-identifier": ^7.16.7
to-fast-properties: ^2.0.0
checksum: 12e5a287986fe557188e87b2c5202223f1dc83d9239a196ab936fdb9f8c1eb0be717ff19f934b5fad4e29a75586d5798f74bed209bccea1c20376b9952056f0e
languageName: node
linkType: hard

"@base2/pretty-print-object@npm:1.0.1":
version: 1.0.1
resolution: "@base2/pretty-print-object@npm:1.0.1"
Expand Down Expand Up @@ -6154,7 +6082,7 @@ __metadata:
"@okta/odyssey-babel-plugin": ^0.15.0
"@okta/odyssey-lifecycle": ^0.15.0
"@okta/odyssey-typescript": ^0.15.0
"@types/babel__core": ^7.1.15
"@types/babel__core": ^7.1.19
typescript: ^4.8.3
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -6323,7 +6251,6 @@ __metadata:
"@types/jest-axe": ^3.5.1
"@types/react": ^17.0.30
"@types/react-dom": ^17.0.5
babel-jest: ^26.6.3
babel-plugin-import: ^1.13.5
eslint: ^7.27.0
jest: ^29.0.3
Expand Down Expand Up @@ -6361,7 +6288,6 @@ __metadata:
"@types/hoist-non-react-statics": ^3.3.1
"@types/react": ^17.0.30
"@types/react-dom": ^17.0.5
babel-jest: ^26.6.3
eslint: ^7.27.0
hoist-non-react-statics: ^3.3.2
jest: ^29.0.3
Expand Down Expand Up @@ -6398,7 +6324,6 @@ __metadata:
"@types/jest-axe": ^3.5.1
"@types/react": ^17.0.30
"@types/react-dom": ^17.0.5
babel-jest: ^26.6.3
choices.js: ^9.0.1
chokidar: ^3.4.0
eslint: ^7.27.0
Expand Down Expand Up @@ -8101,20 +8026,7 @@ __metadata:
languageName: node
linkType: hard

"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.7":
version: 7.1.14
resolution: "@types/babel__core@npm:7.1.14"
dependencies:
"@babel/parser": ^7.1.0
"@babel/types": ^7.0.0
"@types/babel__generator": "*"
"@types/babel__template": "*"
"@types/babel__traverse": "*"
checksum: de4a1a4905e4fb66e9b5ea185704b209892fa104b6aec8705021a3ddf0ff017234c41a1b0bffb0acf2c361afd5352c2d216e3548c8a702ba2558ab63f0bf2200
languageName: node
linkType: hard

"@types/babel__core@npm:^7.1.14":
"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.19":
version: 7.1.19
resolution: "@types/babel__core@npm:7.1.19"
dependencies:
Expand All @@ -8127,19 +8039,6 @@ __metadata:
languageName: node
linkType: hard

"@types/babel__core@npm:^7.1.15":
version: 7.1.15
resolution: "@types/babel__core@npm:7.1.15"
dependencies:
"@babel/parser": ^7.1.0
"@babel/types": ^7.0.0
"@types/babel__generator": "*"
"@types/babel__template": "*"
"@types/babel__traverse": "*"
checksum: 3ea016369666a013564f8d3119ae987b3a3f1bdf31cc90e0d58714eea10d6b89a9fb1f6146290ee239ecc285800b246f18be930625c1d83e79d074842e43ab7d
languageName: node
linkType: hard

"@types/babel__generator@npm:*":
version: 7.6.2
resolution: "@types/babel__generator@npm:7.6.2"
Expand All @@ -8159,12 +8058,12 @@ __metadata:
languageName: node
linkType: hard

"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6":
version: 7.11.1
resolution: "@types/babel__traverse@npm:7.11.1"
"@types/babel__traverse@npm:^7.18.1":
version: 7.18.2
resolution: "@types/babel__traverse@npm:7.18.2"
dependencies:
"@babel/types": ^7.3.0
checksum: 7bcf7fd0c88687929467d8be08460a7b216b2df5080338bc0575f1b9dbc51ba467b44063802ebbbea1249d5e2a87fed1f02d18b36c1723cd4d957cca70d3a89b
checksum: 05972775e21cf07753b3bec725bf76f5a9804f99f660d323040746e3c8a4fe1b4ef6df17d7a80c4e2e335382cc72c62fc5a7079af836871ff9cbf0c21804e6d9
languageName: node
linkType: hard

Expand Down Expand Up @@ -10280,24 +10179,6 @@ __metadata:
languageName: node
linkType: hard

"babel-jest@npm:^26.6.3":
version: 26.6.3
resolution: "babel-jest@npm:26.6.3"
dependencies:
"@jest/transform": ^26.6.2
"@jest/types": ^26.6.2
"@types/babel__core": ^7.1.7
babel-plugin-istanbul: ^6.0.0
babel-preset-jest: ^26.6.2
chalk: ^4.0.0
graceful-fs: ^4.2.4
slash: ^3.0.0
peerDependencies:
"@babel/core": ^7.0.0
checksum: 5917233f0d381e719e195b69b81e46da90293432d10288d79f8f59b8f3f9ac030e14701f3d9f90893fb739481df1d132446f1b983d841e65e2623775db100897
languageName: node
linkType: hard

"babel-jest@npm:^29.0.3":
version: 29.0.3
resolution: "babel-jest@npm:29.0.3"
Expand Down Expand Up @@ -10417,18 +10298,6 @@ __metadata:
languageName: node
linkType: hard

"babel-plugin-jest-hoist@npm:^26.6.2":
version: 26.6.2
resolution: "babel-plugin-jest-hoist@npm:26.6.2"
dependencies:
"@babel/template": ^7.3.3
"@babel/types": ^7.3.3
"@types/babel__core": ^7.0.0
"@types/babel__traverse": ^7.0.6
checksum: abe3732fdf20f96e91cbf788a54d776b30bd7a6054cb002a744d7071c656813e26e77a780dc2a6f6b197472897e220836cd907bda3fadb9d0481126bfd6c3783
languageName: node
linkType: hard

"babel-plugin-jest-hoist@npm:^29.0.2":
version: 29.0.2
resolution: "babel-plugin-jest-hoist@npm:29.0.2"
Expand Down Expand Up @@ -10569,18 +10438,6 @@ __metadata:
languageName: node
linkType: hard

"babel-preset-jest@npm:^26.6.2":
version: 26.6.2
resolution: "babel-preset-jest@npm:26.6.2"
dependencies:
babel-plugin-jest-hoist: ^26.6.2
babel-preset-current-node-syntax: ^1.0.0
peerDependencies:
"@babel/core": ^7.0.0
checksum: 1d9bef3a7ac6751a09d29ceb84be8b1998abd210fafa12223689c744db4f2a63ab90cba7986a71f3154d9aceda9dbeca563178731d21cbaf793b4096ed3a4d01
languageName: node
linkType: hard

"babel-preset-jest@npm:^29.0.2":
version: 29.0.2
resolution: "babel-preset-jest@npm:29.0.2"
Expand Down

0 comments on commit 78d1a7b

Please sign in to comment.