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

Update addBundleLoader to accept multiple targets #1085

Merged
merged 1 commit into from
Apr 8, 2018
Merged

Update addBundleLoader to accept multiple targets #1085

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
39 changes: 28 additions & 11 deletions src/Bundler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,18 @@ class Bundler extends EventEmitter {
this.delegate = options.delegate || {};
this.bundleLoaders = {};

const loadersPath = `./builtins/loaders/${
options.target === 'node' ? 'node' : 'browser'
}/`;

this.addBundleLoader('wasm', require.resolve(loadersPath + 'wasm-loader'));
this.addBundleLoader('css', require.resolve(loadersPath + 'css-loader'));
this.addBundleLoader('js', require.resolve(loadersPath + 'js-loader'));
this.addBundleLoader('wasm', {
browser: require.resolve('./builtins/loaders/browser/wasm-loader'),
node: require.resolve('./builtins/loaders/node/wasm-loader')
});
this.addBundleLoader('css', {
browser: require.resolve('./builtins/loaders/browser/css-loader'),
node: require.resolve('./builtins/loaders/node/css-loader')
});
this.addBundleLoader('js', {
browser: require.resolve('./builtins/loaders/browser/js-loader'),
node: require.resolve('./builtins/loaders/node/js-loader')
});

this.pending = false;
this.loadedAssets = new Map();
Expand Down Expand Up @@ -122,16 +127,28 @@ class Bundler extends EventEmitter {
this.packagers.add(type, packager);
}

addBundleLoader(type, path) {
if (typeof path !== 'string') {
throw new Error('Bundle loader should be a module path.');
addBundleLoader(type, paths) {
if (typeof paths === 'string') {
paths = {node: paths, browser: paths};
} else if (typeof paths !== 'object') {
throw new Error('Bundle loaders should be an object.');
}

for (const target in paths) {
if (target !== 'node' && target !== 'browser') {
throw new Error(`Unknown bundle loader target "${target}".`);
}

if (typeof paths[target] !== 'string') {
throw new Error('Bundle loader should be a string.');
}
}

if (this.farm) {
throw new Error('Bundle loaders must be added before bundling.');
}

this.bundleLoaders[type] = path;
this.bundleLoaders[type] = paths;
}

async loadPlugins() {
Expand Down
3 changes: 2 additions & 1 deletion src/packagers/JSPackager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ class JSPackager extends Packager {
for (let bundleType of this.bundleLoaders) {
let loader = this.options.bundleLoaders[bundleType];
if (loader) {
let asset = await this.bundler.getAsset(loader);
let target = this.options.target === 'node' ? 'node' : 'browser';
let asset = await this.bundler.getAsset(loader[target]);
await this.addAssetToBundle(asset);
loads +=
'b.register(' +
Expand Down