@polylith/builder 0.1.18 → 0.1.20

package/App.js

@@ -10,9 +10,7 @@ import svgr from '@svgr/rollup'
 import html from 'rollup-plugin-html';
 import livereload from 'rollup-plugin-livereload';
 import styles from "rollup-plugin-styles";
-import builtins from 'rollup-plugin-node-builtins';
-import globals from 'rollup-plugin-node-globals';
-
+import nodePolyfills from 'rollup-plugin-polyfill-node';
 import loader from './plugin-loader.js';
 import mainHTML from './plugin-main-html.js';
 import features from './plugin-features.js';
@@ -46,7 +44,7 @@ export default class App {
 	 * 	folder from the root for rolled up files
 	 */
 	constructor(name, config) {
-		var {root, index, dest, spec, testDest} = config;
+		var {root, index, dest, spec, testDest=''} = config;
 
 		root = forceToPosix(root);
 		this.root = root;
@@ -61,7 +59,7 @@ export default class App {
 		this.index = index;
 		this.spec = spec;
 		this.fullIndexPath = path.posix.join(root, index);
-		this.fullSpecPath = path.posix.join(root, spec);
+		this.fullSpecPath = spec ? path.posix.join(root, spec) : undefined;
 
 		this.loadables = [];
 		this.features = [];
@@ -69,7 +67,7 @@ export default class App {
 		this.configs = [];
 		this.manualChunkType = 'function';
 		this.manualChunks = [];
-		this.files = new Files(this.sourcePath, this.destPath);
+		this.files = new Files(this.sourcePath, this.destPath, this.testPath);
 		this.cssSpecs = [];
 		this.cssFiles = [];
 		this.liveReload = true;
@@ -250,7 +248,7 @@ export default class App {
 	 * Call this method to find all the css files specified by the css specs
 	 */
 	async findMainCss() {
-		var files = new Files(this.sourcePath, this.destPath)
+		var files = new Files(this.sourcePath, this.destPath, this.testPath)
 
 	// Find all the files from the added css specs. Also add them to be copied
 		this.cssSpecs.forEach(function(spec) {
@@ -574,8 +572,7 @@ export default class App {
 				extensions: ['.js', '.jsx']
 			}),
 			commonjs(),
-			globals(),
-			builtins(),
+			nodePolyfills(),
 			rollupJson(),
 			jsconfig(this.root),
 			babel({
@@ -587,7 +584,7 @@ export default class App {
 			loader(this.loadables),
 			features(this.featureIndexes),
 			styles(),
-			resources(this.name, this.files)
+			resources(this.name, this.files, true)
 		];
 
 		var config = {
@@ -662,8 +659,7 @@ export default class App {
 				extensions: ['.js', '.jsx']
 			}),
 			commonjs(),
-			globals(),
-			builtins(),
+			nodePolyfills(),
 			rollupJson(),
 			jsconfig(this.root),
 			babel({
@@ -684,7 +680,7 @@ export default class App {
 				destination: this.htmlTemplate.destination,
 				templateVars: this.templateVariables,
 			}),
-			resources(this.name, this.files)
+			resources(this.name, this.files, false)
 		];
 
 		if (this.liveReload) {

package/Files.js

@@ -17,12 +17,17 @@ export default class Files {
 	 *  destination directory
 	 * @param {String} src the abolute path to the applications source
 	 *  directory
+	 *
+	 * @param {String} src the abolute path to the applications test
+	 *  directory
 	 */
-	constructor(src, dest) {
+	constructor(src, dest, testDest) {
 		this.dest = dest;
+		this.testDest = testDest;
 		this.src = src;
 		/** @type {CopyInfoList} */
 		this.files = {};
+		this.testFiles = {};
 		this.specs = [];
 	}
 
@@ -66,6 +71,21 @@ export default class Files {
 		return destFilename;
 	}
 
+	makeTestDestination() {
+		var fullPath = searchRoot;
+		var relativePath = srcFilename.slice(fullPath.length + 1);
+		var destFilename = '';
+
+		if (spec.keepNest) {
+			destFilename = path.join(this.dest, spec.testDest, relativePath);
+		} else {
+			destFilename = path.join(this.dest, spec.testDest, path.basename(srcFilename));
+		}
+
+		return destFilename;
+
+	}
+
 	/**
 	 * Call this method once per spec to add a list of files to the complete
 	 * list of all the files to be copied. If multiple files are found through
@@ -97,12 +117,14 @@ export default class Files {
 			}
 
 			var destination = this.makeDestination(searchRoot, spec, file);
+			var testDestination = this.makeTestDestination(searchRoot, spec, file);
 			var uri = destination.slice(this.dest.length + 1);
 
 			foundFiles[file] = {
 				name: file,
 				searchRoot: searchRoot,
 				destFilename: destination,
+				testDestFilename: testDestination,
 				uri: uri,
 				spec: spec,
 			}
@@ -132,10 +154,10 @@ export default class Files {
 	 *
 	 * @param {String} file the full path of the file to be copied
 	 */
-	async copyOneFile(file, updated) {
+	async copyOneFile(file, updated, forTest) {
 		file = forceToPosix(file);
 
-		var destination = this.files[file] && this.files[file].destFilename;
+		var destination = forTest ? this.files[file] && this.files[file].testDestFilename : this.files[file] && this.files[file].destFilename;
 
 		if (destination && updated) {
 			console.log(`file ${file} updated, copied to ${destination}`);
@@ -191,15 +213,17 @@ export default class Files {
 	/**
 	 * Call this method to copy all the files that have been specified by
 	 * calling addResourceSpec to their destination directories
+	 *
+	 * @param {Boolean} forTest set true if copying files to test destination
 	 */
-	async copyFiles() {
+	async copyFiles(forTest) {
 		await this.findAllFiles();
 
 		var filenames = Object.keys(this.files);
 
 		// using a for loop because we are making async calls
 		for (let srcFilename of filenames) {
-			let destFilename = this.files[srcFilename].destFilename;
+			let destFilename = forTest ? this.files[srcFilename].testDestFilename : this.files[srcFilename].destFilename;
 			let destFilePath = path.dirname(destFilename);
 
 			try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polylith/builder",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "The polylith builder",
   "main": "index.js",
   "type": "module",
@@ -26,8 +26,7 @@
     "rollup-plugin-html": "^0.2.1",
     "rollup-plugin-jsx": "^1.0.3",
     "rollup-plugin-livereload": "^2.0.5",
-    "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-globals": "^1.4.0",
+    "rollup-plugin-polyfill-node": "^0.11.0",
     "rollup-plugin-styles": "^4.0.0",
     "sass": "^1.43.4"
   }

package/plugin-copy-resources.js

@@ -6,7 +6,7 @@ var copied= {}
  *  copy
  * @returns {Object} the plugin
  */
-export default function(name, files) {
+export default function(name, files, forTest) {
 	return {
 		name: "copy-resources",
 
@@ -26,7 +26,7 @@ export default function(name, files) {
 			if (copied[name]) return;
 			return new Promise(async function (resolve, reject) {
 				try {
-					await files.copyFiles();
+					await files.copyFiles(forTest);
 					resolve(true)
 					copied[name] = true;
 				} catch (e) {