merging all conflicts

Author: react-translations-bot

next.config.js

@@ -36,6 +36,14 @@ const nextConfig = {
     // Don't bundle the shim unnecessarily.
     config.resolve.alias['use-sync-external-store/shim'] = 'react';
 
+    // ESLint depends on the CommonJS version of esquery,
+    // but Webpack loads the ESM version by default. This
+    // alias ensures the correct version is used.
+    //
+    // More info:
+    // https://github.com/reactjs/react.dev/pull/8115
+    config.resolve.alias['esquery'] = 'esquery/dist/esquery.min.js';
+
     const {IgnorePlugin, NormalModuleReplacementPlugin} = require('webpack');
     config.plugins.push(
       new NormalModuleReplacementPlugin(

package.json

@@ -63,7 +63,11 @@
     "asyncro": "^3.0.0",
     "autoprefixer": "^10.4.2",
     "babel-eslint": "10.x",
+<<<<<<< HEAD
     "babel-plugin-react-compiler": "^19.1.0-rc.3",
+=======
+    "babel-plugin-react-compiler": "^1.0.0",
+>>>>>>> d271a7ac11d2bf0d6e95ebdfacaf1038421f9be0
     "chalk": "4.1.2",
     "eslint": "7.x",
     "eslint-config-next": "12.0.3",