@polylith/builder 0.0.21 → 0.0.23

package/App.js

@@ -1,4 +1,5 @@
 import path from 'path';
+import fs from 'fs-extra';
 
 import * as rollup from 'rollup';
 import { babel } from '@rollup/plugin-babel';
@@ -9,8 +10,10 @@ import html from "rollup-plugin-html";
 import loader from './plugin-loader.js';
 import mainHTML from './plugin-main-html.js';
 import features from './plugin-features.js';
+import config from './plugin-config.js';
 import styles from "rollup-plugin-styles";
 
+
 /**
  * call this method to get the path from the a filename, and force the file path 
  * to use posix notation and remove all drive information. This will likely
@@ -55,6 +58,8 @@ export class App {
 
 		this.name = name;
 		this.index = index;
+		this.fullIndexPath = path.posix.join(root, index);
+
 		this.loadables = [];
 		this.featureIndexes = [];
 	}
@@ -72,8 +77,8 @@ export class App {
 	 */
 	rootPath(path) {
 		var idx = path.indexOf(this.sourcePath);
-		if (idx === 0) path.splice(0, length(this.sourcePath));
-		if (path[0] === '/') path.splice(0, 1);
+		if (idx === 0) path = path.slice(this.sourcePath.length);
+		if (path[0] === '/') path = path.slice(1);
 
 		return './' + path;
 	}
@@ -105,7 +110,7 @@ export class App {
 			}
 		}
 
-		if (indexExists) this.featureIndexes.push(this.rootPath(indexPath));
+		if (indexExists) this.featureIndexes.push(indexPath);
 	}
 
 	async buildFeatures() {
@@ -131,7 +136,7 @@ export class App {
 	}
 	
 	buildConfiguration() {
-		var input = [this.index];
+		var input = [this.fullIndexPath];
 		this.loadables.forEach(function(path) {
 			input.push(path.path);
 		});
@@ -154,6 +159,7 @@ export class App {
 					}),
 					loader(this.loadables),
 					features(this.featureIndexes),
+					config(),					
 					html({
 						include: path.join(this.sourcePath, "**/*.html"), 
 					}),
@@ -183,6 +189,8 @@ 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/package.json

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

package/plugin-config.js

@@ -5,18 +5,24 @@ import rollupPluginutils from ('rollup-pluginutils');
 export default function config() {
 	var opts = {};
 
-	opts.include = '**/*.cfg'
+	opts.include = '**/*.pl-cfg'
 
 	var filter = rollupPluginutils.createFilter(opts.include, opts.exclude);
 
 	return {
 		name: 'config', 
 
+		resolveId (source, _, third) {
+			if (filter(source)) return source
+
+			return null;
+		},
+
 		async load(id) {
 			if (filter(id)) {
 				console.log(id);
-				return source;
-            }
+				return '';
+			}
 		}
 	};
 }

package/plugin-features.js

@@ -2,12 +2,11 @@ function makeSource(features) {
 
     var importStatements = '';
 	features.forEach(function(feature) {
-        importStatements += `import from '${feature}'\n`;
+        importStatements += `import '${feature}'\n`;
     })
 
 	var source = `${importStatements}`
 
-	console.log(source);
 	return source;
 }