some cleanup

alexpineda · alexpineda · commit cde3b6823036 · 2023-10-26T00:22:01.000-04:00
diff --git a/build/plugins/build-plugins.ts b/build/plugins/build-plugins.ts
@@ -30,7 +30,7 @@ const build = async () => {
 
     console.log(packages.officialPackages.length, "official packages found");
 
-    const packageNames: string[] = [];
+    const packageNames = new Set<string>();
 
     await useTempDir(async (dir) => {
         for (const pkg of packages.officialPackages) {
@@ -83,15 +83,15 @@ const build = async () => {
                             path.join(outDir, folderName, "package.json")
                         );
 
-                        packageNames.push(folderName);
+                        packageNames.add(folderName);
                     } catch (error) {
                         console.log("error building", file.path, error);
                     }
                 }
             }
         }
 
-        writeFileSync(path.join(outDir, "index.json"), JSON.stringify(packageNames));
+        writeFileSync(path.join(outDir, "index.json"), JSON.stringify([...packageNames]));
     });
 
     //todo: convert to vite build
diff --git a/bundled/assets/reset.css b/bundled/assets/reset.css
diff --git a/bundled/styles.css b/bundled/styles.css
@@ -1,21 +1,20 @@
 @font-face {
     font-family: "Conthrax";
-    src: url("../../../../bundled/assets/conthrax-rg.otf") format("opentype");
+    src: url("assets/conthrax-rg.otf") format("opentype");
     font-style: normal;
     font-weight: 100 400;
 }
 
 @font-face {
     font-family: "Conthrax-Bold";
-    src: url("../../../../bundled/assets/conthrax-hv.otf") format("opentype");
+    src: url("assets/conthrax-hv.otf") format("opentype");
     font-style: normal;
     font-weight: 500 900;
 }
 
 @font-face {
     font-family: "Inter";
-    src: url("../../../../bundled/assets/Inter-VariableFont_slnt,wght.ttf")
-        format("truetype");
+    src: url("assets/Inter-VariableFont_slnt,wght.ttf") format("truetype");
 }
 
 :root {
@@ -97,4 +96,4 @@ ul {
 
 td {
     padding: 1rem;
-}
+}
diff --git a/configuration.html b/configuration.html
@@ -2,6 +2,9 @@
 <html lang="en" style="background: white">
     <head>
         <meta charset="utf-8" />
+        <link rel="stylesheet" href="./bundled/assets/normalize.min.css" />
+        <link rel="stylesheet" href="./bundled/assets/open-props.1.4.min.css" />
+        <link rel="stylesheet" href="./bundled/assets/buttons.min.css" />
     </head>
 
     <body style="overflow: auto">
diff --git a/index.html b/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
+    <head>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./bundled/assets/reset.css" />
+        <link rel="stylesheet" href="./bundled/assets/open-props.1.4.min.css" />
+        <link rel="stylesheet" href="./bundled/styles.css" />
+    </head>
 
-<head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="./bundled/styles.css">
-</head>
-
-<body>
-    <div id="app"></div>
-    <script type="module" src="./src/renderer/core/titan-reactor.ts"></script>
-</body>
-
-</html>
+    <body>
+        <div id="app"></div>
+        <script type="module" src="./src/renderer/core/titan-reactor.ts"></script>
+    </body>
+</html>
diff --git a/package.json b/package.json
@@ -11,19 +11,17 @@
         "test": "jest --watchAll",
         "test:once": "jest --runInBand",
         "test:debug": "node --inspect node_modules/jest/bin/jest --runInBand",
-        "clear-cache": "rimraf .cache dist",
+        "test:build": "http-server .\\dist\\titan-reactor -p 80",
         "lint": "yarn eslint . && yarn prettier --check .",
         "postinstall": "git apply -v --stat --directory=node_modules/scm-extractor build/patches/scm-extractor.patch",
-        "build-api-types": "ts-node -T .\\build\\api-types\\index.ts",
-        "build-plugin-api-docs:host": "typedoc --out docs/host --tsconfig tsconfig.host-api.json build/api-types/host/index.d.ts",
-        "build-plugin-api-docs:ui": "typedoc --out docs/ui --tsconfig tsconfig.ui-api.json build/api-types/ui/index.d.ts",
-        "build-api-docs": "yarn build-plugin--api-docs:host && yarn build-plugin--api-docs:ui",
-        "plugins:build": "ts-node -T .\\build\\plugins\\build-plugins.ts",
-        "plugins:serve": "http-server .\\dist\\plugins -p 8090 --cors",
+        "generate:api-types": "ts-node -T .\\build\\api-types\\index.ts",
+        "generate:plugin-api-docs": "typedoc --out docs/host --tsconfig tsconfig.host-api.json build/api-types/host/index.d.ts && typedoc --out docs/ui --tsconfig tsconfig.ui-api.json build/api-types/ui/index.d.ts",
+        "build:plugins": "ts-node -T ./esbuild.runtime.ts && ts-node -T .\\build\\plugins\\build-plugins.ts",
+        "serve:plugins": "http-server .\\dist\\plugins -p 8090 --cors",
         "web": "vite -c vite.config.web.ts",
-        "web:build": "vite build -c vite.config.web.ts",
-        "runtime:build": "ts-node -T ./esbuild.runtime.ts",
-        "plugins:all": "yarn runtime:build && yarn plugins:build  && yarn plugins:serve"
+        "build:web": "vite build -c vite.config.web.ts",
+        "plugins": "yarn build:plugins && yarn serve:plugins",
+        "build": "yarn build:web && yarn build:plugins"
     },
     "repository": {
         "type": "git",
diff --git a/src/renderer/configuration-ui/index.tsx b/src/renderer/configuration-ui/index.tsx
@@ -9,18 +9,13 @@ import { MacrosPanel } from "./macros-ui/macros-panel";
 import { PluginsConfiguration } from "./plugins-configuration";
 import { Helmet } from "react-helmet";
 
-import "../../../bundled/assets/normalize.min.css";
-import "../../../bundled/assets/open-props.1.4.min.css";
-import "../../../bundled/assets/buttons.min.css";
-
 document.title = "Configuration";
 
 const s = document.createElement( "link" );
 s.rel = "stylesheet";
 s.href = "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap";
 document.head.appendChild( s );
 
-
 const CommandCenter = () => {
     const [ banner, setBanner ] = useState( "" );
 
@@ -67,7 +62,7 @@ const root = createRoot( container! );
 // root.render( <CommandCenter /> )
 
 window.opener.postMessage( {
-    type: "connect"
+    type: "connect",
 } );
 
 window.addEventListener( "message", ( event ) => {
@@ -76,6 +71,6 @@ window.addEventListener( "message", ( event ) => {
         window.deps.useSettingsStore.subscribe( ( state ) => {
             console.log( "state", state );
         } );
-        root.render( <CommandCenter /> )
+        root.render( <CommandCenter /> );
     }
-} );
+} );
diff --git a/src/renderer/scenes/iscriptah/iscriptah.tsx b/src/renderer/scenes/iscriptah/iscriptah.tsx
@@ -13,9 +13,9 @@ import {
     Vector4,
 } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls";
-import "../../../../bundled/assets/open-props.1.4.min.css";
-import "../../../../bundled/assets/normalize.min.css";
-import "../pre-home-scene/styles.css";
+// import "../../../../bundled/assets/open-props.1.4.min.css";
+// import "../../../../bundled/assets/normalize.min.css";
+// import "../pre-home-scene/styles.css";
 
 import App from "./components/app";
 import { Surface } from "@image/canvas/surface";
@@ -41,15 +41,14 @@ import { IScriptImage } from "./iscript-sprite";
 import { getDirection32 } from "@utils/camera-utils";
 
 const bootup = async () => {
-
-    await initializeAssets(  );
+    await initializeAssets();
 
     const janitor = new Janitor( "iscriptah-scene-loader" );
 
     const surface = new Surface();
     surface.setDimensions( 300, 300, window.devicePixelRatio );
 
-    const renderComposer = new TitanRenderComposer(surface);
+    const renderComposer = new TitanRenderComposer( surface );
 
     const scene = new Scene();
     janitor.mop( scene, "scene" );
@@ -156,7 +155,7 @@ const bootup = async () => {
     const renderPass = new RenderPass( scene, cameras[0] );
 
     const postProcessingBundle = {
-        passes: [renderPass],
+        passes: [ renderPass ],
     };
 
     renderComposer.setBundlePasses( postProcessingBundle );
@@ -186,7 +185,7 @@ const bootup = async () => {
         const preload = async () => {
             const { header } = block;
 
-            const atlas = await loadImageAtlasDirect( block.image.index )// true );
+            const atlas = await loadImageAtlasDirect( block.image.index ); // true );
 
             const image = isGltfAtlas( atlas )
                 ? new Image3D( atlas )
diff --git a/src/renderer/utils/renderer-utils.ts b/src/renderer/utils/renderer-utils.ts
@@ -7,18 +7,20 @@ export const logCapabilities = () => {
     // log.info( `@init: chrome ${process.versions.chrome}` );
     log.info( `@init: resolution ${window.innerWidth}x${window.innerHeight}` );
 
-    getWebGLRenderer(r => {
+    getWebGLRenderer( ( r ) => {
         log.debug( "@init: webgl capabilities" );
         for ( const prop of Object.getOwnPropertyNames( r.capabilities ) ) {
             const value = r.capabilities[prop as keyof typeof r.capabilities];
             if ( typeof value === "function" ) continue;
             log.debug( `- ${prop}: ${value}` );
         }
-    
+
         log.debug( `- anisotropy: ${r.capabilities.getMaxAnisotropy()}` );
         log.debug( `- max precision: ${r.capabilities.getMaxPrecision( "highp" )}` );
         log.debug( "webgl extensions" );
-        log.debug( `- EXT_color_buffer_float ${r.extensions.has( "EXT_color_buffer_float" )}` );
+        log.debug(
+            `- EXT_color_buffer_float ${r.extensions.has( "EXT_color_buffer_float" )}`
+        );
         log.debug(
             `- OES_texture_float_linear ${r.extensions.has( "OES_texture_float_linear" )}`
         );
@@ -32,11 +34,9 @@ export const logCapabilities = () => {
                 "WEBGL_multisampled_render_to_texture"
             )}`
         );
-    
-        r.extensions.init( r.capabilities );
-    
-        log.debug( `@init: device pixel ratio: ${window.devicePixelRatio}` );
-    })
 
+        r.extensions.init( r.capabilities );
 
+        log.debug( `@init: device pixel ratio: ${window.devicePixelRatio}` );
+    } );
 };
diff --git a/src/runtime.html b/src/runtime.html
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <link
-            rel="stylesheet"
-            href="https://unpkg.com/open-props@1.6.8/open-props.min.css" />
-        <link
-            rel="stylesheet"
-            href="https://unpkg.com/open-props@1.6.8/normalize.min.css" />
+        <link rel="stylesheet" href="assets/open-props.1.4.min.css" />
+        <link rel="stylesheet" href="assets/normalize.min.css" />
 
         <style>
             @font-face {
diff --git a/vite.config.web.ts b/vite.config.web.ts
@@ -6,20 +6,17 @@ import tsConfig from "./tsconfig.json";
 import { sharedViteConfig } from "./vite.shared";
 // import mkcert from 'vite-plugin-mkcert'
 
-const OUT_DIR = "dist/web";
+const OUT_DIR = "dist/titan-reactor";
 const TARGET = tsConfig.compilerOptions.target;
 
 // https://vitejs.dev/config/
 export default defineConfig((env) => {
-    console.log(env);
     return {
         ...sharedViteConfig(),
         // titan-reactor is the subfolder in the black-sheep-wall public dir
-        base: env.command === "build" ? "/titan-reactor" : "/",
+        base: env.command === "build" ? "/" : "/",
         define: {
-            __static: JSON.stringify(
-                env.command === "build" ? "/resources/bundled" : "/bundled"
-            ),
+            __static: JSON.stringify(env.command === "build" ? "/" : "/bundled"),
         },
         logLevel: "info",
         publicDir: "bundled",
diff --git a/vite.shared.ts b/vite.shared.ts
@@ -1,5 +1,5 @@
 import aliases from "./build/aliases";
-import { ConfigEnv, UserConfigExport } from "vite";
+import { UserConfigExport } from "vite";
 import path from "path";
 import tsConfig from "./tsconfig.json";
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ const build = async () => {`
`30`	`30`
`31`	`31`	`console.log(packages.officialPackages.length, "official packages found");`
`32`	`32`
`33`		`- const packageNames: string[] = [];`
	`33`	`+ const packageNames = new Set<string>();`
`34`	`34`
`35`	`35`	`await useTempDir(async (dir) => {`
`36`	`36`	`for (const pkg of packages.officialPackages) {`
`@@ -83,15 +83,15 @@ const build = async () => {`
`83`	`83`	`path.join(outDir, folderName, "package.json")`
`84`	`84`	`);`
`85`	`85`
`86`		`- packageNames.push(folderName);`
	`86`	`+ packageNames.add(folderName);`
`87`	`87`	`} catch (error) {`
`88`	`88`	`console.log("error building", file.path, error);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- writeFileSync(path.join(outDir, "index.json"), JSON.stringify(packageNames));`
	`94`	`+ writeFileSync(path.join(outDir, "index.json"), JSON.stringify([...packageNames]));`
`95`	`95`	`});`
`96`	`96`
`97`	`97`	`//todo: convert to vite build`