agora-toolchain 3.6.4 → 3.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-toolchain",
-  "version": "3.6.4",
+  "version": "3.7.1",
   "license": "MIT",
   "bin": {
     "agora-tc-transpile": "./scripts/transpile.js",

package/presets/webpack.base.js

@@ -45,6 +45,7 @@ module.exports = {
     electron: 'commonjs2 electron',
     winston: 'commonjs2 winston',
     'node:fs': 'commonjs2 node:fs',
+    'node:fs/promises': 'commonjs2 node:fs/promises',
     fs: 'commonjs2 fs',
     'node:path': 'commonjs2 node:path',
     path: 'commonjs2 path',

package/presets/webpack.dev.js

@@ -110,7 +110,7 @@ module.exports = createConfig = ({ entry, port = 3000, analyze }) => {
       codeAppendPlugins.push(
         new AppendCodePlugin({
           code: `window.runtime && window.runtime.setFragmentOptions('${fragment}', ${windowOptions} || {}, ${webPreferences} || {});`,
-          patterns: [/main.js$/, ...fragments.map((f) => new RegExp(`${f}.js$`))],
+          patterns: [/main.[0-9a-f]{20}.js$/, ...fragments.map((f) => new RegExp(`${f}.[0-9a-f]{20}.js$`))],
         }),
       );
 
@@ -139,7 +139,7 @@ module.exports = createConfig = ({ entry, port = 3000, analyze }) => {
                   window.module.paths.unshift(${normalizedNodeModulePath});
                 }
               `,
-        patterns: [/main.js$/, ...fragments.map((f) => new RegExp(`${f}.js$`))],
+        patterns: [/main.[0-9a-f]{20}.js$/, ...fragments.map((f) => new RegExp(`${f}.[0-9a-f]{20}.js$`))],
       }),
     );
   }
@@ -156,6 +156,41 @@ module.exports = createConfig = ({ entry, port = 3000, analyze }) => {
     mode: 'development',
     devtool: 'eval-source-map',
     entry: entries,
+    output: {
+      filename: '[name].[contenthash].js',
+      chunkFilename: '[name].[contenthash].chunk.js',
+    },
+    optimization: {
+      splitChunks: {
+        chunks: 'all',
+        cacheGroups: {
+          // 第三方库分包
+          vendor: {
+            test: /[\\/]node_modules[\\/]/,
+            name: 'vendors',
+            chunks: 'all',
+            priority: 10,
+          },
+          // React相关库单独分包
+          react: {
+            test: /[\\/]node_modules[\\/](react|react-dom|@hot-loader\/react-dom)[\\/]/,
+            name: 'react',
+            chunks: 'all',
+            priority: 20,
+          },
+          // Agora相关库单独分包
+          agora: {
+            test: /[\\/]node_modules[\\/](agora-foundation|agora-ui-foundation|agora-rte-sdk|fcr-core)[\\/]/,
+            name: 'agora',
+            chunks: 'all',
+            priority: 20,
+          },
+        },
+      },
+      runtimeChunk: {
+        name: 'runtime',
+      },
+    },
     devServer: {
       static: [
         {

package/presets/webpack.prod.js

@@ -99,7 +99,7 @@ module.exports = createConfig = ({ entry, analyze, out = 'dist' }) => {
       codeAppendPlugins.push(
         new AppendCodePlugin({
           code: `window.runtime && window.runtime.setFragmentOptions('${fragment}', ${windowOptions} || {}, ${webPreferences} || {});`,
-          patterns: [/main.js$/, ...fragments.map((f) => new RegExp(`${f}.js$`))],
+          patterns: [/main.[0-9a-f]{20}.js$/, ...fragments.map((f) => new RegExp(`${f}.[0-9a-f]{20}.js$`))],
         }),
       );
 
@@ -136,9 +136,72 @@ module.exports = createConfig = ({ entry, analyze, out = 'dist' }) => {
         type: 'umd',
       },
       path: resolveCwd(out),
+      filename: '[name].[contenthash].js',
+      chunkFilename: '[name].[contenthash].chunk.js',
       // path: resolveCwd('dist'),
       // filename: '[name].[contenthash].bundle.js',
     },
+    optimization: {
+      splitChunks: {
+        chunks: 'all',
+        cacheGroups: {
+          // 第三方库分包
+          vendor: {
+            test: /[\\/]node_modules[\\/]/,
+            name: 'vendors',
+            chunks: 'all',
+            priority: 10,
+          },
+          rtc: {
+            test: /[\\/]node_modules[\\/](agora-rtc-sdk-ng)[\\/]/,
+            name: 'agoraRTCNg',
+            chunks: 'all',
+            priority: 20,
+          },
+          rtm: {
+            test: /[\\/]node_modules[\\/](agora-rtm)[\\/]/,
+            name: 'agoraRTM',
+            chunks: 'all',
+            priority: 20,
+          },
+          virtualBackground: {
+            test: /[\\/]node_modules[\\/](agora-extension-virtual-background)[\\/]/,
+            name: 'virtualBackground',
+            chunks: 'all',
+            priority: 20,
+          },
+          denoise: {
+            test: /[\\/]node_modules[\\/](agora-extension-ai-denoise)[\\/]/,
+            name: 'denoise',
+            chunks: 'all',
+            priority: 20,
+          },
+          beauty: {
+            test: /[\\/]node_modules[\\/](agora-extension-beauty-effect)[\\/]/,
+            name: 'beauty',
+            chunks: 'all',
+            priority: 20,
+          },
+          // React相关库单独分包
+          react: {
+            test: /[\\/]node_modules[\\/](react|react-dom|@hot-loader\/react-dom)[\\/]/,
+            name: 'react',
+            chunks: 'all',
+            priority: 20,
+          },
+          // Agora相关库单独分包
+          agora: {
+            test: /[\\/]node_modules[\\/](agora-foundation|agora-ui-foundation|agora-rte-sdk|fcr-core)[\\/]/,
+            name: 'agora',
+            chunks: 'all',
+            priority: 20,
+          },
+        },
+      },
+      runtimeChunk: {
+        name: 'runtime',
+      },
+    },
     module: {
       rules: [
         {
@@ -154,6 +217,7 @@ module.exports = createConfig = ({ entry, analyze, out = 'dist' }) => {
     plugins: [
       new MiniCssExtractPlugin({
         filename: '[name].[contenthash].css',
+        chunkFilename: '[name].[contenthash].chunk.css',
       }),
       new CopyWebpackPlugin({
         patterns: [

package/scripts/pack-client-app.js

@@ -93,9 +93,9 @@ const options = {
     // gatekeeperAssess: true,
     entitlements: resolveCwd('installer/mac/entitlements.mac.plist'),
     extendInfo: {
-      NSMicrophoneUsageDescription: 'Fcr Meeting wants to acquire your microphone permission',
-      NSCameraUsageDescription: 'Fcr Meeting wants to acquire your camera permission',
-      NSScreenCaptureDescription: 'Fcr Meeting wants to acquire your screen capture permission',
+      NSMicrophoneUsageDescription: 'This app wants to acquire your microphone permission',
+      NSCameraUsageDescription: 'This app wants to acquire your camera permission',
+      NSScreenCaptureDescription: 'This app wants to acquire your screen capture permission',
       'com.apple.security.device.audio-input': true,
       'com.apple.security.cs.allow-jit': true,
       'com.apple.security.cs.allow-unsigned-executable-memory': true,

package/scripts/pack-client-sdk.js

@@ -76,7 +76,31 @@ const options = {
     output: resolveCwd('release'),
     buildResources: resolveCwd('installer/resources'),
   },
-  files: ['!**/artifactory_deps/**/*', '!**/mac-release/**/*'],
+  files: [
+    'dist/**/*',
+    '!**/artifactory_deps/**/*',
+    '!**/mac-release/**/*',
+    '!**/scr/**/*',
+    "!**/node_modules/**/{CHANGELOG.md,README.md,README,readme.md,README.zh.md}",
+    "!**/node_modules/**/{nodemon.json,rollup.config.js,tsconfig.json,typedoc.json,rc_message.proto}",
+    "!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
+    "!**/node_modules/.bin",
+    "!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}",
+    "!.editorconfig",
+    "!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}",
+    "!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
+    "!**/{appveyor.yml,.travis.yml,circle.yml}",
+    "!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}",
+    "!**/*.dSYM",
+    "!**/*.{lproj}",
+    "!**/*.config.js",
+    "!**/*.config.ts",
+    "!**/*.config.json",
+    "!**/*.config.yaml",
+    "!**/*.config.yml",
+    "!**/*.config.xml",
+    "!**/*.config.html",
+  ],
   extraResources: [
     // 内置资源
     {
@@ -111,9 +135,9 @@ const options = {
     // gatekeeperAssess: true,
     entitlements: resolveCwd('installer/mac/entitlements.mac.plist'),
     extendInfo: {
-      NSMicrophoneUsageDescription: 'Fcr Meeting wants to acquire your microphone permission',
-      NSCameraUsageDescription: 'Fcr Meeting wants to acquire your camera permission',
-      NSScreenCaptureDescription: 'Fcr Meeting wants to acquire your screen capture permission',
+      NSMicrophoneUsageDescription: 'This app wants to acquire your microphone permission',
+      NSCameraUsageDescription: 'This app wants to acquire your camera permission',
+      NSScreenCaptureDescription: 'This app wants to acquire your screen capture permission',
       LSUIElement: 1,
     },
   },

package/tools/process-utils.js

@@ -2,11 +2,14 @@ const { spawn } = require('child_process');
 const os = require('os');
 
 const _spawn = (cmd, args, options) => {
+  const presetOptions = {};
+
   if (os.platform() === 'win32') {
     cmd = `${cmd}.cmd`;
+    presetOptions.shell = true;
   }
 
-  return spawn(cmd, args, options);
+  return spawn(cmd, args, { ...presetOptions, ...options });
 };
 
 module.exports = {