@steambrew/ttc 2.6.3 → 2.7.4

package/dist/index.js

@@ -4,25 +4,26 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { readFile } from 'fs/promises';
 import fs, { existsSync, readFile as readFile$1 } from 'fs';
-import { rollup } from 'rollup';
-import json from '@rollup/plugin-json';
+import babel from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
-import replace from '@rollup/plugin-replace';
-import typescript from '@rollup/plugin-typescript';
+import json from '@rollup/plugin-json';
 import resolve, { nodeResolve } from '@rollup/plugin-node-resolve';
+import replace from '@rollup/plugin-replace';
 import terser from '@rollup/plugin-terser';
-import babel from '@rollup/plugin-babel';
-import nodePolyfills from 'rollup-plugin-polyfill-node';
+import typescript from '@rollup/plugin-typescript';
 import url from '@rollup/plugin-url';
+import { rollup } from 'rollup';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
+import { minify_sync } from 'terser';
 import scss from 'rollup-plugin-scss';
 import * as sass from 'sass';
-import injectProcessEnv from 'rollup-plugin-inject-process-env';
 import dotenv from 'dotenv';
-import { createFilter } from '@rollup/pluginutils';
-import MagicString from 'magic-string';
+import injectProcessEnv from 'rollup-plugin-inject-process-env';
 import * as parser from '@babel/parser';
-import traverse from '@babel/traverse';
+import { createFilter } from '@rollup/pluginutils';
 import * as glob from 'glob';
+import MagicString from 'magic-string';
+import _traverse from '@babel/traverse';
 import { performance as performance$1 } from 'perf_hooks';
 
 const Logger = {
@@ -83,7 +84,7 @@ var BuildType;
     BuildType[BuildType["ProdBuild"] = 1] = "ProdBuild";
 })(BuildType || (BuildType = {}));
 const ValidateParameters = (args) => {
-    let typeProp = BuildType.DevBuild, targetProp = process.cwd();
+    let typeProp = BuildType.DevBuild, targetProp = process.cwd(), isMillennium = false;
     if (args.includes('--help')) {
         PrintParamHelp();
         process.exit();
@@ -117,10 +118,14 @@ const ValidateParameters = (args) => {
             }
             targetProp = args[i + 1];
         }
+        if (args[i] == '--millennium-internal') {
+            isMillennium = true;
+        }
     }
     return {
         type: typeProp,
         targetPlugin: targetProp,
+        isMillennium: isMillennium,
     };
 };
 
@@ -149,13 +154,24 @@ const CheckForUpdates = async () => {
     });
 };
 
-const ValidatePlugin = (target) => {
+const ValidatePlugin = (bIsMillennium, target) => {
     return new Promise((resolve, reject) => {
         if (!existsSync(target)) {
             console.error(chalk.red.bold(`\n[-] --target [${target}] `) + chalk.red('is not a valid system path'));
             reject();
             return;
         }
+        if (bIsMillennium) {
+            console.log(chalk.green.bold('\n[+] Using Millennium internal build configuration'));
+            resolve({
+                name: 'core',
+                common_name: 'Millennium',
+                description: 'An integrated plugin that provides core platform functionality.',
+                useBackend: false,
+                frontend: '.',
+            });
+            return;
+        }
         const pluginModule = path.join(target, 'plugin.json');
         if (!existsSync(pluginModule)) {
             console.error(chalk.red.bold(`\n[-] --target [${target}] `) + chalk.red('is not a valid plugin (missing plugin.json)'));
@@ -200,7 +216,7 @@ function ExecutePluginModule() {
     }
     /** Expose the OnPluginConfigChange so it can be called externally */
     MillenniumStore.OnPluginConfigChange = OnPluginConfigChange;
-    MILLENNIUM_BACKEND_IPC.postMessage(0, { pluginName: pluginName, methodName: '__builtins__.__millennium_plugin_settings_parser__' }).then((response) => {
+    MILLENNIUM_BACKEND_IPC.postMessage(0, { pluginName: pluginName, methodName: '__builtins__.__millennium_plugin_settings_parser__' }).then(async (response) => {
         /**
          * __millennium_plugin_settings_parser__ will return false if the plugin has no settings.
          * If the plugin has settings, it will return a base64 encoded string.
@@ -220,7 +236,7 @@ function ExecutePluginModule() {
             __millennium_internal_plugin_name_do_not_use_or_change__: pluginName,
         });
         /** Run the rolled up plugins default exported function */
-        let pluginProps = PluginModule.default();
+        let pluginProps = await PluginModule.default();
         function isValidSidebarNavComponent(obj) {
             return obj && obj.title !== undefined && obj.icon !== undefined && obj.content !== undefined;
         }
@@ -293,16 +309,33 @@ function InitializePlugins() {
             MillenniumStore.ignoreProxyFlag = false;
         });
     }
-    function WebkitInitializeIPC() {
-        SteamClient?.BrowserView?.RegisterForMessageFromParent((messageId, data) => {
-            if (messageId !== IPCMessageId) {
+    async function WebkitInitializeIPC() {
+        let intervalId = null;
+        const maxWaitTime = 10000; // 10 seconds
+        intervalId = setInterval(() => {
+            if (typeof SteamClient === 'undefined') {
                 return;
             }
-            const payload = JSON.parse(data);
-            MillenniumStore.ignoreProxyFlag = true;
-            MillenniumStore.settingsStore[payload.name] = payload.value;
-            MillenniumStore.ignoreProxyFlag = false;
-        });
+            if (intervalId) {
+                clearInterval(intervalId);
+                intervalId = null;
+            }
+            SteamClient.BrowserView?.RegisterForMessageFromParent((messageId, data) => {
+                if (messageId !== IPCMessageId) {
+                    return;
+                }
+                const payload = JSON.parse(data);
+                MillenniumStore.ignoreProxyFlag = true;
+                MillenniumStore.settingsStore[payload.name] = payload.value;
+                MillenniumStore.ignoreProxyFlag = false;
+            });
+        }, 100);
+        setTimeout(() => {
+            if (intervalId) {
+                clearInterval(intervalId);
+                console.warn('%c Millennium %c Failed to find SteamClient after 10000ms', 'background:rgb(37, 105, 184); color: white;', 'background: transparent;');
+            }
+        }, maxWaitTime);
     }
     isClientModule ? ClientInitializeIPC() : WebkitInitializeIPC();
     const StartSettingPropagation = (name, value) => {
@@ -362,6 +395,7 @@ function InitializePlugins() {
     MillenniumStore.settingsStore = DefinePluginSetting({});
 }
 
+const traverse = _traverse.default;
 const Log = (...message) => {
     console.log(chalk.blueBright.bold('constSysfsExpr'), ...message);
 };
@@ -629,7 +663,7 @@ function InsertMillennium(type, props) {
                 continue;
             }
             Logger.Info('millenniumAPI', 'Bundling into ' + ComponentType[type] + ' module... ' + chalk.green.bold('okay'));
-            bundle[fileName].code = ConstructFunctions([
+            let code = ConstructFunctions([
                 `const MILLENNIUM_IS_CLIENT_MODULE = ${type === ComponentType.Plugin ? 'true' : 'false'};`,
                 `const pluginName = "${props.strPluginInternalName}";`,
                 InitializePlugins.toString(),
@@ -640,6 +674,10 @@ function InsertMillennium(type, props) {
                 ExecutePluginModule.toString(),
                 ExecutePluginModule.name + '()',
             ]);
+            if (props.bTersePlugin) {
+                code = minify_sync(code).code ?? code;
+            }
+            bundle[fileName].code = code;
         }
     };
     return { name: String(), generateBundle };
@@ -660,9 +698,9 @@ async function MergePluginList(plugins) {
     // Merge input plugins with the filtered custom plugins
     return [...plugins, ...filteredCustomPlugins];
 }
-async function GetPluginComponents(props) {
+async function GetPluginComponents(pluginJson, props) {
     let tsConfigPath = '';
-    const frontendDir = GetFrontEndDirectory();
+    const frontendDir = GetFrontEndDirectory(pluginJson);
     if (frontendDir === '.' || frontendDir === './') {
         tsConfigPath = './tsconfig.json';
     }
@@ -674,21 +712,23 @@ async function GetPluginComponents(props) {
     }
     Logger.Info('millenniumAPI', 'Loading tsconfig from ' + chalk.cyan.bold(tsConfigPath) + '... ' + chalk.green.bold('okay'));
     let pluginList = [
+        typescript({
+            tsconfig: tsConfigPath,
+            compilerOptions: {
+                outDir: undefined,
+            },
+        }),
         url({
             include: ['**/*.gif', '**/*.webm', '**/*.svg'], // Add all non-JS assets you use
             limit: 0, // Set to 0 to always copy the file instead of inlining as base64
             fileName: '[hash][extname]', // Optional: custom output naming
         }),
         InsertMillennium(ComponentType.Plugin, props),
-        commonjs(),
-        nodePolyfills(),
         nodeResolve({
             browser: true,
         }),
-        typescript({
-            include: ['**/*.ts', '**/*.tsx', 'src/**/*.ts', 'src/**/*.tsx'],
-            tsconfig: tsConfigPath,
-        }),
+        commonjs(),
+        nodePolyfills(),
         scss({
             output: false,
             outputStyle: 'compressed',
@@ -696,10 +736,8 @@ async function GetPluginComponents(props) {
             watch: 'src/styles',
             sass: sass,
         }),
-        resolve(),
         json(),
         constSysfsExpr(),
-        injectProcessEnv(envVars),
         replace({
             delimiters: ['', ''],
             preventAssignment: true,
@@ -711,6 +749,9 @@ async function GetPluginComponents(props) {
             'client.BindPluginSettings()': 'client.BindPluginSettings(pluginName)',
         }),
     ];
+    if (envVars.length > 0) {
+        pluginList.push(injectProcessEnv(envVars));
+    }
     if (props.bTersePlugin) {
         pluginList.push(terser());
     }
@@ -732,7 +773,6 @@ async function GetWebkitPluginComponents(props) {
         commonjs(),
         json(),
         constSysfsExpr(),
-        injectProcessEnv(envVars),
         replace({
             delimiters: ['', ''],
             preventAssignment: true,
@@ -745,23 +785,37 @@ async function GetWebkitPluginComponents(props) {
             babelHelpers: 'bundled',
         }),
     ];
+    if (envVars.length > 0) {
+        pluginList.push(injectProcessEnv(envVars));
+    }
     pluginList = await MergePluginList(pluginList);
     props.bTersePlugin && pluginList.push(terser());
     return pluginList;
 }
-const GetFrontEndDirectory = () => {
-    const pluginJsonPath = './plugin.json';
+const GetFrontEndDirectory = (pluginJson) => {
     try {
-        return JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'))?.frontend ?? 'frontend';
+        return pluginJson?.frontend ?? 'frontend';
     }
     catch (error) {
         return 'frontend';
     }
 };
-const TranspilerPluginComponent = async (props) => {
+const TranspilerPluginComponent = async (bIsMillennium, pluginJson, props) => {
+    const frontendDir = GetFrontEndDirectory(pluginJson);
+    console.log(chalk.greenBright.bold('config'), 'Frontend directory set to:', chalk.cyan.bold(frontendDir));
+    const frontendPlugins = await GetPluginComponents(pluginJson, props);
+    // Fix entry file path construction
+    let entryFile = '';
+    if (frontendDir === '.' || frontendDir === './' || frontendDir === '') {
+        entryFile = './index.tsx';
+    }
+    else {
+        entryFile = `./${frontendDir}/index.tsx`;
+    }
+    console.log(chalk.greenBright.bold('config'), 'Entry file set to:', chalk.cyan.bold(entryFile));
     const frontendRollupConfig = {
-        input: `./${GetFrontEndDirectory()}/index.tsx`,
-        plugins: await GetPluginComponents(props),
+        input: entryFile,
+        plugins: frontendPlugins,
         context: 'window',
         external: (id) => {
             if (id === '@steambrew/webkit') {
@@ -772,7 +826,7 @@ const TranspilerPluginComponent = async (props) => {
         },
         output: {
             name: 'millennium_main',
-            file: '.millennium/Dist/index.js',
+            file: bIsMillennium ? '../../build/frontend.bin' : '.millennium/Dist/index.js',
             globals: {
                 react: 'window.SP_REACT',
                 'react-dom': 'window.SP_REACTDOM',
@@ -827,15 +881,16 @@ const CheckModuleUpdates = async () => {
 };
 const StartCompilerModule = () => {
     const parameters = ValidateParameters(process.argv.slice(2));
+    const bIsMillennium = parameters.isMillennium || false;
     const bTersePlugin = parameters.type == BuildType.ProdBuild;
     console.log(chalk.greenBright.bold('config'), 'Building target:', parameters.targetPlugin, 'with type:', BuildType[parameters.type], 'minify:', bTersePlugin, '...');
-    ValidatePlugin(parameters.targetPlugin)
+    ValidatePlugin(bIsMillennium, parameters.targetPlugin)
         .then((json) => {
         const props = {
             bTersePlugin: bTersePlugin,
             strPluginInternalName: json?.name,
         };
-        TranspilerPluginComponent(props);
+        TranspilerPluginComponent(bIsMillennium, json, props);
     })
         /**
          * plugin is invalid, we close the proccess as it has already been handled

package/package.json

@@ -1,53 +1,54 @@
-{
-	"name": "@steambrew/ttc",
-	"version": "2.6.3",
-	"type": "module",
-	"main": "dist/index.js",
-	"module": "dist/index.js",
-	"bin": {
-		"millennium-ttc": "dist/index.js"
-	},
-	"scripts": {
-		"build": "rollup -c",
-		"prepare": "npm run build"
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"keywords": [],
-	"author": "SteamClientHomebrew",
-	"license": "MIT",
-	"description": "A tiny typescript compiler for Millennium plugins.",
-	"dependencies": {
-		"@babel/parser": "^7.27.5",
-		"@babel/preset-env": "^7.27.2",
-		"@babel/preset-react": "^7.27.1",
-		"@babel/preset-typescript": "^7.27.1",
-		"@babel/traverse": "^7.27.4",
-		"@rollup/plugin-babel": "^6.0.4",
-		"@rollup/plugin-commonjs": "^28.0.3",
-		"@rollup/plugin-json": "^6.1.0",
-		"@rollup/plugin-node-resolve": "^15.3.1",
-		"@rollup/plugin-replace": "^6.0.2",
-		"@rollup/plugin-terser": "^0.4.4",
-		"@rollup/plugin-typescript": "^12.1.2",
-		"@rollup/plugin-url": "^8.0.2",
-		"@rollup/pluginutils": "^5.1.4",
-		"chalk": "^5.4.1",
-		"dotenv": "^16.5.0",
-		"fs": "0.0.1-security",
-		"glob": "^11.0.2",
-		"magic-string": "^0.30.17",
-		"rollup": "^4.42.0",
-		"rollup-plugin-inject-process-env": "^1.3.1",
-		"rollup-plugin-polyfill-node": "^0.13.0",
-		"rollup-plugin-scss": "^4.0.1",
-		"sass": "^1.89.1",
-		"tslib": "^2.8.1"
-	},
-	"devDependencies": {
-		"@types/babel__traverse": "^7.20.7",
-		"@types/glob": "^8.1.0",
-		"@types/node": "^22.15.30"
-	}
-}
+{
+	"name": "@steambrew/ttc",
+	"version": "2.7.4",
+	"type": "module",
+	"main": "dist/index.js",
+	"module": "dist/index.js",
+	"bin": {
+		"millennium-ttc": "dist/index.js"
+	},
+	"scripts": {
+		"build": "rollup -c",
+		"prepare": "npm run build"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"keywords": [],
+	"author": "SteamClientHomebrew",
+	"license": "MIT",
+	"description": "A tiny typescript compiler for Millennium plugins.",
+	"dependencies": {
+		"@babel/parser": "^7.27.5",
+		"@babel/preset-env": "^7.27.2",
+		"@babel/preset-react": "^7.27.1",
+		"@babel/preset-typescript": "^7.27.1",
+		"@babel/traverse": "^7.27.4",
+		"@rollup/plugin-babel": "^6.0.4",
+		"@rollup/plugin-commonjs": "^28.0.3",
+		"@rollup/plugin-json": "^6.1.0",
+		"@rollup/plugin-node-resolve": "^15.3.1",
+		"@rollup/plugin-replace": "^6.0.2",
+		"@rollup/plugin-terser": "^0.4.4",
+		"@rollup/plugin-typescript": "^12.1.2",
+		"@rollup/plugin-url": "^8.0.2",
+		"@rollup/pluginutils": "^5.1.4",
+		"chalk": "^5.4.1",
+		"dotenv": "^16.5.0",
+		"fs": "0.0.1-security",
+		"glob": "^11.0.2",
+		"magic-string": "^0.30.17",
+		"rollup": "^4.42.0",
+		"rollup-plugin-inject-process-env": "^1.3.1",
+		"rollup-plugin-polyfill-node": "^0.13.0",
+		"rollup-plugin-scss": "^4.0.1",
+		"sass": "^1.89.1",
+		"terser": "^5.43.1",
+		"tslib": "^2.8.1"
+	},
+	"devDependencies": {
+		"@types/babel__traverse": "^7.20.7",
+		"@types/glob": "^8.1.0",
+		"@types/node": "^22.15.30"
+	}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'

package/src/check-health.ts

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import path from 'path';
 import { existsSync, readFile } from 'fs';
 
-export const ValidatePlugin = (target: string): Promise<any> => {
+export const ValidatePlugin = (bIsMillennium: boolean, target: string): Promise<any> => {
 	return new Promise<any>((resolve, reject) => {
 		if (!existsSync(target)) {
 			console.error(chalk.red.bold(`\n[-] --target [${target}] `) + chalk.red('is not a valid system path'));
@@ -10,6 +10,19 @@ export const ValidatePlugin = (target: string): Promise<any> => {
 			return;
 		}
 
+		if (bIsMillennium) {
+			console.log(chalk.green.bold('\n[+] Using Millennium internal build configuration'));
+
+			resolve({
+				name: 'core',
+				common_name: 'Millennium',
+				description: 'An integrated plugin that provides core platform functionality.',
+				useBackend: false,
+				frontend: '.',
+			});
+			return;
+		}
+
 		const pluginModule = path.join(target, 'plugin.json');
 
 		if (!existsSync(pluginModule)) {

package/src/index.ts

@@ -23,18 +23,19 @@ const CheckModuleUpdates = async () => {
 
 const StartCompilerModule = () => {
 	const parameters = ValidateParameters(process.argv.slice(2));
+	const bIsMillennium = parameters.isMillennium || false;
 	const bTersePlugin = parameters.type == BuildType.ProdBuild;
 
 	console.log(chalk.greenBright.bold('config'), 'Building target:', parameters.targetPlugin, 'with type:', BuildType[parameters.type], 'minify:', bTersePlugin, '...');
 
-	ValidatePlugin(parameters.targetPlugin)
+	ValidatePlugin(bIsMillennium, parameters.targetPlugin)
 		.then((json: any) => {
 			const props: TranspilerProps = {
 				bTersePlugin: bTersePlugin,
 				strPluginInternalName: json?.name,
 			};
 
-			TranspilerPluginComponent(props);
+			TranspilerPluginComponent(bIsMillennium, json, props);
 		})
 
 		/**

package/src/plugin-api.ts

@@ -74,7 +74,7 @@ function ExecutePluginModule() {
 	/** Expose the OnPluginConfigChange so it can be called externally */
 	MillenniumStore.OnPluginConfigChange = OnPluginConfigChange;
 
-	MILLENNIUM_BACKEND_IPC.postMessage(0, { pluginName: pluginName, methodName: '__builtins__.__millennium_plugin_settings_parser__' }).then((response: any) => {
+	MILLENNIUM_BACKEND_IPC.postMessage(0, { pluginName: pluginName, methodName: '__builtins__.__millennium_plugin_settings_parser__' }).then(async (response: any) => {
 		/**
 		 * __millennium_plugin_settings_parser__ will return false if the plugin has no settings.
 		 * If the plugin has settings, it will return a base64 encoded string.
@@ -101,7 +101,7 @@ function ExecutePluginModule() {
 		});
 
 		/** Run the rolled up plugins default exported function */
-		let pluginProps = PluginModule.default();
+		let pluginProps = await PluginModule.default();
 
 		function isValidSidebarNavComponent(obj: any) {
 			return obj && obj.title !== undefined && obj.icon !== undefined && obj.content !== undefined;
@@ -188,17 +188,38 @@ function InitializePlugins() {
 		});
 	}
 
-	function WebkitInitializeIPC() {
-		SteamClient?.BrowserView?.RegisterForMessageFromParent((messageId: string, data: string) => {
-			if (messageId !== IPCMessageId) {
+	async function WebkitInitializeIPC() {
+		let intervalId: NodeJS.Timeout | null = null;
+		const maxWaitTime = 10000; // 10 seconds
+
+		intervalId = setInterval(() => {
+			if (typeof SteamClient === 'undefined') {
 				return;
 			}
 
-			const payload = JSON.parse(data);
-			MillenniumStore.ignoreProxyFlag = true;
-			MillenniumStore.settingsStore[payload.name] = payload.value;
-			MillenniumStore.ignoreProxyFlag = false;
-		});
+			if (intervalId) {
+				clearInterval(intervalId);
+				intervalId = null;
+			}
+
+			SteamClient.BrowserView?.RegisterForMessageFromParent((messageId: string, data: string) => {
+				if (messageId !== IPCMessageId) {
+					return;
+				}
+
+				const payload = JSON.parse(data);
+				MillenniumStore.ignoreProxyFlag = true;
+				MillenniumStore.settingsStore[payload.name] = payload.value;
+				MillenniumStore.ignoreProxyFlag = false;
+			});
+		}, 100);
+
+		setTimeout(() => {
+			if (intervalId) {
+				clearInterval(intervalId);
+				console.warn('%c Millennium %c Failed to find SteamClient after 10000ms', 'background:rgb(37, 105, 184); color: white;', 'background: transparent;');
+			}
+		}, maxWaitTime);
 	}
 
 	isClientModule ? ClientInitializeIPC() : WebkitInitializeIPC();
@@ -271,3 +292,4 @@ function InitializePlugins() {
 }
 
 export { ExecutePluginModule, InitializePlugins };
+

package/src/query-parser.ts

@@ -29,11 +29,13 @@ export enum BuildType {
 export interface ParameterProps {
 	type: BuildType;
 	targetPlugin: string; // path
+	isMillennium?: boolean;
 }
 
 export const ValidateParameters = (args: Array<string>): ParameterProps => {
 	let typeProp: BuildType = BuildType.DevBuild,
-		targetProp: string = process.cwd();
+		targetProp: string = process.cwd(),
+		isMillennium: boolean = false;
 
 	if (args.includes('--help')) {
 		PrintParamHelp();
@@ -73,10 +75,15 @@ export const ValidateParameters = (args: Array<string>): ParameterProps => {
 
 			targetProp = args[i + 1];
 		}
+
+		if (args[i] == '--millennium-internal') {
+			isMillennium = true;
+		}
 	}
 
 	return {
 		type: typeProp,
 		targetPlugin: targetProp,
+		isMillennium: isMillennium,
 	};
 };

package/src/static-embed.ts

@@ -1,12 +1,15 @@
-import { Plugin, SourceDescription, TransformPluginContext } from 'rollup';
-import fs from 'fs';
-import path from 'path';
-import { createFilter } from '@rollup/pluginutils';
-import MagicString from 'magic-string';
 import * as parser from '@babel/parser';
-import traverse from '@babel/traverse';
-import * as glob from 'glob';
+import { createFilter } from '@rollup/pluginutils';
 import chalk from 'chalk';
+import fs from 'fs';
+import * as glob from 'glob';
+import MagicString from 'magic-string';
+import path from 'path';
+import { Plugin, SourceDescription, TransformPluginContext } from 'rollup';
+
+// Stupid fix because @babel/traverse exports a CommonJS module
+import _traverse from '@babel/traverse';
+const traverse = (_traverse as any).default as typeof _traverse;
 
 interface EmbedPluginOptions {
 	include?: string | RegExp | (string | RegExp)[];

package/src/transpiler.ts

@@ -1,23 +1,24 @@
-import { OutputOptions, RollupOptions, rollup } from 'rollup';
-import json from '@rollup/plugin-json';
+import babel from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
-import replace from '@rollup/plugin-replace';
-import typescript from '@rollup/plugin-typescript';
+import json from '@rollup/plugin-json';
 import resolve, { nodeResolve } from '@rollup/plugin-node-resolve';
+import replace from '@rollup/plugin-replace';
 import terser from '@rollup/plugin-terser';
-import babel from '@rollup/plugin-babel';
-import nodePolyfills from 'rollup-plugin-polyfill-node';
+import typescript from '@rollup/plugin-typescript';
 import url from '@rollup/plugin-url';
+import { InputPluginOption, OutputBundle, OutputOptions, RollupOptions, rollup } from 'rollup';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
+import { minify_sync } from 'terser';
 
 import scss from 'rollup-plugin-scss';
 import * as sass from 'sass';
 
 import chalk from 'chalk';
-import { Logger } from './logger';
 import fs from 'fs';
+import { Logger } from './logger';
 
-import injectProcessEnv from 'rollup-plugin-inject-process-env';
 import dotenv from 'dotenv';
+import injectProcessEnv from 'rollup-plugin-inject-process-env';
 import { ExecutePluginModule, InitializePlugins } from './plugin-api';
 import constSysfsExpr from './static-embed';
 
@@ -54,7 +55,7 @@ export interface TranspilerProps {
 const WrappedCallServerMethod = 'const __call_server_method__ = (methodName, kwargs) => Millennium.callServerMethod(pluginName, methodName, kwargs)';
 const WrappedCallable = 'const __wrapped_callable__ = (route) => MILLENNIUM_API.callable(__call_server_method__, route)';
 
-const ConstructFunctions = (parts: any) => {
+const ConstructFunctions = (parts: string[]): string => {
 	return parts.join('\n');
 };
 
@@ -63,8 +64,8 @@ function generate(code: string) {
 	return `let PluginEntryPointMain = function() { ${code} return millennium_main; };`;
 }
 
-function InsertMillennium(type: ComponentType, props: TranspilerProps) {
-	const generateBundle = (_: unknown, bundle: any) => {
+function InsertMillennium(type: ComponentType, props: TranspilerProps): InputPluginOption {
+	const generateBundle = (_: unknown, bundle: OutputBundle) => {
 		for (const fileName in bundle) {
 			if (bundle[fileName].type != 'chunk') {
 				continue;
@@ -72,7 +73,7 @@ function InsertMillennium(type: ComponentType, props: TranspilerProps) {
 
 			Logger.Info('millenniumAPI', 'Bundling into ' + ComponentType[type] + ' module... ' + chalk.green.bold('okay'));
 
-			bundle[fileName].code = ConstructFunctions([
+			let code = ConstructFunctions([
 				`const MILLENNIUM_IS_CLIENT_MODULE = ${type === ComponentType.Plugin ? 'true' : 'false'};`,
 				`const pluginName = "${props.strPluginInternalName}";`,
 				InitializePlugins.toString(),
@@ -83,6 +84,12 @@ function InsertMillennium(type: ComponentType, props: TranspilerProps) {
 				ExecutePluginModule.toString(),
 				ExecutePluginModule.name + '()',
 			]);
+
+			if (props.bTersePlugin) {
+				code = minify_sync(code).code ?? code;
+			}
+
+			bundle[fileName].code = code;
 		}
 	};
 
@@ -112,9 +119,9 @@ async function MergePluginList(plugins: any[]) {
 	return [...plugins, ...filteredCustomPlugins];
 }
 
-async function GetPluginComponents(props: TranspilerProps) {
+async function GetPluginComponents(pluginJson: any, props: TranspilerProps): Promise<InputPluginOption[]> {
 	let tsConfigPath = '';
-	const frontendDir = GetFrontEndDirectory();
+	const frontendDir = GetFrontEndDirectory(pluginJson);
 
 	if (frontendDir === '.' || frontendDir === './') {
 		tsConfigPath = './tsconfig.json';
@@ -129,21 +136,23 @@ async function GetPluginComponents(props: TranspilerProps) {
 	Logger.Info('millenniumAPI', 'Loading tsconfig from ' + chalk.cyan.bold(tsConfigPath) + '... ' + chalk.green.bold('okay'));
 
 	let pluginList = [
+		typescript({
+			tsconfig: tsConfigPath,
+			compilerOptions: {
+				outDir: undefined,
+			},
+		}),
 		url({
 			include: ['**/*.gif', '**/*.webm', '**/*.svg'], // Add all non-JS assets you use
 			limit: 0, // Set to 0 to always copy the file instead of inlining as base64
 			fileName: '[hash][extname]', // Optional: custom output naming
 		}),
 		InsertMillennium(ComponentType.Plugin, props),
-		commonjs(),
-		nodePolyfills(),
 		nodeResolve({
 			browser: true,
 		}),
-		typescript({
-			include: ['**/*.ts', '**/*.tsx', 'src/**/*.ts', 'src/**/*.tsx'],
-			tsconfig: tsConfigPath,
-		}),
+		commonjs(),
+		nodePolyfills(),
 		scss({
 			output: false,
 			outputStyle: 'compressed',
@@ -151,10 +160,8 @@ async function GetPluginComponents(props: TranspilerProps) {
 			watch: 'src/styles',
 			sass: sass,
 		}),
-		resolve(),
 		json(),
 		constSysfsExpr(),
-		injectProcessEnv(envVars),
 		replace({
 			delimiters: ['', ''],
 			preventAssignment: true,
@@ -167,9 +174,14 @@ async function GetPluginComponents(props: TranspilerProps) {
 		}),
 	];
 
+	if (envVars.length > 0) {
+		pluginList.push(injectProcessEnv(envVars));
+	}
+
 	if (props.bTersePlugin) {
 		pluginList.push(terser());
 	}
+
 	return pluginList;
 }
 
@@ -189,7 +201,6 @@ async function GetWebkitPluginComponents(props: TranspilerProps) {
 		commonjs(),
 		json(),
 		constSysfsExpr(),
-		injectProcessEnv(envVars),
 		replace({
 			delimiters: ['', ''],
 			preventAssignment: true,
@@ -203,25 +214,43 @@ async function GetWebkitPluginComponents(props: TranspilerProps) {
 		}),
 	];
 
+	if (envVars.length > 0) {
+		pluginList.push(injectProcessEnv(envVars));
+	}
+
 	pluginList = await MergePluginList(pluginList);
 
 	props.bTersePlugin && pluginList.push(terser());
 	return pluginList;
 }
 
-const GetFrontEndDirectory = () => {
-	const pluginJsonPath = './plugin.json';
+const GetFrontEndDirectory = (pluginJson: any) => {
 	try {
-		return JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'))?.frontend ?? 'frontend';
+		return pluginJson?.frontend ?? 'frontend';
 	} catch (error) {
 		return 'frontend';
 	}
 };
 
-export const TranspilerPluginComponent = async (props: TranspilerProps) => {
+export const TranspilerPluginComponent = async (bIsMillennium: boolean, pluginJson: any, props: TranspilerProps) => {
+	const frontendDir = GetFrontEndDirectory(pluginJson);
+	console.log(chalk.greenBright.bold('config'), 'Frontend directory set to:', chalk.cyan.bold(frontendDir));
+
+	const frontendPlugins = await GetPluginComponents(pluginJson, props);
+
+	// Fix entry file path construction
+	let entryFile = '';
+	if (frontendDir === '.' || frontendDir === './' || frontendDir === '') {
+		entryFile = './index.tsx';
+	} else {
+		entryFile = `./${frontendDir}/index.tsx`;
+	}
+
+	console.log(chalk.greenBright.bold('config'), 'Entry file set to:', chalk.cyan.bold(entryFile));
+
 	const frontendRollupConfig: RollupOptions = {
-		input: `./${GetFrontEndDirectory()}/index.tsx`,
-		plugins: await GetPluginComponents(props),
+		input: entryFile,
+		plugins: frontendPlugins,
 		context: 'window',
 		external: (id) => {
 			if (id === '@steambrew/webkit') {
@@ -235,7 +264,7 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
 		},
 		output: {
 			name: 'millennium_main',
-			file: '.millennium/Dist/index.js',
+			file: bIsMillennium ? '../../build/frontend.bin' : '.millennium/Dist/index.js',
 			globals: {
 				react: 'window.SP_REACT',
 				'react-dom': 'window.SP_REACTDOM',