@polylith/builder 0.1.11 → 0.1.13

package/App.js

@@ -6,7 +6,9 @@ import { babel } from '@rollup/plugin-babel';
 import * as resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import rollupJson from "@rollup/plugin-json"
+import url from '@rollup/plugin-url'
 
+import svgr from '@svgr/rollup'
 import html from 'rollup-plugin-html';
 import livereload from 'rollup-plugin-livereload';
 import styles from "rollup-plugin-styles";
@@ -218,12 +220,20 @@ export default class App {
 
 	/**
 	 * Call this method to add specifications for application css files  These
-	 * css files will be included in the html template
+	 * css files will be included in the html template. They will also be copied
+	 * to the destination folder
 	 *
+	 * @param {String} root the relative path from the source root to the path
+	 * 		to the origin of the caller. This will either be a feature root, or
+	 * 		empty for the main application the source pathPaths specified in the
+	 * 		resource spec are assumed to be relative to this.
 	 * @param {ResourceSpecList} specs the specification for the css files. These
 	 * 		will also be added as resources to be copied.
 	 */
-	addMainCss(specs) {
+	addMainCss(root, specs) {
+		specs = specs.map(function(spec) {
+			return {root, spec}
+		}, this)
 		this.cssSpecs = [...this.cssSpecs, ...specs];
 	}
 
@@ -233,9 +243,10 @@ export default class App {
 	async findMainCss() {
 		var files = new Files(this.sourcePath, this.destPath)
 
-	// Find all the files frem the added css speces
+	// Find all the files from the added css specs. Also add them to be copied
 		this.cssSpecs.forEach(function(spec) {
-			files.addResourceSpec('', spec);
+			files.addResourceSpec(spec.root, spec.spec);
+			this.files.addResourceSpec(spec.root, spec.spec);
 		}, this)
 
 		var expanded = await files.findAllFiles();
@@ -245,8 +256,10 @@ export default class App {
 			this.cssFiles.push(file.uri)
 		}, this);
 
-	// now add them to be copied
-		this.addResources('', this.cssSpecs);
+		this.cssSpecs.map(function(spec) {
+			this.files.addResourceSpec(spec.root, spec.spec);
+			return spec.spec;
+		}, this);
 	}
 
 	/**
@@ -255,9 +268,9 @@ export default class App {
 	 *
 	 * @param {String} root the relative path from the source root to the path
 	 * 		to the origin of the caller. This will either be a feature root, or
-	 * 		empty for the main applicatio the source pathPaths specified in the
-	 * 		resource spec are assumed to be relative to this.-
-	 * @param {Array<ReourceSpec>} resourceSpecs the copy specs
+	 * 		empty for the main application the source pathPaths specified in the
+	 * 		resource spec are assumed to be relative to this.
+	 * @param {ResourceSpecList} resourceSpecs the copy specs
 	 * 		for all the resources being added.
 	 */
 	addResources(root, resourceSpecs) {
@@ -555,6 +568,8 @@ export default class App {
 				presets: ['@babel/preset-react'],
 				babelHelpers: 'bundled',
 			}),
+			url(),
+			svgr(),
 			loadConfigs(this.configs),
 			loader(this.loadables),
 			features(this.featureIndexes),

package/ConfigApp.js

@@ -34,7 +34,7 @@ export default class ConfigApp extends App {
 		}
 
 		if (config.resources && Array.isArray(config.resources)) this.addResources('', config.resources);
-		if (config.css) this.addMainCss(config.css);
+		if (config.css) this.addMainCss('', config.css);
 
 		if (config.variables) {
 			var names = Object.keys(config.variables);

package/ConfigFeature.js

@@ -33,5 +33,6 @@ export default class ConfigFeature extends Feature {
 		if (config.index) app.addFeatureIndex(path.join(this.root, config.index));
 		if (config.config) app.addConfig(config.config, this.root);
 		if (config.resources && Array.isArray(config.resources)) app.addResources(this.root, config.resources);
+		if (config.css && Array.isArray(config.css)) app.addMainCss(this.root, config.css);
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polylith/builder",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "The polylith builder",
   "main": "index.js",
   "type": "module",
@@ -16,6 +16,8 @@
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-json": "^5.0.2",
     "@rollup/plugin-node-resolve": "^13.0.5",
+    "@rollup/plugin-url": "^8.0.1",
+    "@svgr/rollup": "^6.5.1",
     "babel": "^6.23.0",
     "escape-string-regexp": "^5.0.0",
     "fast-glob": "^3.2.12",