Skip to content

feat(npm-scripts): add support for multiple entry points #1054

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

Merged
merged 1 commit into from
Dec 23, 2022
Merged

feat(npm-scripts): add support for multiple entry points #1054

Show file tree
Hide file tree
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
54 changes: 32 additions & 22 deletions projects/npm-tools/packages/npm-scripts/src/utils/createEsm2AmdIndexBridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const getBndWebContextPath = require('./getBndWebContextPath');
function createEsm2AmdIndexBridge(projectDir, buildConfig, manifest) {
const pkgJson = require(path.join(projectDir, 'package.json'));

const {output} = buildConfig;
const {main, output} = buildConfig;

const webContextPath = getBndWebContextPath(projectDir);

Expand All @@ -34,32 +34,42 @@ function createEsm2AmdIndexBridge(projectDir, buildConfig, manifest) {
// level appears under `/o/js/resolved-module/...`.
//

const rootDir = pkgJson.name.startsWith('@') ? '../../../..' : '../../..';
for (const fileName of main) {
const baseName = path.parse(fileName).name;

const bridgeSource = `
import * as esModule from "${rootDir}${webContextPath}/__liferay__/index.js";
const rootDir = pkgJson.name.startsWith('@')
? '../../../..'
: '../../..';

Liferay.Loader.define(
"${pkgJson.name}@${pkgJson.version}/index",
['module'],
function (module) {
module.exports = esModule;
}
);
`;
const bridgeSource = `
import * as esModule from "${rootDir}${webContextPath}/__liferay__/${baseName}.js";

Liferay.Loader.define(
"${pkgJson.name}@${pkgJson.version}/${baseName}",
['module'],
function (module) {
module.exports = esModule;
}
);
`;

fs.writeFileSync(path.resolve(output, 'index.js'), bridgeSource, 'utf8');
fs.writeFileSync(
path.resolve(output, baseName + '.js'),
bridgeSource,
'utf8'
);

manifest.packages = manifest.packages ?? {};
manifest.packages['/'] = manifest.packages['/'] ?? {};
manifest.packages['/'].modules = manifest.packages['/'].modules ?? {};
manifest.packages = manifest.packages ?? {};
manifest.packages['/'] = manifest.packages['/'] ?? {};
manifest.packages['/'].modules = manifest.packages['/'].modules ?? {};

manifest.packages['/'].modules['index.js'] = {
flags: {
esModule: true,
useESM: true,
},
};
manifest.packages['/'].modules['index.js'] = {
flags: {
esModule: true,
useESM: true,
},
};
}
}

module.exports = createEsm2AmdIndexBridge;
4 changes: 4 additions & 0 deletions projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ function normalizeNpmscriptsConfig(mergedConfig) {
if (mergedConfig.build.exports === undefined) {
mergedConfig.build.exports = [];
}

if (!Array.isArray(mergedConfig.build.main)) {
mergedConfig.build.main = [mergedConfig.build.main];
}
}

if (Array.isArray(mergedConfig.build?.exports)) {
Expand Down
17 changes: 12 additions & 5 deletions projects/npm-tools/packages/npm-scripts/src/utils/runWebpackAsBundler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,24 @@ function getIndexWebpackConfig(projectDir, buildConfig, babelConfig) {
return;
}

const mainFilePath = path.resolve(projectDir, buildConfig.main);
const mainFilePaths = buildConfig.main.map((main) =>
path.resolve(projectDir, main)
);

const {imports} = buildConfig;
const externals = convertImportsToExternals(imports, 2);

const webpackConfig = {
entry: {
[`__liferay__/index`]: {
const entry = mainFilePaths.reduce((acc, mainFilePath) => {
return {
...acc,
[`__liferay__/${path.parse(mainFilePath).name}`]: {
import: mainFilePath,
},
},
};
}, {});

const webpackConfig = {
entry,
experiments: {
outputModule: true,
},
Expand Down