From 8e87418d3b2d1390ef8d48f4a48ddad0db8a5bee Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 19 Apr 2025 23:24:17 -0400 Subject: [PATCH] reconfigure pathing --- frontend/apps/editor3d/jest.config.js | 2 +- frontend/apps/editor3d/src/index.html | 2 +- frontend/apps/editor3d/src/login.html | 2 +- frontend/apps/editor3d/src/signup.html | 2 +- frontend/apps/editor3d/tailwind.config.ts | 6 +++--- frontend/apps/editor3d/tsconfig.json | 5 +---- frontend/apps/editor3d/vite.config.ts | 9 ++++----- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/frontend/apps/editor3d/jest.config.js b/frontend/apps/editor3d/jest.config.js index 7ad00de0b0..30aa982949 100644 --- a/frontend/apps/editor3d/jest.config.js +++ b/frontend/apps/editor3d/jest.config.js @@ -3,7 +3,7 @@ export default { preset: "ts-jest", testEnvironment: "node", moduleNameMapper: { - "^~(.*)$": "/app/$1", + "^~(.*)$": "/src/app/$1", }, automock: false, }; diff --git a/frontend/apps/editor3d/src/index.html b/frontend/apps/editor3d/src/index.html index 81c86cd95e..2fb91719ff 100644 --- a/frontend/apps/editor3d/src/index.html +++ b/frontend/apps/editor3d/src/index.html @@ -2,7 +2,7 @@ - MyApp + ArtCraft 3D diff --git a/frontend/apps/editor3d/src/login.html b/frontend/apps/editor3d/src/login.html index dea0fea239..a8ff5a4506 100644 --- a/frontend/apps/editor3d/src/login.html +++ b/frontend/apps/editor3d/src/login.html @@ -2,7 +2,7 @@ - Login + Login | ArtCraft 3D diff --git a/frontend/apps/editor3d/src/signup.html b/frontend/apps/editor3d/src/signup.html index b668ef3a6c..f788105cc6 100644 --- a/frontend/apps/editor3d/src/signup.html +++ b/frontend/apps/editor3d/src/signup.html @@ -2,7 +2,7 @@ - Signup + Signup | ArtCraft 3D diff --git a/frontend/apps/editor3d/tailwind.config.ts b/frontend/apps/editor3d/tailwind.config.ts index 3f10a00486..baa8faa919 100644 --- a/frontend/apps/editor3d/tailwind.config.ts +++ b/frontend/apps/editor3d/tailwind.config.ts @@ -3,9 +3,9 @@ import colors from "tailwindcss/colors"; export default { content: [ - "./index.html", - "./app/**/*.{js,jsx,ts,tsx}", - "./app/*.{js,jsx,ts,tsx}", + "./src/index.html", + "./src/app/**/*.{js,jsx,ts,tsx}", + "./src/app/*.{js,jsx,ts,tsx}", ], theme: { extend: { diff --git a/frontend/apps/editor3d/tsconfig.json b/frontend/apps/editor3d/tsconfig.json index df44f96589..41d726a635 100644 --- a/frontend/apps/editor3d/tsconfig.json +++ b/frontend/apps/editor3d/tsconfig.json @@ -15,15 +15,12 @@ "skipLibCheck": true, "forceConsistentCasingInFileNames": true, "paths": { - "~/*": ["apps/editor3d/app/*"] + "~/*": ["apps/editor3d/src/app/*"] }, // Vite takes care of building everything, not tsc. "noEmit": true }, "references": [ - { - "path": "../../libs/login" - }, { "path": "../../libs/components/toaster" } diff --git a/frontend/apps/editor3d/vite.config.ts b/frontend/apps/editor3d/vite.config.ts index e3fe396f3f..17b36d2b07 100644 --- a/frontend/apps/editor3d/vite.config.ts +++ b/frontend/apps/editor3d/vite.config.ts @@ -6,7 +6,7 @@ import path from 'path' import { dirname, resolve } from 'node:path' export default defineConfig({ - root: __dirname, + root: path.resolve(__dirname, 'src'), //build: { //}, //resolve: { @@ -37,10 +37,9 @@ export default defineConfig({ build: { rollupOptions: { input: { - index: resolve(__dirname, 'index.html'), - login: resolve(__dirname, 'login.html'), - signup: resolve(__dirname, 'signup.html'), - //nested: resolve(__dirname, 'nested/index.html'), + index: resolve(__dirname, 'src/index.html'), + login: resolve(__dirname, 'src/login.html'), + signup: resolve(__dirname, 'src/signup.html'), }, }, },