misc cleanup

This commit is contained in:
Seth Trowbridge 2023-07-17 22:41:22 -04:00
parent c3e5319d47
commit 65d6d827e3
4 changed files with 15 additions and 22 deletions

View File

@ -117,7 +117,6 @@ export const Exports =(inFile:string)=>
export const FileExports =async(inURL:string|URL)=> export const FileExports =async(inURL:string|URL)=>
{ {
console.log("scanning", inURL, "for exports")
const resp = await fetch(inURL); const resp = await fetch(inURL);
const text = await resp.text(); const text = await resp.text();
return Exports(text); return Exports(text);

View File

@ -45,7 +45,6 @@ Configure({
// we dont need to add ?reload= because this fetch is by way the file system not the hosted url // we dont need to add ?reload= because this fetch is by way the file system not the hosted url
const [local, foreign] = await Collect.FileExports(inConfig.Proxy+inURL.pathname); const [local, foreign] = await Collect.FileExports(inConfig.Proxy+inURL.pathname);
console.log(local, foreign);
const code =` const code =`
import {FileListen} from "${import.meta.resolve(`./hmr-listen.tsx`)}"; import {FileListen} from "${import.meta.resolve(`./hmr-listen.tsx`)}";
import * as Import from "${inURL.pathname}?reload=0"; import * as Import from "${inURL.pathname}?reload=0";

View File

@ -11,15 +11,6 @@ Deno.args.forEach(arg=>
} }
}); });
const urls = {
Cwd: new URL(`file://${Deno.cwd().replaceAll("\\", "/")}`).toString(),
App: Deno.mainModule,
Mod: import.meta.url,
Look: import.meta.resolve("./boot.tsx")
};
console.log(JSON.stringify(urls, null, " "));
type DenoConfig = {imports:Record<string, string>}; type DenoConfig = {imports:Record<string, string>};
const ImportMap:DenoConfig = {imports:{}}; const ImportMap:DenoConfig = {imports:{}};
let ImportMapOriginal = {}; let ImportMapOriginal = {};
@ -41,14 +32,6 @@ const ImportMapReload =async()=>
return; return;
} }
Object.entries(json.imports).forEach(([key, value])=>
{
if(value.startsWith("./"))
{
json.imports[key] = value.substring(1);
}
});
if(!json.imports["react"]) if(!json.imports["react"])
{ {
console.log(`"react" specifier not defined in import map`); console.log(`"react" specifier not defined in import map`);
@ -58,8 +41,20 @@ const ImportMapReload =async()=>
json.imports["react/"] = json.imports["react"]+"/"; json.imports["react/"] = json.imports["react"]+"/";
} }
if(!json.imports["entry"])
{
console.log(`"entry" specifier not defined in import map.`);
}
Object.entries(json.imports).forEach(([key, value])=>
{
if(value.startsWith("./"))
{
json.imports[key] = value.substring(1);
}
});
ImportMap.imports = Configuration.Remap(json.imports, Configuration); ImportMap.imports = Configuration.Remap(json.imports, Configuration);
console.log(ImportMap.imports);
}; };
type CustomHTTPHandler = (inReq:Request, inURL:URL, inExt:string|false, inMap:{imports:Record<string, string>}, inConfig:Configuration)=>void|false|Response|Promise<Response|void|false>; type CustomHTTPHandler = (inReq:Request, inURL:URL, inExt:string|false, inMap:{imports:Record<string, string>}, inConfig:Configuration)=>void|false|Response|Promise<Response|void|false>;
@ -91,7 +86,7 @@ let Configuration:Configuration =
<div id="app"></div> <div id="app"></div>
<script type="importmap">${JSON.stringify(inMap)}</script> <script type="importmap">${JSON.stringify(inMap)}</script>
<script type="module"> <script type="module">
import Mount from "${import.meta.resolve("./boot.tsx")}"; import Mount from "${import.meta.resolve("./run-browser.tsx")}";
Mount("#app", "entry"); Mount("#app", "entry");
</script> </script>
</body> </body>
@ -307,7 +302,7 @@ const server = Deno.serve({port:parseInt(Deno.env.get("port")||"8000")}, async(r
} }
else else
{ {
throw new Error("404") throw new Error("404");
} }
} }
catch(e) catch(e)