Skip to content

Commit

Permalink
chore: use renamed babel plugin packages (redwoodjs#8832)
Browse files Browse the repository at this point in the history
  • Loading branch information
jtoar committed Jul 6, 2023
1 parent d68a3ef commit 42f5c04
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
8 changes: 4 additions & 4 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ module.exports = {
**/
['@babel/plugin-proposal-decorators', { legacy: true }],
// The "loose" option must be the same for all three of these plugins.
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-proposal-private-methods', { loose: true }],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
['@babel/plugin-transform-class-properties', { loose: true }],
['@babel/plugin-transform-private-methods', { loose: true }],
['@babel/plugin-transform-private-property-in-object', { loose: true }],
[
'@babel/plugin-transform-runtime',
{
Expand Down Expand Up @@ -144,7 +144,7 @@ module.exports = {
// normally provided through preset-env detecting TARGET_BROWSER
// but webpack 4 has an issue with this
// see https://github.com/PaulLeCam/react-leaflet/issues/883
['@babel/plugin-proposal-nullish-coalescing-operator'],
['@babel/plugin-transform-nullish-coalescing-operator'],
],
},
],
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"@babel/core": "7.22.5",
"@babel/generator": "7.22.5",
"@babel/node": "7.22.5",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-decorators": "7.22.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
"@babel/plugin-proposal-private-methods": "7.18.6",
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@babel/plugin-transform-class-properties": "7.22.5",
"@babel/plugin-transform-nullish-coalescing-operator": "7.22.5",
"@babel/plugin-transform-private-methods": "7.22.5",
"@babel/plugin-transform-private-property-in-object": "7.22.5",
"@babel/plugin-transform-runtime": "7.22.5",
"@babel/preset-env": "7.22.5",
"@babel/preset-react": "7.22.5",
Expand Down
6 changes: 3 additions & 3 deletions packages/internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
},
"dependencies": {
"@babel/parser": "7.22.5",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-private-methods": "7.18.6",
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@babel/plugin-transform-class-properties": "7.22.5",
"@babel/plugin-transform-private-methods": "7.22.5",
"@babel/plugin-transform-private-property-in-object": "7.22.5",
"@babel/plugin-transform-typescript": "7.22.5",
"@babel/register": "7.22.5",
"@babel/runtime-corejs3": "7.22.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/internal/src/build/babel/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export const getApiSideBabelPresets = (
exclude: [
// Remove class-properties from preset-env, and include separately with loose
// https://github.com/webpack/webpack/issues/9708
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-private-methods',
'@babel/plugin-transform-class-properties',
'@babel/plugin-transform-private-methods',
],
},
],
Expand Down
6 changes: 3 additions & 3 deletions packages/internal/src/build/babel/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ if (!RUNTIME_CORE_JS_VERSION) {

export const getCommonPlugins = () => {
return [
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-transform-class-properties', { loose: true }],
// Note: The private method loose mode configuration setting must be the
// same as @babel/plugin-proposal class-properties.
// (https://babeljs.io/docs/en/babel-plugin-proposal-private-methods#loose)
['@babel/plugin-proposal-private-methods', { loose: true }],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
['@babel/plugin-transform-private-methods', { loose: true }],
['@babel/plugin-transform-private-property-in-object', { loose: true }],
]
}

Expand Down
4 changes: 2 additions & 2 deletions packages/internal/src/build/babel/web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ export const getWebSideBabelPresets = (options: Flags) => {
exclude: [
// Remove class-properties from preset-env, and include separately
// https://github.com/webpack/webpack/issues/9708
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-private-methods',
'@babel/plugin-transform-class-properties',
'@babel/plugin-transform-private-methods',
],
},
'rwjs-babel-preset-env',
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-proposal-class-properties@npm:7.18.6, @babel/plugin-proposal-class-properties@npm:^7.0.0, @babel/plugin-proposal-class-properties@npm:^7.13.0, @babel/plugin-proposal-class-properties@npm:^7.18.6":
"@babel/plugin-proposal-class-properties@npm:^7.0.0, @babel/plugin-proposal-class-properties@npm:^7.13.0, @babel/plugin-proposal-class-properties@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6"
dependencies:
Expand Down Expand Up @@ -1135,7 +1135,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6":
"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6"
dependencies:
Expand Down Expand Up @@ -1199,7 +1199,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-proposal-private-methods@npm:7.18.6, @babel/plugin-proposal-private-methods@npm:^7.18.6":
"@babel/plugin-proposal-private-methods@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6"
dependencies:
Expand All @@ -1220,7 +1220,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-proposal-private-property-in-object@npm:7.21.11, @babel/plugin-proposal-private-property-in-object@npm:^7.21.0":
"@babel/plugin-proposal-private-property-in-object@npm:^7.21.0":
version: 7.21.11
resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.11"
dependencies:
Expand Down Expand Up @@ -1560,7 +1560,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-class-properties@npm:^7.22.5":
"@babel/plugin-transform-class-properties@npm:7.22.5, @babel/plugin-transform-class-properties@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
dependencies:
Expand Down Expand Up @@ -1842,7 +1842,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5":
"@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.5, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.5"
dependencies:
Expand Down Expand Up @@ -1929,7 +1929,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-private-methods@npm:^7.22.5":
"@babel/plugin-transform-private-methods@npm:7.22.5, @babel/plugin-transform-private-methods@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
dependencies:
Expand All @@ -1941,7 +1941,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-private-property-in-object@npm:^7.22.5":
"@babel/plugin-transform-private-property-in-object@npm:7.22.5, @babel/plugin-transform-private-property-in-object@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.5"
dependencies:
Expand Down Expand Up @@ -7805,9 +7805,9 @@ __metadata:
"@babel/cli": 7.22.5
"@babel/core": 7.22.5
"@babel/parser": 7.22.5
"@babel/plugin-proposal-class-properties": 7.18.6
"@babel/plugin-proposal-private-methods": 7.18.6
"@babel/plugin-proposal-private-property-in-object": 7.21.11
"@babel/plugin-transform-class-properties": 7.22.5
"@babel/plugin-transform-private-methods": 7.22.5
"@babel/plugin-transform-private-property-in-object": 7.22.5
"@babel/plugin-transform-typescript": 7.22.5
"@babel/register": 7.22.5
"@babel/runtime-corejs3": 7.22.5
Expand Down Expand Up @@ -27660,11 +27660,11 @@ __metadata:
"@babel/core": 7.22.5
"@babel/generator": 7.22.5
"@babel/node": 7.22.5
"@babel/plugin-proposal-class-properties": 7.18.6
"@babel/plugin-proposal-decorators": 7.22.5
"@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6
"@babel/plugin-proposal-private-methods": 7.18.6
"@babel/plugin-proposal-private-property-in-object": 7.21.11
"@babel/plugin-transform-class-properties": 7.22.5
"@babel/plugin-transform-nullish-coalescing-operator": 7.22.5
"@babel/plugin-transform-private-methods": 7.22.5
"@babel/plugin-transform-private-property-in-object": 7.22.5
"@babel/plugin-transform-runtime": 7.22.5
"@babel/preset-env": 7.22.5
"@babel/preset-react": 7.22.5
Expand Down

0 comments on commit 42f5c04

Please sign in to comment.