@polylith/builder 0.0.31 → 0.0.32

package/App.js

@@ -11,6 +11,7 @@ import loader from './plugin-loader.js';
 import mainHTML from './plugin-main-html.js';
 import features from './plugin-features.js';
 import styles from "rollup-plugin-styles";
+import resources from "./plugin-copy-resources.js";
 
 import ConfigFeature from './ConfigFeature.js';
 import Files from './Files.js';
@@ -52,7 +53,7 @@ export default class App {
 		this.root = root;
 
 		var filename = path.posix.join(root, index);
-		this.sourcePath = path.posix.join(root, path.posix.dirname(filename));
+		this.sourcePath = path.posix.dirname(filename);
 		this.destPath = path.posix.join(root, dest);
 
 		this.name = name;
@@ -65,7 +66,7 @@ export default class App {
 		this.configs = {};
 		this.manualChunkType = 'function';
 		this.manualChunks = [];
-		this.files = new Files(sourcePath, destPath)
+		this.files = new Files(this.sourcePath, this.destPath)
 	}
 
 	static fileToPath(filename) {
@@ -373,7 +374,8 @@ export default class App {
 						source: this.htmlTemplate.source,
 						destination: this.htmlTemplate.destination,
 						replaceVars: {},
-					})
+					}),
+					resources(this.name, this.files)
 				],
 			},
 			output : {

package/ConfigApp.js

@@ -1,4 +1,4 @@
-import App from './App';
+import App from './App.js';
 import path from 'node:path/posix';
 
 export default class ConfigApp extends App {

package/Files.js

@@ -1,6 +1,8 @@
 import fg from 'fast-glob';
 import path from 'node:path/posix'
 import {ensureDir} from 'fs-extra';
+import { copyFile } from 'node:fs/promises';
+import App from './App.js';
 
 /**
  * @typedef {Object} CopySpec
@@ -35,7 +37,7 @@ export default class Files {
 	 * @param {String} src the abolute path to the applications source
 	 *  directory
 	 */
-	constructor(dest, src) {
+	constructor(src, dest) {
 		this.dest = dest;
 		this.src = src;
 		this.files = {};
@@ -73,9 +75,10 @@ export default class Files {
 		// Since file paths here are absolute tthis will always be based on the
 		// string length.
 		files.forEach(function(file) {
+			file = App.fixPath(file);
 			// reconcile conflicts
 			if (this.files[file]) {
-				copyInfo = this.files[file];
+				var copyInfo = this.files[file];
 				if (copyInfo.searchRoot.length > searchRoot.length) return;
 			}
 
@@ -107,7 +110,7 @@ export default class Files {
 				unique: true,
 				dot: true,
 			}
-			let fullGlob = path.join(searchPath, spec.glob);
+			let fullGlob = path.join(searchRoot, spec.glob);
 			let files = await fg(fullGlob, options);
 
 			this.addFiles(searchRoot, files, spec);
@@ -123,13 +126,15 @@ export default class Files {
 	async copyFiles() {
 		await this.findAllFiles();
 
-		var filenames = Object.keys(this.files);
 
+		var filenames = Object.keys(this.files);
 		// using a for loop because we are making async calls
 		for (let idx = 0 ; idx < filenames.length; idx++) {
 			let srcFilename = filenames[idx];
 			let spec = this.files[srcFilename].spec;
-			let relativePath = this.srcFilename.slice(this.files[srcFilename].searchRoot.length);
+			let searchRoot = this.files[srcFilename].searchRoot;
+			let fullPath = searchRoot;
+			let relativePath = srcFilename.slice(fullPath.length + 1);
 			let destFilename = '';
 
 			if (spec.keepNest) {
@@ -138,14 +143,13 @@ export default class Files {
 				destFilename = path.join(this.dest, spec.dest, path.basename(srcFilename));
 			}
 
+			var destFilePath = path.dirname(destFilename);
 			// we will override existing destination files. This could have
 			// unintended consequences
 			try {
 				console.log(`copying ${srcFilename} to ${destFilename}`);
-				/*
-					await ensureDir(path.dirname(destinationFilePath));
-					await fs.copyFiles(srcFilename, destFilename);
-				*/
+					await ensureDir(destFilePath);
+					await copyFile(srcFilename, destFilename);
 			} catch (e) {
 				console.error(`Error copying file ${srcFilename} to ${destFilename}`);
 				throw e;

package/package.json

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

package/plugin-copy-resources.js

@@ -1,18 +1,23 @@
+var copied= {}
+
 /**
  *
  * @param {Files} files the files object that specifies the resource files to
  *  copy
  * @returns {Object} the plugin
  */
-export default function(files) {
+export default function(name, files) {
 	return {
-		name: "main-html-template",
+		name: "main-html-resources",
 
 		async generateBundle(outputOptions, bundleInfo) {
+			// assets are not watched, never copy more than once
+			if (copied[name]) return;
 			return new Promise(async function (resolve, reject) {
 				try {
 					await files.copyFiles();
 					resolve(true)
+					copied[name] = true;
 				} catch (e) {
 					reject(e)
 				}