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

package/Readme.md

@@ -1,18 +1,23 @@
 # App builder core
+
 This repository is a part of [RTE app builder](https://appbuilder.agora.io).
 
 ## Development instructions
+
 1. Clone the repo
 
 2. Navigate into project directory and run:
-    ```
-    npm run dev-setup -- meeting
-    npm run dev-setup -- live-streaming
-    ```
-    This command will automatically set everything up for development
+   ```
+   npm run dev-setup -- meeting
+   npm run dev-setup -- live-streaming
+   npm run dev-setup -- voice-chat
+   npm run dev-setup -- audio-livecast
+   ```
+   This command will automatically set everything up for development
 
 To build react sdk using esbuild,
+
 1. Install the go compiler from https://go.dev/doc/install
 2. Run `go mod tidy` to download dependencies
 
-You can now build react sdk using esbuild through npm script 
+You can now build react sdk using esbuild through npm script

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "2.3.0-beta.2",
+  "version": "2.3.0-beta.22",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [
@@ -13,7 +13,7 @@
     "deps": "cd template && npm i",
     "dev-setup": "npm run uikit && npm run deps && node devSetup.js",
     "web-build": "cd template && npm run web:build && cd .. && npm run copy-vercel",
-    "copy-vercel": "cp vercel.json Builds/web",
+    "copy-vercel": "cp -r Builds/web template/dist && cp vercel.json template/dist",
     "pre-release": "cd template && cp package-lock.json _package-lock.json"
   },
   "author": {

package/template/Gulpfile.js

@@ -24,14 +24,33 @@ const WebpackDevServer = require('webpack-dev-server');
 const webpackConfig = require('./webpack.renderer.config');
 const webpackRsdkConfig = require('./webpack.rsdk.config');
 
-const BUILD_PATH =
-  process.env.TARGET === 'wsdk'
+const outPathArg = process.argv.indexOf('--outpath')
+getBuildPath = () => {
+  if (outPathArg == -1) {
+    return process.env.TARGET === 'wsdk'
     ? path.join(__dirname, '../Builds/web-sdk')
     : process.env.TARGET === 'rsdk'
     ? path.join(__dirname, '../Builds/react-sdk')
     : process.env.TARGET === 'android'
     ? path.join(__dirname, '../Builds/android')
     : path.join(__dirname, '../Builds/.electron');
+  } else {
+    return process.argv[outPathArg+1].split('/').slice(0, -1).join('/')
+  }
+}
+const BUILD_PATH = getBuildPath();
+const TS_DEFS_BUILD_PATH = process.env.TARGET === 'wsdk'
+? path.join(__dirname, '../Builds/ts-defs/web-sdk')
+: process.env.TARGET === 'rsdk'
+? path.join(__dirname, '../Builds/ts-defs/react-sdk')
+: process.env.TARGET === 'android'
+? path.join(__dirname, '../Builds/ts-defs/android')
+: path.join(__dirname, '../Builds/ts-defs/.electron');
+
+const pkgNameArg = process.argv.indexOf('--pkgname')
+const PACKAGE_NAME = pkgNameArg == -1
+  ?  'agora-app-builder-sdk'
+  : process.argv[pkgNameArg+1]
 
 let PRODUCT_NAME;
 
@@ -73,7 +92,7 @@ const general = {
     });
 
     let newPackage = {
-      name: 'agora-app-builder-sdk',
+      name: PACKAGE_NAME,
       version,
       private,
       author,
@@ -122,13 +141,33 @@ 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/'));
   },
   typescriptClean: () => {
     return del([`${path.join(BUILD_PATH, '../', '/')}*.d.ts`], {force: true});
   },
+  genTsDefs: (cb) => {
+    runCli(`mkdir -p ${TS_DEFS_BUILD_PATH} && cp ${BUILD_PATH}/index.d.ts ${TS_DEFS_BUILD_PATH}/index.d.ts`, cb);
+  },
+  useTsDefs: (cb) => {
+    runCli(`cp ${TS_DEFS_BUILD_PATH}/index.d.ts ${BUILD_PATH}/index.d.ts`, cb)
+  },
+  npmPack: (cb) => {
+    runCli(`cd ${BUILD_PATH} && npm pack`, cb)
+  }
 };
 
 const electron = {
@@ -167,7 +206,18 @@ const reactSdk = {
     runCli('webpack --config ./webpack.rsdk.config.js', cb);
   },
   esbuild: (cb) => {
-    runCli('go build -o ../esbuild-bin/rsdk ./esbuild.rsdk.go && ../esbuild-bin/rsdk', cb);
+    let outPath = '';
+    if (outPathArg != -1) {
+      outPath = ` --outpath ${process.argv[outPathArg+1]}`
+    }
+    let configTransformerPath = '';
+    const configTransformerPathArg = process.argv.indexOf('--configtransformerpath')
+    if (configTransformerPathArg != -1) {
+      configTransformerPath = ` --configtransformerpath ${process.argv[configTransformerPathArg+1]}`
+    }
+    let esbuildCmd = `go build -o ../esbuild-bin/rsdk ./esbuild.rsdk.go && ../esbuild-bin/rsdk${outPath}${configTransformerPath}`
+    console.log(esbuildCmd)
+    runCli(esbuildCmd, cb);
   },
   typescript: (cb) => {
     runCli(
@@ -189,9 +239,6 @@ const reactSdk = {
       .pipe(replace('"fpe-api"', '"fpe-api/index"'))
       .pipe(header('// @ts-nocheck\n'))
       .pipe(dest(BUILD_PATH));
-  },
-  npmPack: (cb) => {
-    runCli('cd ../Builds/react-sdk && npm pack',cb)
   }
 };
 
@@ -284,7 +331,7 @@ module.exports.reactSdk = series(
   reactSdk.typescript,
   reactSdk.typescriptFix,
   general.typescriptClean,
-  reactSdk.npmPack,
+  general.npmPack,
 );
 
 // react-sdk-esbuild
@@ -298,7 +345,31 @@ module.exports.reactSdkEsbuild = series (
   reactSdk.typescript,
   reactSdk.typescriptFix,
   general.typescriptClean,
-  reactSdk.npmPack,
+  general.npmPack,
+)
+
+// generate typescript definitions
+module.exports.makeRsdkTsDefs = series (
+  general.clean,
+  general.createBuildDirectory,
+  general.packageJson,
+  reactSdk.esbuild,
+  general.typescript,
+  general.typescriptFix,
+  reactSdk.typescript,
+  reactSdk.typescriptFix,
+  general.typescriptClean,
+  general.genTsDefs,
+)
+
+// react-sdk-esbuild with cached type definitions
+module.exports.reactSdkEsbuildCachedTsc = series (
+  general.clean,
+  general.createBuildDirectory,
+  general.packageJson,
+  reactSdk.esbuild,
+  general.useTsDefs,
+  general.npmPack,
 )
 
 // web-sdk
@@ -316,13 +387,41 @@ module.exports.webSdk = series(
       general.typescriptClean,
     ),
   ),
-  webSdk.npmPack,
+  general.npmPack,
+);
+
+module.exports.makeWsdkTsDefs = series(
+  general.clean,
+  general.createBuildDirectory,
+  general.packageJson,
+  parallel(
+    webSdk.webpack,
+    series(
+      general.typescript,
+      general.typescriptFix,
+      webSdk.typescript,
+      webSdk.typescriptFix,
+      general.typescriptClean,
+    ),
+  ),
+  general.genTsDefs,
+);
+
+module.exports.webSdkCachedTsc = series(
+  general.clean,
+  general.createBuildDirectory,
+  general.packageJson,
+  parallel(
+    webSdk.webpack,
+    general.useTsDefs,
+  ),
+  general.npmPack,
 );
 
 module.exports.androidUnix = series(
   general.clean,
   general.createBuildDirectory,
-  // android.gradleBuildUnix,
+  android.gradleBuildUnix,
   android.copyBuild,
 );
 
@@ -334,7 +433,7 @@ module.exports.androidWin = series(
 );
 
 module.exports.test = series(
-  reactSdk.npmPack,
+  general.npmPack,
   // general.typescript,
   // general.typescriptFix,
   // reactSdk.typescript,