diff --git a/site/jest.config.js b/site/jest.config.js index 5cc3ea0bbbc8b..267d1beb85699 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", ""], + moduleDirectories: ["node_modules", "/src"], moduleNameMapper: { "\\.css$": "/src/testHelpers/styleMock.ts", }, diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx index 772e086a42325..a0432c101c0cc 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 68035832ca847..9d46e46d92fde 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 e595a1d2cc8e7..9fcd7a7ba2c00 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