From c0d19ebea262015cc09e6809bcf0b73c607435ac Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira@coder.com>
Date: Mon, 18 Jul 2022 10:43:11 -0400
Subject: [PATCH] chore: configure absolute paths with webpack (#3011)

* coonfigure absolute paths with webpack

resolves #1855

* fixed jest config
---
 site/jest.config.js                              | 2 +-
 site/src/pages/WorkspacesPage/WorkspacesPage.tsx | 6 +++---
 site/tsconfig.json                               | 3 ++-
 site/webpack.common.ts                           | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/site/jest.config.js b/site/jest.config.js
index 5cc3ea0bbb..267d1beb85 100644
--- a/site/jest.config.js
+++ b/site/jest.config.js
@@ -27,7 +27,7 @@ module.exports = {
       testEnvironment: "jsdom",
       testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$",
       testPathIgnorePatterns: ["/node_modules/", "/__tests__/fakes", "/e2e/"],
-      moduleDirectories: ["node_modules", "<rootDir>"],
+      moduleDirectories: ["node_modules", "<rootDir>/src"],
       moduleNameMapper: {
         "\\.css$": "<rootDir>/src/testHelpers/styleMock.ts",
       },
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
index 772e086a42..a0432c101c 100644
--- a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -2,9 +2,9 @@ import { useMachine } from "@xstate/react"
 import { FC, useEffect } from "react"
 import { Helmet } from "react-helmet"
 import { useSearchParams } from "react-router-dom"
-import { workspaceFilterQuery } from "../../util/filters"
-import { pageTitle } from "../../util/page"
-import { workspacesMachine } from "../../xServices/workspaces/workspacesXService"
+import { workspaceFilterQuery } from "util/filters"
+import { pageTitle } from "util/page"
+import { workspacesMachine } from "xServices/workspaces/workspacesXService"
 import { WorkspacesPageView } from "./WorkspacesPageView"
 
 const WorkspacesPage: FC = () => {
diff --git a/site/tsconfig.json b/site/tsconfig.json
index 68035832ca..9d46e46d92 100644
--- a/site/tsconfig.json
+++ b/site/tsconfig.json
@@ -13,7 +13,8 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": true,
-    "target": "es2018"
+    "target": "es2018",
+    "baseUrl": "./src"
   },
   "include": ["**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules", "_jest"]
diff --git a/site/webpack.common.ts b/site/webpack.common.ts
index e595a1d2cc..9fcd7a7ba2 100644
--- a/site/webpack.common.ts
+++ b/site/webpack.common.ts
@@ -103,6 +103,7 @@ export const createCommonWebpackConfig = (options?: { skipTypecheck: boolean }):
     //
     // See: https://webpack.js.org/guides/typescript/
     extensions: [".tsx", ".ts", ".js"],
+    modules: [path.resolve(__dirname, "src"), "node_modules"],
   },
 
   // plugins customize the build process