Skip to content

Commit 5ccc9f5

Browse files
committed
♻️ refactor: add the @ alias for imports
1 parent fcc3b75 commit 5ccc9f5

File tree

9 files changed

+28
-13
lines changed

9 files changed

+28
-13
lines changed

frontend/js/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { createRoot } from "react-dom/client";
44

55
import App from "./App";
66

7-
import "../css/style.css";
7+
import "@/css/style.css";
88

99
Sentry.init({
1010
dsn: window.SENTRY_DSN,

frontend/js/loaders/users.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { redirectDocument } from "react-router";
22

3-
import { ApiError, UsersService } from "../api";
3+
import { ApiError, UsersService } from "@/js/api";
44

55
export async function usersLoader({ request }: { request: Request }) {
66
const url = new URL(request.url);

frontend/js/pages/Home.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useState, useEffect } from "react";
22

3-
import DjangoImgSrc from "../../assets/images/django-logo-negative.png";
4-
import { RestService } from "../api";
5-
import { TopNav } from "../components";
3+
import DjangoImgSrc from "@/assets/images/django-logo-negative.png";
4+
import { RestService } from "@/js/api";
5+
import { TopNav } from "@/js/components";
66

77
const Home = () => {
88
const [showBugComponent, setShowBugComponent] = useState(false);

frontend/js/pages/__tests__/Home.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { render, screen, waitFor } from "@testing-library/react";
22
import { MemoryRouter } from "react-router";
33

4-
import { RestService } from "../../api";
5-
import Home from "../Home";
4+
import { RestService } from "@/js/api";
5+
import Home from "@/js/pages/Home";
66

7-
jest.mock("../../api", () => ({
7+
jest.mock("@/js/api", () => ({
88
RestService: {
99
restRestCheckRetrieve: jest.fn(),
1010
},

frontend/js/routes/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { createBrowserRouter } from "react-router";
22

3-
import { usersLoader } from "../loaders";
4-
import Home from "../pages/Home";
5-
import Users from "../pages/Users";
3+
import { usersLoader } from "@/js/loaders";
4+
import Home from "@/js/pages/Home";
5+
import Users from "@/js/pages/Users";
66

77
const router = createBrowserRouter([
88
{ index: true, Component: Home },

frontend/js/types/assets.d.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// CSS
2+
declare module "*.css";
3+
// Images and Fonts
4+
declare module "*.png";
5+
declare module "*.jpg";
6+
declare module "*.jpeg";
7+
declare module "*.gif";
8+
declare module "*.webp";
9+
declare module "*.svg";
10+
declare module "*.woff";
11+
declare module "*.woff2";
12+
declare module "*.ttf";
13+
declare module "*.eot";

jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
module.exports = {
44
moduleNameMapper: {
55
"^.+\\.(css|scss|png|svg|jpg|jpeg|gif|webp)$": "jest-transform-stub",
6+
"^@/(.*)$": "<rootDir>/frontend/$1",
67
},
78
transformIgnorePatterns: ["node_modules/*"],
89
modulePaths: ["frontend", "frontend/js", "frontend/js/app"],

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"target": "ES2021",
66

77
"allowJs": true,
8-
"baseUrl": "./",
8+
"baseUrl": ".",
99
"esModuleInterop": true,
1010
"jsx": "react-jsx",
1111
"moduleResolution": "bundler",
1212
"noEmit": true,
13-
"paths": { "*": ["./frontend/*", "./frontend/js/*"] },
13+
"paths": { "@/*": ["frontend/*"] },
1414
"skipLibCheck": true,
1515
"strict": true,
1616
"types": ["node", "jest", "@testing-library/jest-dom"]

webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ module.exports = (env, argv) => {
7676
].filter(Boolean),
7777
resolve: {
7878
modules: [nodeModulesDir, path.resolve(__dirname, "frontend/js/")],
79+
alias: { "@": path.resolve(__dirname, "frontend") },
7980
extensions: [".js", ".jsx", ".ts", ".tsx"],
8081
},
8182
optimization: {

0 commit comments

Comments
 (0)