Skip to content

Commit

Permalink
chore: merge main and fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ampersarnie committed Jan 26, 2024
2 parents cf27c20 + 794c966 commit 327835c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 39 deletions.
4 changes: 2 additions & 2 deletions configs/babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ const presets = [
];

const plugins = [
['@babel/plugin-proposal-optional-chaining'],
['@babel/plugin-proposal-pipeline-operator', { proposal: 'minimal' }],
['@babel/plugin-proposal-class-properties'],
['@babel/plugin-transform-optional-chaining'],
['@babel/plugin-transform-class-properties'],
];

const overrides = [
Expand Down
37 changes: 2 additions & 35 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"@babel/core": "^7.14.8",
"@babel/eslint-parser": "^7.14.9",
"@babel/eslint-plugin": "^7.14.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-proposal-pipeline-operator": "^7.14.8",
"@babel/plugin-transform-class-properties": "^7.23.3",
"@babel/plugin-transform-optional-chaining": "^7.23.4",
"@babel/preset-env": "^7.14.9",
"@babel/preset-react": "^7.14.5",
"@svgr/webpack": "^6.2.1",
Expand Down

0 comments on commit 327835c

Please sign in to comment.