Skip to content

Normalize query-suffixed module ids in unplugin-macros #22

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

Open
schiller-manuel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Normalize query-suffixed module ids in unplugin-macros #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions unplugin-macros.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,48 @@ let assetsByFile = new Map();
let packageManager = new NodePackageManager(process.cwd());
let watch = new Map();

function normalizeFilePath(id) {
return id.replace(/\?.*$/, '');
}

module.exports = createUnplugin(() => {
return {
name: 'unplugin-macros',
enforce: 'pre',
transformInclude(id) {
return /\.(js|jsx|ts|tsx)$/.test(id) && !id.includes('/node_modules/');
let normalizedFilePath = normalizeFilePath(id);
return /\.(js|jsx|ts|tsx)$/.test(normalizedFilePath) && !normalizedFilePath.includes('/node_modules/');
},
async transform(code, filePath) {
let normalizedFilePath = normalizeFilePath(filePath);

if (!/with[\s\n]*\{\s*type:[\s\n]*['"]macro['"][\s\n]*\}/.test(code)) {
return;
}

// Remove old assets.
let currentAssets = assetsByFile.get(filePath);
let currentAssets = assetsByFile.get(normalizedFilePath);
if (currentAssets) {
for (let asset of currentAssets) {
assets.delete(asset);
}
}
currentAssets = [];
assetsByFile.set(filePath, currentAssets);
assetsByFile.set(normalizedFilePath, currentAssets);

let imports = [];
await initSourceMap;
let res = await transform(types[path.extname(filePath)], filePath, code, async (_err, src, exportName, args, loc) => {
let res = await transform(types[path.extname(normalizedFilePath)], normalizedFilePath, code, async (_err, src, exportName, args, loc) => {
let mod;
try {
mod = await packageManager.require(src, filePath);
mod = await packageManager.require(src, normalizedFilePath);
if (!Object.hasOwnProperty.call(mod, exportName)) {
throw new Error(`"${src}" does not export "${exportName}".`);
}
let invalidations = packageManager.getInvalidations(src, filePath);
let invalidations = packageManager.getInvalidations(src, normalizedFilePath);
for (let dep of invalidations.invalidateOnFileChange) {
this.addWatchFile(dep);
watch.set(dep, [src, filePath]);
watch.set(dep, [src, normalizedFilePath]);
}
} catch (err) {
throw {
Expand Down Expand Up @@ -92,7 +99,7 @@ module.exports = createUnplugin(() => {
line,
column: 0,
},
source: filePath,
source: normalizedFilePath,
original: {
line: loc.line,
column: loc.col,
Expand All @@ -103,7 +110,7 @@ module.exports = createUnplugin(() => {
}

map.addIndexedMappings(mappings);
map.setSourceContent(filePath, code);
map.setSourceContent(normalizedFilePath, code);
asset.content += `\n/*# sourceMappingURL=${await map.stringify({format: 'inline'})} */`;
}

Expand Down