@steambrew/ttc 2.8.5 → 2.8.7

package/dist/index.js

@@ -622,7 +622,12 @@ var ComponentType;
     ComponentType[ComponentType["Webkit"] = 1] = "Webkit";
 })(ComponentType || (ComponentType = {}));
 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)';
+function __wrapped_callable__(route) {
+    if (route.startsWith('webkit:')) {
+        return MILLENNIUM_API.callable((methodName, kwargs) => MILLENNIUM_API.__INTERNAL_CALL_WEBKIT_METHOD__(pluginName, methodName, kwargs), route.replace(/^webkit:/, ''));
+    }
+    return MILLENNIUM_API.callable(__call_server_method__, route);
+}
 const ConstructFunctions = (parts) => {
     return parts.join('\n');
 };
@@ -643,7 +648,7 @@ function InsertMillennium(type, props) {
                 InitializePlugins.toString(),
                 InitializePlugins.name + '()',
                 WrappedCallServerMethod,
-                WrappedCallable,
+                __wrapped_callable__.toString(),
                 generate(bundle[fileName].code),
                 ExecutePluginModule.toString(),
                 ExecutePluginModule.name + '()',
@@ -752,6 +757,7 @@ async function GetWebkitPluginComponents(props) {
             preventAssignment: true,
             'Millennium.callServerMethod': `__call_server_method__`,
             'webkit.callable': `__wrapped_callable__`,
+            'webkit.Millennium.exposeObj(': 'webkit.Millennium.exposeObj(exports, ',
             'client.BindPluginSettings()': 'client.BindPluginSettings(pluginName)',
         }),
         babel({
@@ -796,7 +802,7 @@ const TranspilerPluginComponent = async (bIsMillennium, pluginJson, props) => {
                 Logger.Error('The @steambrew/webkit module should not be included in the frontend module, use @steambrew/client instead. Please remove it from the frontend module and try again.');
                 process.exit(1);
             }
-            return id === '@steambrew/client' || id === 'react' || id === 'react-dom' || id === 'react-dom/client';
+            return id === '@steambrew/client' || id === 'react' || id === 'react-dom' || id === 'react-dom/client' || id === 'react/jsx-runtime';
         },
         output: {
             name: 'millennium_main',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steambrew/ttc",
-	"version": "2.8.5",
+	"version": "2.8.7",
 	"type": "module",
 	"main": "dist/index.js",
 	"module": "dist/index.js",

package/src/transpiler.ts

@@ -52,8 +52,24 @@ export interface TranspilerProps {
 	strPluginInternalName: string;
 }
 
+declare const MILLENNIUM_API: {
+	callable: (fn: Function, route: string) => any;
+	__INTERNAL_CALL_WEBKIT_METHOD__: (pluginName: string, methodName: string, kwargs: any) => any;
+};
+
+declare const __call_server_method__: (methodName: string, kwargs: any) => any;
 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)';
+
+function __wrapped_callable__(route: string) {
+	if (route.startsWith('webkit:')) {
+		return MILLENNIUM_API.callable(
+			(methodName: string, kwargs: any) => MILLENNIUM_API.__INTERNAL_CALL_WEBKIT_METHOD__(pluginName, methodName, kwargs),
+			route.replace(/^webkit:/, ''),
+		);
+	}
+
+	return MILLENNIUM_API.callable(__call_server_method__, route);
+}
 
 const ConstructFunctions = (parts: string[]): string => {
 	return parts.join('\n');
@@ -79,7 +95,7 @@ function InsertMillennium(type: ComponentType, props: TranspilerProps): InputPlu
 				InitializePlugins.toString(),
 				InitializePlugins.name + '()',
 				WrappedCallServerMethod,
-				WrappedCallable,
+				__wrapped_callable__.toString(),
 				generate(bundle[fileName].code),
 				ExecutePluginModule.toString(),
 				ExecutePluginModule.name + '()',
@@ -206,6 +222,7 @@ async function GetWebkitPluginComponents(props: TranspilerProps) {
 			preventAssignment: true,
 			'Millennium.callServerMethod': `__call_server_method__`,
 			'webkit.callable': `__wrapped_callable__`,
+			'webkit.Millennium.exposeObj(': 'webkit.Millennium.exposeObj(exports, ',
 			'client.BindPluginSettings()': 'client.BindPluginSettings(pluginName)',
 		}),
 		babel({
@@ -260,7 +277,7 @@ export const TranspilerPluginComponent = async (bIsMillennium: boolean, pluginJs
 				process.exit(1);
 			}
 
-			return id === '@steambrew/client' || id === 'react' || id === 'react-dom' || id === 'react-dom/client';
+			return id === '@steambrew/client' || id === 'react' || id === 'react-dom' || id === 'react-dom/client' || id === 'react/jsx-runtime';
 		},
 		output: {
 			name: 'millennium_main',