recombined Bundle implementations, avoiding inheritance hierarchy

no longer necessary without virtual bundles (cf. previous commit;
separation was originally introduced in
d6c7653)

this also removes duplicated defaults

Author: moonglum

lib/bundle/basic.js

@@ -1,16 +1,18 @@
 "use strict";
 
-let BasicBundle = require("./basic");
+let generateBundle = require("./bundler");
+let generateConfig = require("./config");
+let { generateError } = require("../util");
 
-module.exports = class Bundle extends BasicBundle {
+module.exports = class Bundle {
 	constructor(entryPoint, target, config, { browsers }) {
 		// extract bundle-specific fingerprinting, if any
 		config = Object.assign({}, config);
 		if(config.fingerprint !== undefined) {
 			var fingerprint = config.fingerprint; // eslint-disable-line no-var
 			delete config.fingerprint;
 		}
-		super(config, { browsers });
+		this._config = generateConfig(config, { browsers });
 
 		this.entryPoint = entryPoint;
 		this.target = target;
@@ -31,6 +33,15 @@ module.exports = class Bundle extends BasicBundle {
 			return false;
 		}
 
-		return super.compile(this.entryPoint);
+		return generateBundle(this.entryPoint, this._config, this._cache).
+			then(({ code, modules, cache }) => {
+				this._modules = modules;
+				this._cache = cache;
+				return { code };
+			}, err => ({
+				// also report error from within bundle, to avoid it being overlooked
+				code: generateError(err),
+				error: err
+			}));
 	}
 };