Skip to content

Commit

Permalink
fix(bundler): javascript bundler not creating all module directories (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
sichangi authored and asudoh committed Dec 4, 2019
1 parent 3d72825 commit d93a23e
Showing 1 changed file with 16 additions and 24 deletions.
40 changes: 16 additions & 24 deletions packages/bundler/src/bundlers/javascript.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ async function bundle(entrypoint, options) {

await Promise.all(outputFolders.map(({ directory }) => fs.remove(directory)));

const jsEntrypoint = path.join(
outputFolders.find(folder => folder.format === 'esm').directory,
'index.js'
);
const jsEntryPoints = outputFolders.map(({ directory, format }) => ({
file: path.join(directory, 'index.js'),
format,
}));

const packageJsonPath = path.join(packageFolder, 'package.json');
const packageJson = await fs.readJson(packageJsonPath);
const { dependencies = {} } = packageJson;
Expand Down Expand Up @@ -76,30 +77,21 @@ async function bundle(entrypoint, options) {
}),
],
});
await bundle.write({
format: 'esm',
file: jsEntrypoint,
});

await Promise.all(
outputFolders
.filter(folder => folder.type !== 'esm')
.map(({ format, directory }) => {
const outputOptions = {
format,
file: jsEntrypoint.replace(/\/es\//, `/${path.basename(directory)}/`),
};
jsEntryPoints.map(({ format, file }) => {
const outputOptions = { format, file };

if (format === 'umd') {
outputOptions.name = name;
outputOptions.globals = {
...formatDependenciesIntoGlobals(dependencies),
...globals,
};
}
if (format === 'umd') {
outputOptions.name = name;
outputOptions.globals = {
...formatDependenciesIntoGlobals(dependencies),
...globals,
};
}

return bundle.write(outputOptions);
})
return bundle.write(outputOptions);
})
);
}

Expand Down

0 comments on commit d93a23e

Please sign in to comment.