@polylith/builder 0.0.34 → 0.0.37

package/App.js

@@ -6,6 +6,7 @@ import { babel } from '@rollup/plugin-babel';
 import * as resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import html from 'rollup-plugin-html';
+import livereload from 'rollup-plugin-livereload';
 
 import loader from './plugin-loader.js';
 import mainHTML from './plugin-main-html.js';
@@ -69,6 +70,7 @@ export default class App {
 		this.manualChunks = [];
 		this.files = new Files(this.sourcePath, this.destPath);
 		this.cssFiles = [];
+		this.liveReload = true;
 	}
 
 	static fileToPath(filename) {
@@ -107,6 +109,9 @@ export default class App {
 		return './' + path;
 	}
 
+	setLiveReload(on) {
+		this.liveReload = on;
+	}
 	setHtmlTemplate(source, destination) {
 		this.htmlTemplate = {source: source, destination: destination};
 	}
@@ -160,7 +165,7 @@ export default class App {
 	 * If present that json will be loaded and used to build the feature.
 	 *
 	 * If that is not found it will look for an index.js file. and if found it
-	 * will add that to the list on feature index files which will be
+	 * will add that to the list of feature index files which will be
 	 * automatically imported when the built code imports the @polylith/features
 	 * module
 	 *
@@ -399,34 +404,41 @@ export default class App {
 
 		var manualChunks = this.getManualChunks();
 		var mainCss = this.buildMainCss();
+		var plugins = [
+			resolve.nodeResolve({
+				extensions: ['.js', '.jsx']
+			}),
+			commonjs(),
+			babel({
+				presets: ['@babel/preset-react'],
+				babelHelpers: 'bundled',
+			}),
+			loader(this.loadables),
+			features(this.featureIndexes),
+			jsconfig(this.root),
+			html({
+				include: path.join(this.sourcePath, "**/*.html"),
+			}),
+			styles(),
+			mainHTML({
+				root: this.root,
+				source: this.htmlTemplate.source,
+				destination: this.htmlTemplate.destination,
+				replaceVars: {mainCss: mainCss},
+			}),
+			resources(this.name, this.files)
+		];
+
+		if (this.liveReload) {
+			plugins.push(
+				livereload(this.destPath)
+			)
+		}
 
 		var config = {
 			input : {
 				input: input,
-				plugins: [
-					resolve.nodeResolve({
-						extensions: ['.js', '.jsx']
-					}),
-					commonjs(),
-					babel({
-						presets: ['@babel/preset-react'],
-						babelHelpers: 'bundled',
-					}),
-					loader(this.loadables),
-					features(this.featureIndexes),
-					jsconfig(this.root),
-					html({
-						include: path.join(this.sourcePath, "**/*.html"),
-					}),
-					styles(),
-					mainHTML({
-						root: this.root,
-						source: this.htmlTemplate.source,
-						destination: this.htmlTemplate.destination,
-						replaceVars: {mainCss: mainCss},
-					}),
-					resources(this.name, this.files)
-				],
+				plugins: plugins,
 			},
 			output : {
 				output : {
@@ -493,14 +505,13 @@ export default class App {
 			}
 
 			if (event.code === 'BUNDLE_START') {
-				process.stdout.write("\u001b[2J\u001b[0;0H");
-				console.log(event);
+//				console.log(event);
 			}
 
 			if (event.code === 'BUNDLE_END') {
-				process.stdout.write("\u001b[2J\u001b[0;0H");
-				console.log(event);
+//				console.log(event);
 			}
 		}.bind(this));
 	}
+
 }

package/Files.js

@@ -142,12 +142,16 @@ export default class Files {
 	 *  stored in the object variable this.files
 	 */
 	async findAllFiles() {
+		if (this.filesFound) return this.files;
+
 		// using a for loop here because we are making async calls
 		for (let idx = 0; idx < this.specs.length; idx++) {
 			let spec = this.specs[idx];
 			await this.findFiles(spec);
 		}
 
+		this.filesFound = true;
+
 		return this.files;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polylith/builder",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "description": "The polylith builder",
   "main": "index.js",
   "type": "module",
@@ -23,6 +23,7 @@
     "rollup": "^2.58.0",
     "rollup-plugin-html": "^0.2.1",
     "rollup-plugin-jsx": "^1.0.3",
+    "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-styles": "^4.0.0",
     "sass": "^1.43.4"
   }

package/plugin-copy-resources.js

@@ -8,7 +8,16 @@ var copied= {}
  */
 export default function(name, files) {
 	return {
-		name: "main-html-resources",
+		name: "copy-resources",
+
+		async buildStart(){
+			var foundFiles = files.findAllFiles();
+			var filenames = Object.keys(foundFiles);
+			filenames.forEach(function(name) {
+				var destFilename = foundFiles[name].destFilename;
+				this.addWatchFile(destFilename);
+			});
+		},
 
 		async generateBundle(outputOptions, bundleInfo) {
 			// assets are not watched, never copy more than once

package/plugin-jsconfig.js

@@ -63,7 +63,6 @@ async function findPathMatch(base, source, paths) {
 	if (source.indexOf(base) === 0) return
 //		source = source.slice(base.length);
 
-	console.log('>>>', source)
 	for(let patternIdx = 0; patternIdx < patterns.length; patternIdx++) {
 		let pattern = patterns[patternIdx];
 		let searches = paths[pattern];
@@ -73,7 +72,6 @@ async function findPathMatch(base, source, paths) {
 		if (!Array.isArray(searches)) continue;
 		for (let searchIdx = 0; searchIdx < searches.length; searchIdx++) {
 			var tryName = path.join(base, searches[searchIdx].replace('*', capture));
-			console.log('\t..', searches[searchIdx], tryName);
 
 			if (await fileExists(tryName)) {
 				return tryName;
@@ -83,13 +81,12 @@ async function findPathMatch(base, source, paths) {
 }
 
 
-export default function features(root) {
+export default function jsconfig(root) {
 	var jsConfig;
 	var basePath;
 	var paths;
 	var previouslyMatched = {};
 
-	console.log('====root', root);
 	async function readJsConfig() {
 		var jsConfigPath = path.join(root, 'jsconfig.json');
 		var exists = await fileExists(jsConfigPath);
@@ -111,12 +108,11 @@ export default function features(root) {
 
 
 	return {
-		name: 'features',
+		name: 'jsconfig',
 
 		async resolveId (source, importer, options) {
 			source = fixPath(source);
 
-//			console.log('---', source);
 			if (previouslyMatched[source] !== undefined) return previouslyMatched[source];
 			previouslyMatched[source] === null;
 

package/plugin-loader.js

@@ -48,8 +48,6 @@ ${serviceStr}
 	var source = source.replace('{{SWITCHES}}', loadableSwitches);
 	var source = source.replace(/\t/g, '    ');
 
-	console.log(source);
-
 	return source;
 }
 
@@ -69,7 +67,6 @@ export default function loader(loadables) {
 			var root = path.dirname(fixPath(import.meta.url));
 			if (!templateSource) {
 				templateSource = await readFile(path.join(root, 'loaderTemplate.txt'), 'utf-8');
-				console.log(templateSource);
 			}
 
 			if (id === '@polylith/loader') {