fix: set baseUrl if none is provided #386
Conversation
|
I found that the reproduction of #330 has |
|
That's a good point actually, it seems that the problem from the original description is different to the other issues posted in that thread. This PR adds support for leaving out the |
|
Ok, I added a failing test which seems to accurately show the error. I'll take a look in the next couple of days unless someone else wants to PR to my branch. |
lachieh
force-pushed
the
fix/add-tsconfig-baseurl-default
branch
4 times, most recently
from
6603be6
to
bf398a0
Compare
lachieh
force-pushed
the
fix/add-tsconfig-baseurl-default
branch
from
bf398a0
to
3938ac6
Compare
| { | ||
| // https://github.com/qmhc/vite-plugin-dts/issues/330 | ||
| description: 'wildcard alias at root level with relative import', | ||
| filePath: './src/components/Sample/index.ts', | ||
| content: 'import { Sample } from "./Sample";', | ||
| output: "import { Sample } from './Sample';\n" | ||
| }, |
There was a problem hiding this comment.
This is the added test case that was failing initially. The path was incorrectly being adjusted to ../../Sample because the path replacement pattern /^(.+)/ generated by the '*' path alias was too eagerly matching the relative path and making it absolute.
| expect(transformCode(options('import { TestBase } from "./test";')).content).toEqual( | ||
| "import { TestBase } from './test';\n" | ||
| ) |
There was a problem hiding this comment.
Git is a little confused here because of the added tests, but this is the diff for the changed test:
- expect(transformCode(options('import { TestBase } from "./test";')).content).toEqual(
- "import { TestBase } from './utils/test';\n"
- )
+ expect(transformCode(options('import { TestBase } from "./test";')).content).toEqual(
+ "import { TestBase } from './test';\n"
+ )Essentially, relative paths should stay relative and I had previously made this test incorrect.
| expect(transformCode(options('import { TestBase } from "test";')).content).toEqual( | ||
| "import { TestBase } from './utils/test';\n" | ||
| ) | ||
|
|
||
| expect(transformCode(options('import { TestBase } from "test.path";')).content).toEqual( | ||
| "import { TestBase } from './utils/test.path';\n" | ||
| ) | ||
|
|
||
| expect(transformCode(options('import { TestBase } from "./test.path";')).content).toEqual( | ||
| "import { TestBase } from './test.path';\n" | ||
| ) |
There was a problem hiding this comment.
These are the new tests cases to cover the correct behavior.
| it('test: getTsLibFolder', () => { | ||
| const root = normalizePath(resolve(__dirname, '..')) | ||
| const entryRoot = resolve(root, 'src') | ||
|
|
||
| expect(getTsLibFolder({ root, entryRoot })).toMatch(/node_modules\/typescript$/) | ||
| expect(getTsLibFolder()).toMatch(/node_modules\/typescript$/) | ||
|
|
||
| expect(existsSync(getTsLibFolder({ root, entryRoot }) || '')).toBe(true) | ||
| expect(existsSync(getTsLibFolder() || '')).toBe(true) | ||
| }) |
There was a problem hiding this comment.
Not related to the main change, but tsc was complaining because getTsLibFolder no longer accepts parameters as of 0621332
| @@ -421,7 +421,7 @@ export function parseTsAliases(basePath: string, paths: ts.MapLike<string[]>) { | |||
|
|
|||
| for (const [pathWithAsterisk, replacements] of Object.entries(paths)) { | |||
| const find = new RegExp( | |||
| `^${pathWithAsterisk.replace(regexpSymbolRE, '\\$1').replace(asteriskRE, '(?!\\.\\/)([^*]+)')}$` | |||
| `^${pathWithAsterisk.replace(regexpSymbolRE, '\\$1').replace(asteriskRE, '(?!\\.{1,2}\\/)([^*]+)')}$` | |||
There was a problem hiding this comment.
Previous pattern (.+) was matching everything when the * pattern was used as a path alias. This matches everything except relative paths (cwd and parent).
|
Thanks for the approval! Are you able to merge and release? |
If
pathsis set in TS compilerOptions, then as of TS4.1, the TS compiler will ensure that thebaseUrlis set to the current working directory.pathswithoutbaseUrl)This PR aligns the plugin to the compiler behavior.
Related to #330