agora-appbuilder-core 2.3.0-beta.21 → 2.3.0-beta.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "2.3.0-beta.21",
+  "version": "2.3.0-beta.22",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/Gulpfile.js

@@ -141,7 +141,18 @@ const general = {
     );
   },
   typescriptFix: () => {
-    return src('../Builds/fpe-api.d.ts')
+    return src(['../Builds/fpe-api.d.ts', './global.d.ts'])
+      .pipe(concat('./fpe-api.d.ts'))
+      .pipe(
+        replace(
+          `declare var $config: ConfigInterface;
+declare module 'test-fpe' {
+  const data: {};
+  export default data;
+}`,
+          ' ',
+        ),
+      )
       .pipe(replace('"agora-rn-uikit"', '"agora-rn-uikit/src/index"'))
       .pipe(dest('../Builds/'));
   },

package/template/index.rsdk.tsx

@@ -12,16 +12,27 @@
 /**
  * @format
  */
-import SDKAppWrapper,{AppBuilderSdkApi,AppBuilderSdkApiInterface} from './src/SDKAppWrapper';
+import SDKAppWrapper, {
+  AppBuilderSdkApi,
+  AppBuilderSdkApiInterface,
+} from './src/SDKAppWrapper';
 import React from 'react';
+import * as RN from 'react-native-web';
+import jsonFile from './config.json';
+
 export * from 'fpe-api';
+export * from 'fpe-implementation';
 
 interface AppBuilderReactSdkInterface extends AppBuilderSdkApiInterface {
   View: React.FC;
 }
 
 const AppBuilderReactSdkApi: AppBuilderReactSdkInterface = {
-    ...AppBuilderSdkApi,
-    View: SDKAppWrapper,
-  }
+  ...AppBuilderSdkApi,
+  View: SDKAppWrapper,
+};
+
+let config: ConfigInterface = jsonFile as unknown as ConfigInterface;
+
+export {React, RN, config};
 export default AppBuilderReactSdkApi;

package/template/index.wsdk.tsx

@@ -1,9 +1,16 @@
 import {AppRegistry} from 'react-native';
-import SDKAppWrapper,{AppBuilderSdkApi,AppBuilderSdkApiInterface} from './src/SDKAppWrapper';
+import SDKAppWrapper, {
+  AppBuilderSdkApi,
+  AppBuilderSdkApiInterface,
+} from './src/SDKAppWrapper';
+import React from 'react';
+import * as RN from 'react-native-web';
+import jsonFile from './config.json';
+
 export * from 'fpe-api';
+export * from 'fpe-implementation';
 
-interface AppBuilderWebSdkInterface extends AppBuilderSdkApiInterface {
-}
+interface AppBuilderWebSdkInterface extends AppBuilderSdkApiInterface {}
 
 const AppBuilderWebSdkApi: AppBuilderWebSdkInterface = AppBuilderSdkApi;
 
@@ -24,4 +31,7 @@ class AppBuilder extends HTMLElement {
 
 customElements.define('app-builder', AppBuilder);
 
+let config: ConfigInterface = jsonFile as unknown as ConfigInterface;
+
+export {React, RN, config};
 export default AppBuilderWebSdkApi;

package/template/src/SDKAppWrapper.tsx

@@ -50,7 +50,7 @@ const SDKAppWrapper = () => {
   const [fpe, setFpe] = useState(fpeConfig);
   useEffect(() => {
     SDKEvents.on('addFpe', (sdkFpeConfig) => {
-      console.log('DEBUG(aditya)-SDKEvents: addFpe event called');
+      console.log('SDKEvents: addFpe event called');
       setFpe(sdkFpeConfig);
     });
     // Join event consumed in Create.tsx

package/template/src/pages/Create.tsx

@@ -30,6 +30,7 @@ import useJoinMeeting from '../utils/useJoinMeeting';
 import SDKEvents from '../utils/SdkEvents';
 import {MeetingInfoDefaultValue} from '../components/meeting-info/useMeetingInfo';
 import {useSetMeetingInfo} from '../components/meeting-info/useSetMeetingInfo';
+import useNavigateTo from '../utils/useNavigateTo';
 
 const Create = () => {
   const {CreateComponent} = useFpe((data) => {
@@ -64,6 +65,7 @@ const Create = () => {
   const {
     meetingPassphrase: {attendee, host, pstn},
   } = useMeetingInfo();
+  const navigateTo = useNavigateTo();
   //commented for v1 release
   // const createdText = useString('meetingCreatedNotificationLabel')();
   // const hostControlsToggle = useString<boolean>('hostControlsToggle');
@@ -91,9 +93,10 @@ const Create = () => {
     }
     SDKEvents.on('joinMeetingWithPhrase', (phrase) => {
       console.log(
-        'DEBUG(aditya)-SDKEvents: joinMeetingWithPhrase event called',
+        'SDKEvents: joinMeetingWithPhrase event called', phrase
       );
-      useJoin(phrase);
+      setMeetingInfo(MeetingInfoDefaultValue);
+      navigateTo(phrase)
     });
     return () => {
       SDKEvents.off('joinMeetingWithPhrase');

package/template/src/utils/SdkEvents.ts

@@ -46,7 +46,7 @@ const SDKEvents: SDKEventsInterface = {
   },
   on: function (eventName, cb) {
     console.log(
-      'DEBUG(aditya)-SDKEvents: event registered:',
+      'SDKEvents: event registered:',
       eventName,
     );
     this.eventsMap[eventName] = cb;
@@ -55,12 +55,12 @@ const SDKEvents: SDKEventsInterface = {
     }
   },
   emit: function (eventName, ...args) {
-    console.log('DEBUG(aditya)-SDKEvents: emit called:', eventName, ...args);
+    console.log('SDKEvents: emit called:', eventName, ...args);
     this.eventsMap[eventName](...args);
     this.eventSubs[eventName] = args;
   },
   off: function (eventName) {
-    console.log('DEBUG(aditya)-SDKEvents: event deregistered:', eventName);
+    console.log('SDKEvents: event deregistered:', eventName);
     this.eventSubs[eventName] = null;
   },
 };

package/template/webpack.rsdk.config.js

@@ -16,6 +16,7 @@ module.exports = merge(commons, {
     'react-router': 'react-router',
     'react-router-dom': 'react-router-dom',
     '@apollo/client': '@apollo/client',
+    nanoid: 'nanoid',
   },
   // Main entry point for the web application
   entry: {
@@ -25,9 +26,9 @@ module.exports = merge(commons, {
   output: {
     path: path.resolve(__dirname, `../Builds/react-sdk`),
     filename: 'index.js',
-    library:{
+    library: {
       type: 'commonjs2',
-    } 
+    },
   },
   // watch: isDevelopment
 });

package/template/webpack.wsdk.config.js

@@ -20,7 +20,6 @@ const baseConfig = {
       name: 'AgoraAppBuilder',
     },
   },
-  watch: isDevelopment
 };
 
 const mappedConfigs = libraryTargets.map((target, _) => {