Merge pull request #57 from codewithkyle/wip-0.5

Wip 0.5

Author: codewithkyle

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Deployment
 on:
     push:
         branches:
-            - master
+            - web-deploy
 
 jobs:
     deploy:

.gitignore

@@ -10,4 +10,5 @@ public/audio
 public/components
 public/docs
 public/raw
-public/navigation.json
+public/navigation.json
+src/framework/lib

README.md

@@ -13,7 +13,7 @@ npm i -D brixi-ui
 Install peer dependencies.
 
 ```
-npm i -D flatpickr@4 fuse.js@6 tooltipper@1 @codewithkyle/modal-make@1 @codewithkyle/notifyjs@3 @codewithkyle/pubsub@1 @codewithkyle/router@1 @codewithkyle/supercomponent@1 @codewithkyle/uuid@1 brixi@latest dayjs@1 lit-html@1
+npm i -D flatpickr@4 fuse.js@6 tooltipper@1 @codewithkyle/modal-make@1 @codewithkyle/notifyjs@3 @codewithkyle/pubsub@1 @codewithkyle/router@1 @codewithkyle/supercomponent@1 @codewithkyle/uuid@1 brixi@latest dayjs@1 lit-html@2
 ```
 
 Create the install scripts.
@@ -135,6 +135,7 @@ module.exports = {
         "focus-ring": "inset 0 0 0 2px var(--white), 0 0 0 1px var(--black)",
         bevel: "inset 0 -1px 1px hsl(0deg 0% 50% / 0.5), 0 0px 1px hsl(0deg 0% 50% / 0.25), 0 1px 1px hsl(0deg 0% 50% / 0.25)",
         "light-bevel": "0 1px 0 hsl(0deg 0% 50% / 0.1), inset 0 -1px 1px hsl(0deg 0% 50% / 0.15)",
+        "input-bevel": "0 1px 0 hsl(0deg 0% 50% / 0.1)",
         "primary-opaque-hover": "rgba(14,165,233,0.05)",
         "primary-opaque-active": "rgba(14,165,233,0.1)",
     },

brixi.config.js

@@ -100,6 +100,7 @@ module.exports = {
         "focus-ring": "inset 0 0 0 2px var(--white), 0 0 0 1px var(--black)",
         bevel: "inset 0 -1px 1px hsl(0deg 0% 50% / 0.5), 0 0px 1px hsl(0deg 0% 50% / 0.25), 0 1px 1px hsl(0deg 0% 50% / 0.25)",
         "light-bevel": "0 1px 0 hsl(0deg 0% 50% / 0.1), inset 0 -1px 1px hsl(0deg 0% 50% / 0.15)",
+        "input-bevel": "0 1px 0 hsl(0deg 0% 50% / 0.1)",
         "primary-opaque-hover": "rgba(14,165,233,0.05)",
         "primary-opaque-active": "rgba(14,165,233,0.1)",
     },

build/bundle.js

@@ -6,7 +6,17 @@ const install = require("esinstall").install;
 
 (async () => {
 	const pkg = require(path.join(cwd, "package.json"));
-	await install(pkg.bundle);
+    const bundle = [];
+    const remaps = {};
+    for (let i = 0; i < pkg.bundle.length; i++){
+        if (typeof pkg.bundle[i] === "string"){
+            bundle.push(pkg.bundle[i]);
+        } else {
+            bundle.push(pkg.bundle[i].in);
+            remaps[pkg.bundle[i].in.replace(/.*[\/\\]/, "")] = pkg.bundle[i].out;
+        }
+    }
+	await install(bundle);
 
 	const libDir = path.join(cwd, "src", "framework", "lib");
 	if (fs.existsSync(libDir)) {
@@ -17,7 +27,10 @@ const install = require("esinstall").install;
 	const scripts = glob.sync(`${path.join(cwd, "web_modules")}/**/*.js`);
 	for (let i = 0; i < scripts.length; i++){
 		const script = scripts[i];
-		const filename = script.replace(/.*[\/\\]/, "");
+		let filename = script.replace(/.*[\/\\]/, "");
+        if (filename in remaps){
+            filename = remaps[filename];
+        }
 		fs.renameSync(script, path.join(libDir, filename));
 	}
 

build/generator.js

@@ -18,7 +18,7 @@ async function getDirectories(basePath) {
 
 function renderIndex(name) {
     return `<script type="module">
-    import Component from "/${name.toKebabCase()}.js";
+    import Component from "/js/${name.toKebabCase()}.js";
     const example = new Component({
 
     });
@@ -30,7 +30,7 @@ function renderIndex(name) {
 function renderTypescript(name, tagName) {
     return `import { html, render } from "lit-html";
 import SuperComponent from "@codewithkyle/supercomponent";
-import env from "~controllers/env";
+import env from "~brixi/controllers/env";
 import { parseDataset } from "~brixi/utils/general";
 
 export interface I${name.toPascalCase()} {
@@ -74,7 +74,7 @@ export default class ${name.toPascalCase()} extends SuperComponent<I${name.toPas
         render(view, this);
     }
 }
-env.mount("${tagName}", ${name.toPascalCase()});
+env.bind("${tagName}", ${name.toPascalCase()});
 `;
 }