@polylith/builder 0.0.24 → 0.0.25

package/App.js

@@ -12,7 +12,7 @@ import mainHTML from './plugin-main-html.js';
 import features from './plugin-features.js';
 import styles from "rollup-plugin-styles";
 
-import ConfigFeature from './ConfigFeature';
+import ConfigFeature from './ConfigFeature.js';
 
 /**
  * call this function to check if the given file exists
@@ -33,7 +33,7 @@ async function fileExists(path) {
 /**
  * The base class for applications. Applications inherit from this class
  */
-export class App {
+export default class App {
 	/**
 	 * Construct the app object.
 	 *
@@ -47,7 +47,7 @@ export class App {
 	 */
 
 	constructor(name, root, index , dest) {
-		root = this.fixPath(root);
+		root = App.fixPath(root);
 		this.root = root;
 
 		var filename = path.posix.join(root, index);
@@ -64,7 +64,7 @@ export class App {
 	}
 
 	static fileToPath(filename) {
-		filename = this.fixPath(filename);
+		filename = App.fixPath(filename);
 		return path.posix.dirname(filename);
 	}
 
@@ -146,9 +146,15 @@ export class App {
 
 		// second priority is a build configuration file.
 		} else if (jsonExists) {
-			let content = readFile(jsonPath);
-			let builder = new ConfigFeature(content, featurePath);
-			await feature.build
+			try {
+				let content = JSON.parse(await readFile(jsonPath));
+
+				let builder = new ConfigFeature(content, featurePath);
+				await builder.build(this)
+			} catch (e) {
+				console.error(e);
+				throw e;
+			}
 
 		// if neither exist, assume the index should be added
 		} else if (indexExists) this.featureIndexes.push(indexPath);
@@ -173,7 +179,7 @@ export class App {
 	addLoadable(name, main, prefix) {
 		var dest = path.posix.join(this.sourcePath, main);
 
-		console.log(dest)
+		console.log('addLoadable', {name, path: dest, prefix})
 		this.loadables.push({name, path: dest, prefix});
 	}
 
@@ -218,8 +224,28 @@ export class App {
 					sourcemap: true,
 					dir : this.destination,
 					format: 'es',
+					assetFileNames: function(chunkInfo) {
+						return '[name]-[hash][extname]';
+					},
+					entryFileNames: function(chunkInfo) {
+						var entry = App.fixPath(chunkInfo.facadeModuleId);
+						var found = this.loadables.find(function(loadable) {
+							return loadable.path === entry;
+						}, this);
+						var exists = Boolean(found);
+
+						if (exists) return (`${found.name}.js`);
+						if (entry === this.fullIndexPath) {
+							return `${this.name}.js`
+						}
+						return '[name].js';
+					}.bind(this),
+					manualChunks: function(id) {
+						if (id.includes('node_modules')) {
+							return 'vendor';
+						}
+					}
 				},
-				assetFileNames: "[name]-[hash][extname]",
 			}
 		};
 
@@ -230,8 +256,6 @@ export class App {
 		await this.buildFeatures();
 		var config = this.buildConfiguration();
 
-		console.log(JSON.stringify(config, null, '    '));
-
 		const bundle = await rollup.rollup(config.input);
 		await bundle.generate(config.output);
 		await bundle.write(config.output);

package/ConfigApp.js

@@ -1,4 +1,4 @@
-import {App} from './App';
+import App from './App';
 import path from 'node:path/posix';
 
 export default class ConfigApp extends App {
@@ -21,4 +21,4 @@ export default class ConfigApp extends App {
     async getFeatures() {
         return this.config.features || [];
     }
-}
+}

package/ConfigFeature.js

@@ -1,6 +1,6 @@
-import Feature from './Feature';
+import Feature from './Feature.js';
 
-export default class Feature {
+export default class ConfigFeature extends Feature {
     constructor (config, root) {
         super();
         this.config = config;
@@ -8,6 +8,8 @@ export default class Feature {
     }
 
     async build(app) {
+        var config = this.config;
+
         if (config.loadables && Array.isArray(config.loadables)) {
             config.loadables.forEach(function(loadable) {
                 if (loadable.name && loadable.main) {

package/Feature.js

@@ -1,8 +1,8 @@
-export class Feature {
+export default class Feature {
   constructor () {
   }
 
   async build(app) {
     this.app = app;
   }
-}
+}

package/index.js

@@ -1,4 +1,4 @@
-import {App} from './App.js'
-import {Feature} from './Feature.js';
+import App from './App.js'
+import Feature from './Feature.js';
 
-export {App as App, Feature as Feature};
+export {App as App, Feature as Feature};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polylith/builder",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "The polylith builder",
   "main": "index.js",
   "type": "module",

package/plugin-loader.js

@@ -15,14 +15,14 @@ function makeSource(loadables) {
 		}
 
 		var switchStr = `
-			case '${loadable.name}': 
+			case '${loadable.name}':
 				promise = import('${loadable.path}')${prefixStr}
 				break;
-` 
+`
 		loadableSwitches += switchStr;
 	})
 
-	var source = 
+	var source =
 `
 	import {registry} from '@polylith/core';
 
@@ -35,14 +35,12 @@ ${loadableSwitches}
 		return promise;
 	}
 `
-	console.log(source);
 	return source;
 }
 
-
 export default function loader(loadables) {
 	return {
-		name: 'loader', 
+		name: 'loader',
 
 		resolveId (source, _, third) {
 			if (source === '@polylith/loader') {
@@ -59,4 +57,3 @@ export default function loader(loadables) {
 		}
 	};
 }
-