@steambrew/ttc 2.4.2 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steambrew/ttc",
-	"version": "2.4.2",
+	"version": "2.5.3",
 	"type": "module",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
@@ -31,6 +31,7 @@
 		"@rollup/plugin-replace": "^6.0.1",
 		"@rollup/plugin-terser": "^0.4.4",
 		"@rollup/plugin-typescript": "^12.1.1",
+		"@rollup/plugin-url": "^8.0.2",
 		"@rollup/pluginutils": "^5.1.4",
 		"chalk": "^5.3.0",
 		"dotenv": "^16.4.7",
@@ -39,6 +40,9 @@
 		"magic-string": "^0.30.17",
 		"rollup": "^4.40.0",
 		"rollup-plugin-inject-process-env": "^1.3.1",
+		"rollup-plugin-polyfill-node": "^0.13.0",
+		"rollup-plugin-scss": "^4.0.1",
+		"sass": "^1.87.0",
 		"tslib": "^2.8.1"
 	},
 	"devDependencies": {

package/rollup.config.js

@@ -4,7 +4,7 @@ import json from '@rollup/plugin-json';
 import nodeResolve from '@rollup/plugin-node-resolve';
 
 export default {
-	input: 'index.ts',
+	input: 'src/index.ts',
 	context: 'window',
 	output: {
 		file: 'dist/index.js',
@@ -30,5 +30,7 @@ export default {
 		'perf_hooks',
 		'@rollup/pluginutils',
 		'magic-string',
+		'rollup-plugin-scss',
+		'sass',
 	],
 };

package/src/check-health.ts

@@ -0,0 +1,41 @@
+import chalk from 'chalk';
+import path from 'path';
+import { existsSync, readFile } from 'fs';
+
+export const ValidatePlugin = (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'));
+			reject();
+			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)'));
+			reject();
+			return;
+		}
+
+		readFile(pluginModule, 'utf8', (err, data) => {
+			if (err) {
+				console.error(chalk.red.bold(`\n[-] couldn't read plugin.json from [${pluginModule}]`));
+				reject();
+				return;
+			}
+
+			try {
+				if (!('name' in JSON.parse(data))) {
+					console.error(chalk.red.bold(`\n[-] target plugin doesn't contain "name" in plugin.json [${pluginModule}]`));
+					reject();
+				} else {
+					resolve(JSON.parse(data));
+				}
+			} catch (parseError) {
+				console.error(chalk.red.bold(`\n[-] couldn't parse JSON in plugin.json from [${pluginModule}]`));
+				reject();
+			}
+		});
+	});
+};

package/{index.ts → src/index.ts}

@@ -5,10 +5,10 @@
  * - typescript transpiler
  * - rollup configurator
  */
-import { BuildType, ValidateParameters } from './Parameters';
-import { CheckForUpdates } from './VersionMon';
-import { ValidatePlugin } from './Linter';
-import { TranspilerPluginComponent, TranspilerProps } from './Compiler';
+import { BuildType, ValidateParameters } from './query-parser';
+import { CheckForUpdates } from './version-control';
+import { ValidatePlugin } from './check-health';
+import { TranspilerPluginComponent, TranspilerProps } from './transpiler';
 import { performance } from 'perf_hooks';
 import chalk from 'chalk';
 // import { Logger } from './Logger'

package/src/query-parser.ts

@@ -0,0 +1,82 @@
+import chalk from 'chalk';
+import { Logger } from './logger';
+
+/***
+ * @brief print the parameter list to the stdout
+ */
+export const PrintParamHelp = () => {
+	console.log(
+		'millennium-ttc parameter list:' +
+			'\n\t' +
+			chalk.magenta('--help') +
+			': display parameter list' +
+			'\n\t' +
+			chalk.bold.red('--build') +
+			': ' +
+			chalk.bold.red('(required)') +
+			': build type [dev, prod] (prod minifies code)' +
+			'\n\t' +
+			chalk.magenta('--target') +
+			': path to plugin, default to cwd',
+	);
+};
+
+export enum BuildType {
+	DevBuild,
+	ProdBuild,
+}
+
+export interface ParameterProps {
+	type: BuildType;
+	targetPlugin: string; // path
+}
+
+export const ValidateParameters = (args: Array<string>): ParameterProps => {
+	let typeProp: BuildType = BuildType.DevBuild,
+		targetProp: string = process.cwd();
+
+	if (args.includes('--help')) {
+		PrintParamHelp();
+		process.exit();
+	}
+
+	// startup args are invalid
+	if (!args.includes('--build')) {
+		Logger.Error('Received invalid arguments...');
+		PrintParamHelp();
+		process.exit();
+	}
+
+	for (let i = 0; i < args.length; i++) {
+		if (args[i] === '--build') {
+			const BuildMode: string = args[i + 1];
+
+			switch (BuildMode) {
+				case 'dev':
+					typeProp = BuildType.DevBuild;
+					break;
+				case 'prod':
+					typeProp = BuildType.ProdBuild;
+					break;
+				default: {
+					Logger.Error('--build parameter must be preceded by build type [dev, prod]');
+					process.exit();
+				}
+			}
+		}
+
+		if (args[i] == '--target') {
+			if (args[i + 1] === undefined) {
+				Logger.Error('--target parameter must be preceded by system path');
+				process.exit();
+			}
+
+			targetProp = args[i + 1];
+		}
+	}
+
+	return {
+		type: typeProp,
+		targetPlugin: targetProp,
+	};
+};

package/{Compiler.ts → src/transpiler.ts}

@@ -3,18 +3,23 @@ import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import replace from '@rollup/plugin-replace';
 import typescript from '@rollup/plugin-typescript';
-import resolve from '@rollup/plugin-node-resolve';
+import resolve, { nodeResolve } from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
 import babel from '@rollup/plugin-babel';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
+import url from '@rollup/plugin-url';
+
+import scss from 'rollup-plugin-scss';
+import * as sass from 'sass';
 
 import chalk from 'chalk';
-import { Logger } from './Logger';
+import { Logger } from './logger';
 import fs from 'fs';
 
 import injectProcessEnv from 'rollup-plugin-inject-process-env';
 import dotenv from 'dotenv';
-import { ExecutePluginModule, InitializePlugins } from './PluginSetup';
-import constSysfsExpr from './StaticEmbed';
+import { ExecutePluginModule, InitializePlugins } from './plugin-api';
+import constSysfsExpr from './static-embed';
 
 const envConfig = dotenv.config().parsed || {};
 
@@ -84,20 +89,69 @@ function InsertMillennium(type: ComponentType, props: TranspilerProps) {
 	return { name: String(), generateBundle };
 }
 
-function GetPluginComponents(props: TranspilerProps) {
-	let tsConfigPath = `./${GetFrontEndDirectory()}/tsconfig.json`;
+async function GetCustomUserPlugins() {
+	const ttcConfigPath = new URL(`file://${process.cwd().replace(/\\/g, '/')}/ttc.config.mjs`).href;
+
+	if (fs.existsSync('./ttc.config.mjs')) {
+		const { MillenniumCompilerPlugins } = await import(ttcConfigPath);
+
+		Logger.Info('millenniumAPI', 'Loading custom plugins from ttc.config.mjs... ' + chalk.green.bold('okay'));
+		return MillenniumCompilerPlugins;
+	}
+
+	return [];
+}
+
+async function MergePluginList(plugins: any[]) {
+	const customPlugins = await GetCustomUserPlugins();
+
+	// Filter out custom plugins that have the same name as input plugins
+	const filteredCustomPlugins = customPlugins.filter((customPlugin: any) => !plugins.some((plugin: any) => plugin.name === customPlugin.name));
+
+	// Merge input plugins with the filtered custom plugins
+	return [...plugins, ...filteredCustomPlugins];
+}
+
+async function GetPluginComponents(props: TranspilerProps) {
+	let tsConfigPath = '';
+	const frontendDir = GetFrontEndDirectory();
+
+	if (frontendDir === '.' || frontendDir === './') {
+		tsConfigPath = './tsconfig.json';
+	} else {
+		tsConfigPath = `./${frontendDir}/tsconfig.json`;
+	}
 
 	if (!fs.existsSync(tsConfigPath)) {
 		tsConfigPath = './tsconfig.json';
 	}
 
-	const pluginList = [
+	Logger.Info('millenniumAPI', 'Loading tsconfig from ' + chalk.cyan.bold(tsConfigPath) + '... ' + chalk.green.bold('okay'));
+
+	let pluginList = [
+		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,
 		}),
+		scss({
+			output: false,
+			outputStyle: 'compressed',
+			sourceMap: false,
+			watch: 'src/styles',
+			sass: sass,
+		}),
 		resolve(),
-		commonjs(),
 		json(),
 		constSysfsExpr(),
 		injectProcessEnv(envVars),
@@ -119,12 +173,18 @@ function GetPluginComponents(props: TranspilerProps) {
 	return pluginList;
 }
 
-function GetWebkitPluginComponents(props: TranspilerProps) {
-	const pluginList = [
+async function GetWebkitPluginComponents(props: TranspilerProps) {
+	let pluginList = [
 		InsertMillennium(ComponentType.Webkit, props),
 		typescript({
 			tsconfig: './webkit/tsconfig.json',
 		}),
+		url({
+			include: ['**/*.mp4', '**/*.webm', '**/*.ogg'],
+			limit: 0, // do NOT inline
+			fileName: '[name][extname]',
+			destDir: 'dist/assets', // or adjust as needed
+		}),
 		resolve(),
 		commonjs(),
 		json(),
@@ -143,6 +203,8 @@ function GetWebkitPluginComponents(props: TranspilerProps) {
 		}),
 	];
 
+	pluginList = await MergePluginList(pluginList);
+
 	props.bTersePlugin && pluginList.push(terser());
 	return pluginList;
 }
@@ -159,7 +221,7 @@ const GetFrontEndDirectory = () => {
 export const TranspilerPluginComponent = async (props: TranspilerProps) => {
 	const frontendRollupConfig: RollupOptions = {
 		input: `./${GetFrontEndDirectory()}/index.tsx`,
-		plugins: GetPluginComponents(props),
+		plugins: await GetPluginComponents(props),
 		context: 'window',
 		external: (id) => {
 			if (id === '@steambrew/webkit') {
@@ -191,7 +253,7 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
 		if (fs.existsSync(`./webkit/index.tsx`)) {
 			const webkitRollupConfig: RollupOptions = {
 				input: `./webkit/index.tsx`,
-				plugins: GetWebkitPluginComponents(props),
+				plugins: await GetWebkitPluginComponents(props),
 				context: 'window',
 				external: (id) => {
 					if (id === '@steambrew/client') {

package/{VersionMon.ts → src/version-control.ts}

@@ -2,7 +2,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { readFile } from 'fs/promises';
 import { dirname } from 'path';
-import { Logger } from './Logger';
+import { Logger } from './logger';
 
 export const CheckForUpdates = async (): Promise<boolean> => {
 	return new Promise<boolean>(async (resolve) => {
@@ -22,6 +22,10 @@ export const CheckForUpdates = async (): Promise<boolean> => {
 					Logger.Info('versionMon', `@steambrew/ttc@${packageJson.version} is up-to-date!`);
 					resolve(false);
 				}
+			})
+			.catch((exception) => {
+				Logger.Error('Failed to check for updates: ' + exception);
+				resolve(false);
 			});
 	});
 };

package/tsconfig.json

@@ -1,24 +1,23 @@
 {
-    "compilerOptions": {
-      "outDir": "dist",
-      "module": "ESNext",
-      "target": "ES2020",
-      "jsx": "react",
-      "jsxFactory": "window.SP_REACT.createElement",
-      "declaration": false,
-      "moduleResolution": "node",
-      "noUnusedLocals": true,
-      "noUnusedParameters": true,
-      "esModuleInterop": true,
-      "noImplicitReturns": true,
-      "noImplicitThis": true,
-      "noImplicitAny": true,
-      "strict": true,
-      "ignoreDeprecations": "5.0",
-      "allowSyntheticDefaultImports": true,
-      "skipLibCheck": true
-    },
-    "include": ["./"],
-    "exclude": ["node_modules"]
+	"compilerOptions": {
+		"outDir": "dist",
+		"module": "ESNext",
+		"target": "ES2020",
+		"jsx": "react",
+		"jsxFactory": "window.SP_REACT.createElement",
+		"declaration": false,
+		"moduleResolution": "node",
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"esModuleInterop": true,
+		"noImplicitReturns": true,
+		"noImplicitThis": true,
+		"noImplicitAny": true,
+		"strict": true,
+		"ignoreDeprecations": "5.0",
+		"allowSyntheticDefaultImports": true,
+		"skipLibCheck": true
+	},
+	"include": ["./src/**/*"],
+	"exclude": ["node_modules"]
 }
-  

package/Linter.ts

@@ -1,44 +0,0 @@
-import chalk from 'chalk'
-import path from 'path'
-import { existsSync, readFile } from 'fs'
-
-export const ValidatePlugin = (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"))
-            reject() 
-            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)"))
-            reject()
-            return
-        }
-        
-        readFile(pluginModule, 'utf8', (err, data) => {
-            if (err) {
-                console.error(chalk.red.bold(`\n[-] couldn't read plugin.json from [${pluginModule}]`))
-                reject()
-                return
-            }
-        
-            try {
-                if (!("name" in JSON.parse(data))) {
-                    console.error(chalk.red.bold(`\n[-] target plugin doesn't contain "name" in plugin.json [${pluginModule}]`))
-                    reject()
-                }
-                else {
-                    resolve(JSON.parse(data)) 
-                }
-            } 
-            catch (parseError) {
-                console.error(chalk.red.bold(`\n[-] couldn't parse JSON in plugin.json from [${pluginModule}]`))
-                reject()
-            }
-        });
-    })
-}

package/Parameters.ts

@@ -1,72 +0,0 @@
-import chalk from 'chalk'
-import { Logger } from "./Logger"
-
-/***
- * @brief print the parameter list to the stdout
- */
-export const PrintParamHelp = () => {
-
-    console.log(
-        "millennium-ttc parameter list:" +
-        "\n\t" + chalk.magenta("--help") + ": display parameter list" +
-        "\n\t" + chalk.bold.red("--build") + ": " + chalk.bold.red("(required)") + ": build type [dev, prod] (prod minifies code)" +
-        "\n\t" + chalk.magenta("--target") + ": path to plugin, default to cwd"
-    );
-}
-
-export enum BuildType {
-    DevBuild, ProdBuild
-}
-
-export interface ParameterProps {
-    type: BuildType, 
-    targetPlugin: string // path
-}
-
-export const ValidateParameters = (args: Array<string>): ParameterProps => {
-
-    let typeProp: BuildType = BuildType.DevBuild, targetProp: string = process.cwd()
-
-    if (args.includes("--help")) {
-        PrintParamHelp()
-        process.exit();
-    }
-    
-    // startup args are invalid
-    if (!args.includes("--build")) {
-        Logger.Error("Received invalid arguments...");
-        PrintParamHelp();
-        process.exit();
-    }
-    
-    for (let i = 0; i < args.length; i++) 
-    {
-        if (args[i] === "--build") 
-        {
-            const BuildMode: string = args[i + 1]
-
-            switch (BuildMode) {
-                case "dev": typeProp = BuildType.DevBuild; break
-                case "prod": typeProp = BuildType.ProdBuild; break
-                default: {
-                    Logger.Error('--build parameter must be preceded by build type [dev, prod]');
-                    process.exit();
-                }
-            }
-        }
-    
-        if (args[i] == "--target") {
-            if (args[i + 1] === undefined) {
-                Logger.Error('--target parameter must be preceded by system path');
-                process.exit();
-            }
-
-            targetProp = args[i + 1]
-        }
-    }
-
-    return {
-        type: typeProp,
-        targetPlugin: targetProp
-    }
-}