Compare commits
4 Commits
master
...
pages-baki
Author | SHA1 | Date | |
---|---|---|---|
bef45f9107 | |||
9fbd811101 | |||
8d89cebe12 | |||
f0c34f461e |
28
.github/workflows/deploy.yml
vendored
Normal file
28
.github/workflows/deploy.yml
vendored
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
name: Deploy to GitHub Pages
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Setup Deno
|
||||||
|
uses: denolib/setup-deno@v2
|
||||||
|
with:
|
||||||
|
deno-version: 1.8
|
||||||
|
|
||||||
|
- name: Run Deno Script
|
||||||
|
run: deno run -A --no-lock cli.tsx baker
|
||||||
|
|
||||||
|
- name: Deploy to GitHub Pages
|
||||||
|
uses: peaceiris/actions-gh-pages@v3
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
publish_dir: ./.bake
|
22
cli.tsx
22
cli.tsx
@ -4,7 +4,7 @@ import { RootHost, HuntConfig, Install, Check } from "./checker.tsx";
|
|||||||
|
|
||||||
let arg = await Arg.parse(Deno.args);
|
let arg = await Arg.parse(Deno.args);
|
||||||
let env = await Env.load();
|
let env = await Env.load();
|
||||||
const collect =async(inKey:string, inArg:Record<string, string>, inEnv:Record<string, string>):Promise<string|undefined>=>
|
const collect =(inKey:string, inArg:Record<string, string>, inEnv:Record<string, string>):string|undefined=>
|
||||||
{
|
{
|
||||||
const scanArg = inArg[inKey];
|
const scanArg = inArg[inKey];
|
||||||
const scanEnvFile = inEnv[inKey];
|
const scanEnvFile = inEnv[inKey];
|
||||||
@ -93,7 +93,6 @@ if(arg._.length)
|
|||||||
case "serve" :
|
case "serve" :
|
||||||
{
|
{
|
||||||
const args = ["run", `-A`, `--no-lock`, `--config=${config.path}`, RootHost+"run.tsx", ...Deno.args];
|
const args = ["run", `-A`, `--no-lock`, `--config=${config.path}`, RootHost+"run.tsx", ...Deno.args];
|
||||||
console.log("args are", args);
|
|
||||||
await SubProcess(args);
|
await SubProcess(args);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -102,15 +101,12 @@ if(arg._.length)
|
|||||||
const useToken = await collect("DENO_DEPLOY_TOKEN", arg, env);
|
const useToken = await collect("DENO_DEPLOY_TOKEN", arg, env);
|
||||||
const useProject = await collect("DENO_DEPLOY_PROJECT", arg, env);
|
const useProject = await collect("DENO_DEPLOY_PROJECT", arg, env);
|
||||||
|
|
||||||
let scanProd:string[]|string|null = prompt(`Do you want to deploy to *production*?`);
|
let scanProd = confirm(`Do you want to deploy to *production*?`);
|
||||||
|
let argProd:string[] = [];
|
||||||
if(scanProd)
|
if(scanProd)
|
||||||
{
|
{
|
||||||
scanProd = prompt(`Are you sure? This will update the live project at "${useProject}"`);
|
scanProd = confirm(`Are you sure? This will update the live project at "${useProject}"`);
|
||||||
scanProd = scanProd ? ["--prod"] : [];
|
argProd = scanProd ? ["--prod"] : [];
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
scanProd = [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const command = [
|
const command = [
|
||||||
@ -124,13 +120,19 @@ if(arg._.length)
|
|||||||
`--token=${useToken}`,
|
`--token=${useToken}`,
|
||||||
`--import-map=${imports.path}`,
|
`--import-map=${imports.path}`,
|
||||||
`--exclude=.*,.*/,`,
|
`--exclude=.*,.*/,`,
|
||||||
...scanProd,
|
...argProd,
|
||||||
RootHost+"run.tsx"];
|
RootHost+"run.tsx"];
|
||||||
|
|
||||||
await SubProcess(command);
|
await SubProcess(command);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case "baker" :
|
||||||
|
{
|
||||||
|
const args = ["run", `-A`, `--no-lock`, `--config=${config.path}`, RootHost+"run-baker.tsx", ...Deno.args];
|
||||||
|
await SubProcess(args);
|
||||||
|
break;
|
||||||
|
}
|
||||||
case "upgrade" :
|
case "upgrade" :
|
||||||
{
|
{
|
||||||
await SubProcess(["install", `-A`, `-r`, `-f`, `--no-lock`, `--config=${config.path}`, RootHost+"cli.tsx", ...Deno.args]);
|
await SubProcess(["install", `-A`, `-r`, `-f`, `--no-lock`, `--config=${config.path}`, RootHost+"cli.tsx", ...Deno.args]);
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
"debug": "deno run -A --no-lock http://localhost:4507/cli.tsx debug",
|
"debug": "deno run -A --no-lock http://localhost:4507/cli.tsx debug",
|
||||||
"serve": "deno run -A --no-lock http://localhost:4507/cli.tsx serve",
|
"serve": "deno run -A --no-lock http://localhost:4507/cli.tsx serve",
|
||||||
"cloud": "deno run -A --no-lock http://localhost:4507/cli.tsx cloud",
|
"cloud": "deno run -A --no-lock http://localhost:4507/cli.tsx cloud",
|
||||||
|
"baker": "deno run -A --no-lock http://localhost:4507/cli.tsx baker",
|
||||||
"install": "deno install -A -r -f -n able http://localhost:4507/cli.tsx"
|
"install": "deno install -A -r -f -n able http://localhost:4507/cli.tsx"
|
||||||
},
|
},
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
//@able-types
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
type MetasInputs = { [Property in MetaKeys]?: string };
|
type MetasInputs = { [Property in MetaKeys]?: string };
|
||||||
@ -192,7 +193,7 @@ export const Router = {
|
|||||||
|
|
||||||
React.useEffect(()=>{
|
React.useEffect(()=>{
|
||||||
history.replaceState({...routeGet, URL:undefined}, "", routeGet.URL);
|
history.replaceState({...routeGet, URL:undefined}, "", routeGet.URL);
|
||||||
window.addEventListener("popstate", ({state})=>
|
self.addEventListener("popstate", ({state})=>
|
||||||
{
|
{
|
||||||
dirtySet(true);
|
dirtySet(true);
|
||||||
routeUpdate(state.Path, state.Params, state.Anchor);
|
routeUpdate(state.Path, state.Params, state.Anchor);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
//@able-types
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
type StateArgs = {done?:boolean, open?:boolean};
|
type StateArgs = {done?:boolean, open?:boolean};
|
||||||
|
111
run-baker.tsx
Normal file
111
run-baker.tsx
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
import { walk, type WalkOptions, ensureFile } from "https://deno.land/std@0.204.0/fs/mod.ts";
|
||||||
|
|
||||||
|
import ts, { isAssertEntry } from "npm:typescript";
|
||||||
|
const tsopts:ts.CompilerOptions = { declaration: true, emitDeclarationOnly: true };
|
||||||
|
const tshost = ts.createCompilerHost(tsopts);
|
||||||
|
const tstypes =(fileName: string):string=> {
|
||||||
|
let output = "";
|
||||||
|
tshost.writeFile = (fileName: string, contents: string) => output = contents;
|
||||||
|
ts.createProgram([fileName], tsopts, tshost).emit();
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
const tstypes_all =(fileNames: string[]):string[]=> {
|
||||||
|
const output:string[] = [];
|
||||||
|
tshost.writeFile = (fileName: string, contents: string) => output[fileName.indexOf(fileName)] = contents;
|
||||||
|
ts.createProgram(fileNames, tsopts, tshost).emit();
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
import * as SWCW from "https://esm.sh/@swc/wasm-web@1.3.62";
|
||||||
|
|
||||||
|
await SWCW.default();
|
||||||
|
const options:SWCW.Options = {
|
||||||
|
sourceMaps: false,
|
||||||
|
minify: true,
|
||||||
|
jsc:
|
||||||
|
{
|
||||||
|
target:"es2022",
|
||||||
|
minify:
|
||||||
|
{
|
||||||
|
compress: { unused: true },
|
||||||
|
mangle: false
|
||||||
|
},
|
||||||
|
parser:
|
||||||
|
{
|
||||||
|
syntax: "typescript",
|
||||||
|
tsx: true,
|
||||||
|
},
|
||||||
|
transform:
|
||||||
|
{
|
||||||
|
react: { runtime: "automatic" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const dir = Deno.cwd();
|
||||||
|
const folder = dir.substring(dir.lastIndexOf("\\")+1);
|
||||||
|
console.log("searching", dir);
|
||||||
|
const extensions = ["tsx", "ts", "jsx", "js"];
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await Deno.remove(".bake", { recursive: true });
|
||||||
|
console.log("rebuilding baked files");
|
||||||
|
}
|
||||||
|
catch(e)
|
||||||
|
{
|
||||||
|
console.log("fresh bake");
|
||||||
|
}
|
||||||
|
for await(const file of walk(dir, {includeDirs:false}))
|
||||||
|
{
|
||||||
|
const pathClean = file.path.replaceAll("\\", "/");
|
||||||
|
const pathRel = pathClean.substring(dir.length);
|
||||||
|
|
||||||
|
if(!pathRel.startsWith(".") && !pathRel.includes("/."))
|
||||||
|
{
|
||||||
|
const extension = file.name.substring(file.name.lastIndexOf(".")+1);
|
||||||
|
const pathBake = `.bake${pathRel}`;
|
||||||
|
if(extensions.includes(extension))
|
||||||
|
{
|
||||||
|
const pathDTS = pathBake.substring(0, pathBake.lastIndexOf("."))+".d.ts";
|
||||||
|
|
||||||
|
console.log("processing", pathRel);
|
||||||
|
|
||||||
|
const text = await Deno.readTextFile(pathClean);
|
||||||
|
const {code} = await SWCW.transform(text, { ...options, filename:file.name});
|
||||||
|
|
||||||
|
// check for types export directive
|
||||||
|
let tripleSlash = "";
|
||||||
|
const read = await Deno.open(file.path);
|
||||||
|
const buffer = new Uint8Array(256); // Set the buffer size to the maximum line length
|
||||||
|
try {
|
||||||
|
const bytesRead = await read.read(buffer);
|
||||||
|
if(bytesRead)
|
||||||
|
{
|
||||||
|
if(new TextDecoder().decode(buffer.subarray(0, bytesRead)).indexOf("@able-types") != -1)
|
||||||
|
{
|
||||||
|
tripleSlash =`/// <reference types=".${pathDTS.substring(pathDTS.lastIndexOf("/"))}" />\n`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
read.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
await ensureFile(pathBake);
|
||||||
|
await Deno.writeTextFile(pathBake, tripleSlash+code);
|
||||||
|
|
||||||
|
if(tripleSlash)
|
||||||
|
{
|
||||||
|
console.log("making types")
|
||||||
|
await ensureFile(pathDTS);
|
||||||
|
await Deno.writeTextFile(pathDTS, tstypes("."+pathRel));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await Deno.copyFile("."+pathRel, pathBake);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,32 +3,10 @@ import * as TW from "@twind/core";
|
|||||||
import TWPreTail from "https://esm.sh/v126/@twind/preset-tailwind@1.1.3/es2022/preset-tailwind.mjs";
|
import TWPreTail from "https://esm.sh/v126/@twind/preset-tailwind@1.1.3/es2022/preset-tailwind.mjs";
|
||||||
import TWPreAuto from "https://esm.sh/v126/@twind/preset-autoprefix@1.0.7/es2022/preset-autoprefix.mjs";
|
import TWPreAuto from "https://esm.sh/v126/@twind/preset-autoprefix@1.0.7/es2022/preset-autoprefix.mjs";
|
||||||
|
|
||||||
const Configure =
|
const Configure = { theme: {}, presets: [TWPreTail(), TWPreAuto()], hash: false} as TW.TwindUserConfig;
|
||||||
{
|
|
||||||
theme: {},
|
|
||||||
presets: [TWPreTail(), TWPreAuto()],
|
|
||||||
hash: false
|
|
||||||
} as TW.TwindUserConfig;
|
|
||||||
|
|
||||||
export const Shadow =(inElement:HTMLElement, inConfig:TW.TwindUserConfig)=>
|
|
||||||
{
|
|
||||||
const ShadowDOM = inElement.attachShadow({ mode: "open" });
|
|
||||||
const ShadowDiv = document.createElement("div");
|
|
||||||
const ShadowCSS = document.createElement("style");
|
|
||||||
|
|
||||||
ShadowDOM.append(ShadowCSS);
|
|
||||||
ShadowDOM.append(ShadowDiv);
|
|
||||||
TW.observe(TW.twind(inConfig, TW.cssom(ShadowCSS)), ShadowDiv);
|
|
||||||
return ShadowDiv;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default async(inSelector:string, inModulePath:string, inMemberApp="default", inMemberCSS="CSS", inShadow=false):Promise<(()=>void)|false>=>
|
export default async(inSelector:string, inModulePath:string, inMemberApp="default", inMemberCSS="CSS", inShadow=false):Promise<(()=>void)|false>=>
|
||||||
{
|
{
|
||||||
if(!inModulePath)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
let dom = document.querySelector(inSelector);
|
let dom = document.querySelector(inSelector);
|
||||||
if(!dom)
|
if(!dom)
|
||||||
{
|
{
|
||||||
@ -37,12 +15,18 @@ export default async(inSelector:string, inModulePath:string, inMemberApp="defaul
|
|||||||
}
|
}
|
||||||
|
|
||||||
const module = await import(inModulePath);
|
const module = await import(inModulePath);
|
||||||
|
|
||||||
const merge = inMemberCSS ? {...Configure, ...module[inMemberCSS]} : Configure;
|
const merge = inMemberCSS ? {...Configure, ...module[inMemberCSS]} : Configure;
|
||||||
|
|
||||||
if(inShadow)
|
if(inShadow)
|
||||||
{
|
{
|
||||||
dom = Shadow(dom as HTMLElement, merge);
|
const ShadowDOM = dom.attachShadow({ mode: "open" });
|
||||||
|
const ShadowDiv = document.createElement("div");
|
||||||
|
const ShadowCSS = document.createElement("style");
|
||||||
|
|
||||||
|
ShadowDOM.append(ShadowCSS);
|
||||||
|
ShadowDOM.append(ShadowDiv);
|
||||||
|
TW.observe(TW.twind(merge, TW.cssom(ShadowCSS)), ShadowDiv);
|
||||||
|
dom = ShadowDiv;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
106
run-deploy.tsx
106
run-deploy.tsx
@ -1,106 +0,0 @@
|
|||||||
import * as Env from "https://deno.land/std@0.194.0/dotenv/mod.ts";
|
|
||||||
import { parse } from "https://deno.land/std@0.194.0/flags/mod.ts";
|
|
||||||
|
|
||||||
|
|
||||||
const collect =async(inKey:string, inArg:Record<string, string>, inEnv:Record<string, string>):Promise<string|undefined>=>
|
|
||||||
{
|
|
||||||
const scanArg = inArg[inKey];
|
|
||||||
const scanEnvFile = inEnv[inKey];
|
|
||||||
const scanEnvDeno = Deno.env.get(inKey);
|
|
||||||
|
|
||||||
if(scanArg)
|
|
||||||
{
|
|
||||||
console.log(`Using "${inKey}" from passed argument.`);
|
|
||||||
return scanArg;
|
|
||||||
}
|
|
||||||
if(scanEnvFile)
|
|
||||||
{
|
|
||||||
console.log(`Using "${inKey}" from .env file.`);
|
|
||||||
return scanEnvFile;
|
|
||||||
}
|
|
||||||
if(scanEnvDeno)
|
|
||||||
{
|
|
||||||
console.log(`Using "${inKey}" from environment variable.`);
|
|
||||||
return scanEnvDeno;
|
|
||||||
}
|
|
||||||
|
|
||||||
const scanUser = await prompt(`No "${inKey}" found. Enter one here:`);
|
|
||||||
if(!scanUser || scanUser?.length < 3)
|
|
||||||
{
|
|
||||||
console.log("Exiting...");
|
|
||||||
Deno.exit();
|
|
||||||
}
|
|
||||||
return scanUser;
|
|
||||||
};
|
|
||||||
|
|
||||||
const prompt =async(question: string):Promise<string>=>
|
|
||||||
{
|
|
||||||
const buf = new Uint8Array(1024);
|
|
||||||
await Deno.stdout.write(new TextEncoder().encode(question));
|
|
||||||
const bytes = await Deno.stdin.read(buf);
|
|
||||||
if (bytes) {
|
|
||||||
return new TextDecoder().decode(buf.subarray(0, bytes)).trim();
|
|
||||||
}
|
|
||||||
throw new Error("Unexpected end of input");
|
|
||||||
};
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
console.log("Runing deploy!", Deno.mainModule);
|
|
||||||
|
|
||||||
let arg = parse(Deno.args);
|
|
||||||
let env = await Env.load();
|
|
||||||
|
|
||||||
let useToken = await collect("DENO_DEPLOY_TOKEN", arg, env);
|
|
||||||
let useProject = await collect("DENO_DEPLOY_PROJECT", arg, env);
|
|
||||||
|
|
||||||
let scanProd:string|string[] = await prompt(`Do you want to deploy to *production*? [y/n]`);
|
|
||||||
if(scanProd == "y")
|
|
||||||
{
|
|
||||||
scanProd = await prompt(`This will update the live project at ${useProject} are you sure you want to continue? [y/n]`);
|
|
||||||
scanProd = scanProd=="y" ? ["--prod"] : [];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
scanProd = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
const command = new Deno.Command(
|
|
||||||
`deno`,
|
|
||||||
{
|
|
||||||
args:[
|
|
||||||
"run",
|
|
||||||
"-A",
|
|
||||||
"--no-lock",
|
|
||||||
"https://deno.land/x/deploy/deployctl.ts",
|
|
||||||
"deploy",
|
|
||||||
`--project=${useProject}`,
|
|
||||||
`--import-map=./deno.json`,
|
|
||||||
`--token=${useToken}`,
|
|
||||||
...scanProd,
|
|
||||||
Deno.mainModule
|
|
||||||
],
|
|
||||||
stdin: "piped",
|
|
||||||
stdout: "piped"
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
const child = command.spawn();
|
|
||||||
|
|
||||||
// open a file and pipe the subprocess output to it.
|
|
||||||
const writableStream = new WritableStream({
|
|
||||||
write(chunk: Uint8Array): Promise<void> {
|
|
||||||
Deno.stdout.write(chunk);
|
|
||||||
return Promise.resolve();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
child.stdout.pipeTo(writableStream);
|
|
||||||
|
|
||||||
// manually close stdin
|
|
||||||
child.stdin.close();
|
|
||||||
const status = await child.status;
|
|
||||||
}
|
|
||||||
catch(e)
|
|
||||||
{
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
@ -92,7 +92,7 @@ let Configuration:Configuration =
|
|||||||
minify:
|
minify:
|
||||||
{
|
{
|
||||||
compress: { unused: true },
|
compress: { unused: true },
|
||||||
mangle: true
|
mangle: false
|
||||||
},
|
},
|
||||||
parser:
|
parser:
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user