Skip to content

Commit

Permalink
Better workaround for babel/webpacker dep issue
Browse files Browse the repository at this point in the history
See rails/rails#48372 as mentioned in the
commentary.

Also revert commit 0ed27d6
which is a previous unsuccessful workaround.
  • Loading branch information
simonbaird committed Jun 13, 2023
1 parent c9ec8c2 commit c1063d6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 12 additions & 2 deletions rails/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,23 @@ module.exports = function(api) {
}
],
[
'@babel/plugin-proposal-private-methods',
//
// As per https://github.com/rails/rails/issues/48372
// See also https://github.com/babel/babel/issues/15679
//
//'@babel/plugin-proposal-private-methods',
'@babel/plugin-transform-private-methods',
{
loose: true
}
],
[
'@babel/plugin-proposal-private-property-in-object',
//
// As per https://github.com/rails/rails/issues/48372
// See also https://github.com/babel/babel/issues/15679
//
//'@babel/plugin-proposal-private-property-in-object',
'@babel/plugin-transform-private-property-in-object',
{
loose: true
}
Expand Down
2 changes: 0 additions & 2 deletions rails/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
"name": "app",
"private": true,
"dependencies": {
"@babel/core": "^7.22.1",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@popperjs/core": "^2.11.0",
"@rails/activestorage": "^6.0.0",
"@rails/ujs": "^6.0.0",
Expand Down
10 changes: 1 addition & 9 deletions rails/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.3.tgz#cd502a6a0b6e37d7ad72ce7e71a7160a3ae36f7e"
integrity sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==

"@babel/core@^7.15.0", "@babel/core@^7.22.1":
"@babel/core@^7.15.0":
version "7.22.1"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.1.tgz#5de51c5206f4c6f5533562838337a603c1033cfd"
integrity sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==
Expand Down Expand Up @@ -300,14 +300,6 @@
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
"@babel/plugin-transform-parameters" "^7.20.7"

"@babel/plugin-proposal-private-methods@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
dependencies:
"@babel/helper-create-class-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"

"@babel/plugin-proposal-private-property-in-object@^7.21.0":
version "7.21.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
Expand Down

0 comments on commit c1063d6

Please sign in to comment.