polylith 0.1.3 → 0.1.5

package/bin/app/manifest.json

@@ -2,10 +2,10 @@
 	"files": [
 		{"when": "code", "path": "{builds}/{app}.js", "template": "build.js.txt"},
 		{"when-not": "code", "path": "{builds}/{app}.json", "template":  "build.json"},
-		{"path": "{src}/{path}templates/index.html", "template": "template.html"},
-		{"when-not": "react", "path": "{src}/{path}index.js", "template": "index.js"},
-		{"when": "react", "path": "{src}/{path}index.js", "template": "index-react.js"},
-		{"when": "react", "path": "{src}/{path}main/main.jsx", "template": "main.js"},
-		{"when": "react", "path": "{src}/{path}main/App.jsx", "template": "app.jsx.txt"}
+		{"path": "{src}{path}/templates/index.html", "template": "template.html"},
+		{"when-not": "react", "path": "{src}{path}/index.js", "template": "index.js"},
+		{"when": "react", "path": "{src}{path}/index.js", "template": "index-react.js"},
+		{"when": "react", "path": "{src}{path}/main/main.jsx", "template": "main.js"},
+		{"when": "react", "path": "{src}{path}/main/App.jsx", "template": "app.jsx.txt"}
 	]
 }

package/bin/app/templates/build.js.txt

@@ -5,7 +5,7 @@ var projectRoot = path.join(utils.fileToPath(import.meta.url), '../');
 class {App}App extends App {
 	constructor() {
 		super('{app}', projectRoot, '{path}{src}/index.js', '{dest}');
-		this.setHtmlTemplate('{path}{src}/index.html', '{dest}/{path}index.html');
+		this.setHtmlTemplate('{path}/{src}/index.html', '{dest}{path}/index.html');
 		this.addResources('',  [
 			{
 				"dest": "styles",

package/bin/app/templates/build.json

@@ -1,11 +1,11 @@
 {
 	"name": "{app}",
-	"dest": "{dest}/{path}",
-	"source": "{src}/{path}",
-	"index": "{src}/{path}index.js",
+	"dest": "{dest}{path}",
+	"source": "{src}{path}",
+	"index": "{src}{path}index.js",
 	"template": {
-		"source": "{src}/{path}templates/index.html",
-		"destination": "{dest}/{path}index.html"
+		"source": "{src}{path}/templates/index.html",
+		"destination": "{dest}{path}/index.html"
 	},
 	"resources": [
 		{

package/bin/apps.js

@@ -87,8 +87,6 @@ async function getApp(spec, options) {
 	var filename = path.join(buildPath, spec.filename);
 	var app;
 
-	this.options = options;
-
 	if (!spec.code) {
 		var config = await(readJson(filename));
 		if (!config) return false;
@@ -136,10 +134,9 @@ export async function build(name, config, options, watch) {
 }
 
 
-async function server(apps) {
-	var destPath = path.join(workingDir(), this.options.dest);
-	var server = new PolylithServer({apps: apps}, dest);
-	server.create();
+async function server(apps, options) {
+	var server = new PolylithServer({apps: apps}, options.dest);
+	await server.create();
 	server.start(options.port || '8081');
 }
 
@@ -150,5 +147,5 @@ export async function watch(name, config, options) {
 		app.watch();
 	}
 
-	server(apps);
+	server(apps, options);
 }

package/bin/polylith.js

@@ -300,7 +300,7 @@ function getNames(params) {
 	names.builds = OPTIONS.builds;
 	names.src = OPTIONS.src;
 	names.react = OPTIONS.react;
-	names.path = OPTIONS.multiple ? app + '/' : '';
+	names.path = OPTIONS.multiple ? '/' + app : '';
 
 	return names;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polylith",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "cli for the polylith environment",
   "bin": {
     "polylith": "bin/polylith.js"