agora-toolchain 3.5.0 → 3.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-toolchain",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "license": "MIT",
   "bin": {
     "agora-tc-transpile": "./scripts/transpile.js",
@@ -52,6 +52,7 @@
     "dotenv": "^16.3.1",
     "electron-builder": "^24.13.3",
     "html-webpack-plugin": "^5.6.0",
+    "copy-webpack-plugin": "9.0.1",
     "karma": "^6.4.2",
     "karma-chrome-launcher": "^3.2.0",
     "karma-jasmine": "^5.1.0",

package/presets/webpack.dev.js

@@ -159,7 +159,7 @@ module.exports = createConfig = ({ entry, port = 3000, analyze }) => {
     devServer: {
       static: [
         {
-          directory: resolveCwd('public'),
+          directory: resolveAtBaseModule('public'),
           publicPath: '/',
         },
       ],

package/presets/webpack.prod.js

@@ -1,5 +1,6 @@
 const webpackMerge = require('webpack-merge');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
@@ -154,6 +155,22 @@ module.exports = createConfig = ({ entry, analyze, out = 'dist' }) => {
       new MiniCssExtractPlugin({
         filename: '[name].[contenthash].css',
       }),
+      new CopyWebpackPlugin({
+        patterns: [
+          // ai denoiser
+          {
+            from: resolveAtBaseModule('public/assets'),
+            to: resolveCwd('dist/assets'),
+            noErrorOnMissing: true,
+          },
+          //virtual background
+          {
+            from: resolveAtBaseModule('public/extensions'),
+            to: resolveCwd('dist/extensions'),
+            noErrorOnMissing: true,
+          },
+        ],
+      }),
       ...htmlPlugins,
       ...codeAppendPlugins,
       ...otherPlugins,

package/scripts/pack-client-app.js

@@ -36,18 +36,6 @@ const options = {
       await notarizeMac(context);
     }
   },
-  //   artifactBuildStarted: (context) => {
-  //     identifyLinuxPackage(context);
-  //   },
-  //   afterAllArtifactBuild: (buildResult) => {
-  //     return stampArtifacts(buildResult);
-  //   },
-  // force arch build if using electron-rebuild
-  //   beforeBuild: async (context) => {
-  //     const { appDir, electronVersion, arch } = context;
-  //     await electronRebuild.rebuild({ buildPath: appDir, electronVersion, arch });
-  //     return false;
-  //   },
   nodeGypRebuild: false,
   buildDependenciesFromSource: false,
   extraMetadata: {
@@ -73,29 +61,23 @@ const options = {
           },
         ]
     : [
+        // 内置资源
         {
-          from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/pretest.mp3'),
-          to: 'assets/pretest.mp3',
+          from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/sound_effects/'),
+          to: 'assets/sound_effects/',
+        },
+        {
+          from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/images/'),
+          to: 'assets/images/',
+        },
+        {
+          from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/videos/'),
+          to: 'assets/videos/',
         },
       ],
   files: cpp
     ? ['!**/node_modules/agora-electron-sdk/**/*', '!**/artifactory_deps/**/*']
     : ['**/*', '!**/artifactory_deps/**/*'],
-  // files: [
-  //   // 'node_modules//**/*',
-  //   {
-  //     from: 'node_modules/agora-toolchain/lib/index.js',
-  //     to: 'index.js',
-  //   },
-  // ],
-  // extraResources: [webRoot, electronRoot],
-  //   extraFiles: [
-  //     {
-  //       from: resolveCwd('build/Release'),
-  //       to: nodeAddonDir,
-  //       filter: '*.node',
-  //     },
-  //   ],
   win: {
     icon: resolveCwd('installer/icons/favicon.png'),
     target: 'nsis',
@@ -103,8 +85,6 @@ const options = {
   nsis: {
     shortcutName: 'FcrMeeting',
     installerIcon: resolveCwd('installer/icons/favicon.ico'),
-    // deleteAppDataOnUninstall: true,
-    // include: 'installer/win/nsis-installer.nsh',
   },
   mac: {
     target: 'dmg',
@@ -124,7 +104,6 @@ const options = {
     },
   },
   dmg: {
-    // background: resolveCwd('installer/mac/dmg-background.png'),
     contents: [
       {
         x: 130,
@@ -137,11 +116,6 @@ const options = {
         path: '/Applications',
       },
     ],
-    // iconSize: 100,
-    // window: {
-    //   width: 500,
-    //   height: 500,
-    // },
   },
 };
 

package/scripts/pack-client-sdk.js

@@ -41,19 +41,13 @@ if (fs.existsSync(resolveCwd('public/assets'))) {
   copyDirSync(resolveCwd('public/assets'), resolveCwd('dist/assets'));
 }
 
-// fs.copyFileSync(resolveCwd('public/assets/loading.gif'), resolveCwd('dist/assets/loading.gif'));
-// fs.copyFileSync(
-//   resolveCwd('public/assets/fcr_leave2.svg'),
-//   resolveCwd('dist/assets/fcr_leave2.svg'),
-// );
-
 // Let's get that intellisense working
 /**
  * @type {import('electron-builder').Configuration}
  * @see https://www.electron.build/configuration/configuration
  */
 const options = {
-  appId: 'io.agora.meeting',
+  appId: 'io.agora.meeting.core',
   protocols: {
     name: 'fcr-meeting',
     // Don't forget to set `MimeType: "x-scheme-handler/deeplink"` for `linux.desktop` entry!
@@ -70,18 +64,6 @@ const options = {
       await notarizeMac(context);
     }
   },
-  //   artifactBuildStarted: (context) => {
-  //     identifyLinuxPackage(context);
-  //   },
-  //   afterAllArtifactBuild: (buildResult) => {
-  //     return stampArtifacts(buildResult);
-  //   },
-  // force arch build if using electron-rebuild
-  //   beforeBuild: async (context) => {
-  //     const { appDir, electronVersion, arch } = context;
-  //     await electronRebuild.rebuild({ buildPath: appDir, electronVersion, arch });
-  //     return false;
-  //   },
   nodeGypRebuild: false,
   buildDependenciesFromSource: false,
   extraMetadata: {
@@ -95,28 +77,25 @@ const options = {
     buildResources: resolveCwd('installer/resources'),
   },
   files: ['!**/artifactory_deps/**/*'],
-  // files: [
-  //   // 'node_modules//**/*',
-  //   {
-  //     from: 'node_modules/agora-toolchain/lib/index.js',
-  //     to: 'index.js',
-  //   },
-  // ],
   extraResources: [
+    // 内置资源
+    {
+      from: resolveCwd('public/assets/electron/sound_effects/'),
+      to: 'assets/sound_effects/',
+    },
+    {
+      from: resolveCwd('public/assets/electron/images/'),
+      to: 'assets/images/',
+    },
     {
-      from: resolveCwd('public/assets/pretest.mp3'),
-      to: 'assets/pretest.mp3',
+      from: resolveCwd('public/assets/electron/videos/'),
+      to: 'assets/videos/',
     },
     {
       from: resolveCwd('public/assets/loading.gif'),
       to: 'assets/loading.gif',
     },
   ],
-  // extraFiles: [
-  //   {
-  //     from: resolveCwd('public/assets'),
-  //   },
-  // ],
   win: {
     icon: resolveCwd('installer/icons/favicon.png'),
     target: 'nsis',
@@ -124,8 +103,6 @@ const options = {
   nsis: {
     shortcutName: 'FcrMeeting',
     installerIcon: resolveCwd('installer/icons/favicon.ico'),
-    // deleteAppDataOnUninstall: true,
-    // include: 'installer/win/nsis-installer.nsh',
   },
   mac: {
     target: 'dmg',
@@ -141,7 +118,6 @@ const options = {
     },
   },
   dmg: {
-    // background: resolveCwd('installer/mac/dmg-background.png'),
     contents: [
       {
         x: 130,
@@ -154,11 +130,6 @@ const options = {
         path: '/Applications',
       },
     ],
-    // iconSize: 100,
-    // window: {
-    //   width: 500,
-    //   height: 500,
-    // },
   },
 };