Handle relative path from web app to project root in a single place #2508
Conversation
| function getWaspProjectDirAbsPathFromCwd(): string { | ||
| const webAppDirAbsPath = process.cwd() | ||
| return path.join(webAppDirAbsPath, '{= waspProjectDirFromWebAppDir =}') | ||
| function getWaspProjectDirAbsPathWhileInWebAppDir(): string { |
There was a problem hiding this comment.
I changed this function's nam to clearly communicate its assumptions.
| @@ -13,5 +14,6 @@ import { join as joinPaths } from 'path' | |||
| * to be relative to the `web-app` directory i.e. `../../../projectDirPath`. | |||
| */ | |||
| export function resolveProjectPath(path: string): string { | |||
| return joinPaths('../../../', path) | |||
| const waspProjectDirFromWebAppDir = '{= waspProjectDirFromWebAppDir =}' | |||
There was a problem hiding this comment.
I extraced a variable here to put a name on the string because, once the template is rendered, the resulting code loses the information provided by {= waspProjectDirFromWebAppDir =} and is left only with ../../../.
| const webAppDirAbsPath = process.cwd() | ||
| return path.join(webAppDirAbsPath, '{= waspProjectDirFromWebAppDir =}') | ||
| function getWaspProjectDirAbsPathWhileInWebAppDir(): string { | ||
| return path.resolve(resolveProjectPath('./')) |
There was a problem hiding this comment.
@infomiho Double check if it's ok that I import this function here.
I tested it out and it works.
There was a problem hiding this comment.
That helper has been used in the user's vite.config.ts because it was used from web-app. This serves the exact same purpose - it's a good use!
| ".env" | ||
| ], | ||
| "comment-filip": "We now have to watch ../../../src/ because we're importing client files directly", | ||
| "comment-filip": "We now have to watch {= relativeUserSrcDirPath =} because we're importing client files directly", | ||
| "ext": "ts,mts,js,mjs,json" |
There was a problem hiding this comment.
@Zeko369 mentioned that the server doesn't restart on TSX file changes, should we extend this list? Does it make sense for server to restart on TSX changes since we are not rendering anything on the server?
| @@ -37,7 +35,7 @@ function parsePathToUserCode( | |||
| importerPath: string | |||
| ): RelativePathToUserCode | null { | |||
| const importerPathRelativeToWaspProjectDir = path.relative( | |||
| waspProjectDirAbsPath, | |||
| getWaspProjectDirAbsPathWhileInWebAppDir(), | |||
| importerPath | |||
| ) | |||
| return importerPathRelativeToWaspProjectDir.startsWith('src/') | |||
There was a problem hiding this comment.
Do we maybe want to template the src dir? I seem to have forgotten to use the srcDirInWaspProjectDir variable.
There are still two places of duplication left:
ServerGenerator/JsImport.hsWebAppGenerator/JsImport.hsBut those two are too complicated to handle now (it would require rearraning many imports/modules) . I have bigger plans that will also take care of those two, so I'm leaving them alone for now.