Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resolve currentPath #4591

Merged
merged 4 commits into from Aug 11, 2022
Merged

resolve currentPath #4591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcb720a
resolve currentPath
Jul 28, 2022
4ab4a86
Try modified test
lukastaegert Aug 11, 2022
42c3697
Add test
lukastaegert Aug 11, 2022
b6281b5
Merge branch 'master' into fix-preserveModulesRoot-in-windows
lukastaegert Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Chunk.ts
View file
Open in desktop
Expand Up @@ -464,7 +464,7 @@ export default class Chunk {
});
const currentPath = `${currentDir}/${fileName}`;
const { preserveModulesRoot } = options;
if (preserveModulesRoot && currentPath.startsWith(preserveModulesRoot)) {
if (preserveModulesRoot && resolve(currentPath).startsWith(preserveModulesRoot)) {
path = currentPath.slice(preserveModulesRoot.length).replace(/^[\\/]/, '');
} else {
path = relative(preserveModulesRelativeDir, currentPath);
Expand Down
8 changes: 8 additions & 0 deletions test/chunking-form/samples/preserve-modules-root/_config.js
View file
Open in desktop
Expand Up @@ -7,6 +7,14 @@ module.exports = {
options: {
input: ['src/under-build.js', 'src/below/module.js'],
plugins: [
{
name: 'convert-slashes',
// This simulates converted slashes as used by e.g. Vite
async resolveId(source, importer, options) {
const resolved = await this.resolve(source, importer, { ...options, skipSelf: true });
return { ...resolved, id: resolved.id.replace(/\\/g, '/') };
}
},
resolve({
moduleDirectories: ['custom_modules']
}),
Expand Down