diff --git a/packages/eslint-config-react/index.js b/packages/eslint-config-react/index.js
index 4aa882f7f..51997ba37 100644
--- a/packages/eslint-config-react/index.js
+++ b/packages/eslint-config-react/index.js
@@ -1,12 +1,19 @@
 module.exports = {
-  extends: ['airbnb', 'airbnb/base', 'prettier', 'prettier/react'],
+  extends: ['airbnb', 'airbnb/hooks', 'prettier', 'prettier/react'],
   parser: '@babel/eslint-parser',
   env: {
     browser: true,
     jest: true,
   },
-  plugins: ['react-hooks'],
   rules: {
+    'sort-imports': [
+      'error',
+      {
+        ignoreDeclarationSort: true,
+        memberSyntaxSortOrder: ['single', 'multiple', 'all', 'none'],
+      },
+    ],
+
     'import/order': [
       'error',
       {
@@ -26,5 +33,9 @@ module.exports = {
     ],
 
     'react/jsx-filename-extension': ['error', { extensions: ['.js'] }],
+    'react/jsx-no-script-url': 'error',
+    'react/jsx-no-useless-fragment': 'error',
+    'react/no-adjacent-inline-elements': 'error',
+    'react/jsx-no-constructed-context-values': 'warn'
   },
 }
diff --git a/packages/regex/src/__tests__/index.js b/packages/regex/src/__tests__/index.js
index 10fdbd2a0..93bd3800e 100644
--- a/packages/regex/src/__tests__/index.js
+++ b/packages/regex/src/__tests__/index.js
@@ -1,6 +1,10 @@
 import {
   alpha,
   alphanum,
+  alphanumLowercase,
+  alphanumSpacesDotsUnderscoreDash,
+  alphanumUnderscoreDash,
+  alphanumUnderscoreDollarDash,
   alphanumdash,
   alphanumdashdots,
   alphanumdashdotsorempty,
@@ -8,10 +12,6 @@ import {
   alphanumdashorempty,
   alphanumdashspaces,
   alphanumdots,
-  alphanumLowercase,
-  alphanumSpacesDotsUnderscoreDash,
-  alphanumUnderscoreDash,
-  alphanumUnderscoreDollarDash,
   ascii,
   backupKey,
   cron,
@@ -19,8 +19,8 @@ import {
   email,
   fourDigitsCode,
   phone,
-  spaces,
   sixDigitsCode,
+  spaces,
   url,
 } from '..'