From 27ad839d47d13b3c625b1bd3bc32fe3e48c5dda2 Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan.clark@goteleport.com>
Date: Wed, 25 Jan 2023 17:19:22 +0000
Subject: [PATCH] Move jest, eslint & prettier to the root (#20698)

* Move jest, eslint & prettier to the root

* Update e ref
---
 web/babel.config.js => babel.config.js |  0
 e                                      |  2 +-
 web/jest.config.js => jest.config.js   |  0
 package.json                           |  9 ++++-----
 web/packages/build/jest/config.js      | 12 ++++++------
 5 files changed, 11 insertions(+), 12 deletions(-)
 rename web/babel.config.js => babel.config.js (100%)
 rename web/jest.config.js => jest.config.js (100%)

diff --git a/web/babel.config.js b/babel.config.js
similarity index 100%
rename from web/babel.config.js
rename to babel.config.js
diff --git a/e b/e
index 60f60b85c3e4a..58d97c10d4947 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 60f60b85c3e4ab4a6534ac3351894b67afd0fd14
+Subproject commit 58d97c10d494777a05347bee801fdc2974262bd7
diff --git a/web/jest.config.js b/jest.config.js
similarity index 100%
rename from web/jest.config.js
rename to jest.config.js
diff --git a/package.json b/package.json
index bc3f24b05f0eb..1982626d9f461 100644
--- a/package.json
+++ b/package.json
@@ -13,12 +13,12 @@
     "package-term": "yarn workspace @gravitational/namespaces package-term",
     "build-native-deps-for-term": "yarn workspace @gravitational/namespaces build-native-deps-for-term",
     "build-and-package-term-ci": "yarn workspace @gravitational/namespaces build-and-package-term-ci",
-    "test": "yarn workspace @gravitational/namespaces test",
+    "test": "jest",
     "lint": "yarn prettier-check && yarn eslint",
-    "eslint": "eslint --quiet --ext .js,.jsx,.ts,.tsx web/",
+    "eslint": "eslint --quiet --ext .js,.jsx,.ts,.tsx web/ e/",
     "type-check": "tsc --noEmit",
-    "prettier-check": "yarn prettier --check 'web/**/*.{ts,tsx,js,jsx,md}'",
-    "prettier-write": "yarn prettier --write 'web/**/*.{ts,tsx,js,jsx,md}'"
+    "prettier-check": "yarn prettier --check '+(e|web)/**/*.{ts,tsx,js,jsx,md}'",
+    "prettier-write": "yarn prettier --write '+(e|web)/**/*.{ts,tsx,js,jsx,md}'"
   },
   "private": true,
   "resolutions": {
@@ -37,5 +37,4 @@
       "e/web/**"
     ]
   }
-
 }
diff --git a/web/packages/build/jest/config.js b/web/packages/build/jest/config.js
index dfdefbcae32ea..0528bb5cfd931 100644
--- a/web/packages/build/jest/config.js
+++ b/web/packages/build/jest/config.js
@@ -22,11 +22,11 @@ module.exports = {
     // mock all imports to asset files
     '\\.(css|scss|stylesheet)$': path.join(__dirname, 'mockStyles.js'),
     '\\.(png|svg|yaml|yaml\\?raw)$': path.join(__dirname, 'mockFiles.js'),
-    '^shared/(.*)$': '<rootDir>/packages/shared/$1',
-    '^design($|/.*)': '<rootDir>/packages/design/src/$1',
-    '^teleport($|/.*)': '<rootDir>/packages/teleport/src/$1',
-    '^teleterm($|/.*)': '<rootDir>/packages/teleterm/src/$1',
-    '^e-teleport/(.*)$': '<rootDir>/../e/web/teleport/src/$1',
-    '^e-teleterm/(.*)$': '<rootDir>/../e/web/teleterm/src/$1',
+    '^shared/(.*)$': '<rootDir>/web/packages/shared/$1',
+    '^design($|/.*)': '<rootDir>/web/packages/design/src/$1',
+    '^teleport($|/.*)': '<rootDir>/web/packages/teleport/src/$1',
+    '^teleterm($|/.*)': '<rootDir>/web/packages/teleterm/src/$1',
+    '^e-teleport/(.*)$': '<rootDir>/e/web/teleport/src/$1',
+    '^e-teleterm/(.*)$': '<rootDir>/e/web/teleterm/src/$1',
   },
 };