Merge pull request #227 from Azure-Samples/dmceachernmsft/1.15.0-updates

updates for 1.15.0

Calling/common.webpack.config.js

@@ -4,6 +4,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyPlugin = require('copy-webpack-plugin');
 
 const webpackConfig = (sampleAppDir, env, babelConfig) => {
   const config = {
@@ -40,6 +41,10 @@ const webpackConfig = (sampleAppDir, env, babelConfig) => {
         {
           test: /\.svg/,
           type: 'asset/inline'
+        },
+        {
+          test: /\.mp3$/,
+          loader: 'file-loader'
         }
       ]
     },
@@ -56,6 +61,12 @@ const webpackConfig = (sampleAppDir, env, babelConfig) => {
           require(path.resolve(sampleAppDir, 'package.json')).dependencies['@azure/communication-react']
         ),
         __BUILDTIME__: JSON.stringify(new Date().toLocaleString())
+      }),
+      new CopyPlugin({
+        patterns: [
+          { from: path.resolve(sampleAppDir, 'public/manifest.json'), to: 'manifest.json' },
+          { from: path.resolve(sampleAppDir, 'public/assets'), to: 'assets', noErrorOnMissing: true }
+        ]
       })
     ],
     devServer: {

Calling/package.json

@@ -22,7 +22,7 @@
     "@azure/communication-calling": "^1.23.2",
     "@azure/communication-common": "^2.3.0",
     "@azure/communication-identity": "^1.3.0",
-    "@azure/communication-react": "^1.14.0",
+    "@azure/communication-react": "^1.15.0",
     "@azure/core-util": "1.5.0",
     "@azure/logger": "^1.0.4",
     "@babel/preset-react": "^7.12.7",
@@ -39,8 +39,8 @@
     "react-router-dom": "^5.1.2",
     "reactstrap": "^8.4.1",
     "reselect": "~4.0.0",
-    "uuid": "^9.0.0",
-    "shake.js": "1.2.2"
+    "shake.js": "1.2.2",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@babel/core": "~7.16.0",
@@ -58,6 +58,7 @@
     "babel-jest": "^29.5.0",
     "babel-loader": "8.1.0",
     "concurrently": "^5.3.0",
+    "copy-webpack-plugin": "^12.0.2",
     "copyfiles": "^2.4.1",
     "cross-env": "~7.0.3",
     "css-loader": "~4.3.0",
@@ -84,8 +85,8 @@
     "ts-loader": "^8.0.12",
     "typescript": "^4.3.5",
     "url-loader": "~4.1.1",
-    "webpack": "5.76.0",
-    "webpack-cli": "^4.7.2",
+    "webpack": "5.89.0",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "4.8.1"
   }
 }

Calling/src/app/App.tsx

@@ -184,6 +184,7 @@ const getJoinParams = (locator: CallAdapterLocator): string => {
   if ('meetingLink' in locator) {
     return '?teamsLink=' + encodeURIComponent(locator.meetingLink);
   }
+
   if ('roomId' in locator) {
     return '?roomId=' + encodeURIComponent(locator.roomId);
   }

Calling/src/app/utils/AppUtils.test.ts

@@ -27,3 +27,4 @@ describe('ContosoUtils tests', () => {
   test('createRandomDisplayName should return a valid string for a user id', () =>
     expect(createRandomDisplayName()).toBeTruthy());
 });
+export {}; /*The above line is generated by conditional compilation, when no export detected after CC.*/

Calling/src/app/views/CallScreen.tsx

@@ -50,7 +50,6 @@ export const CallScreen = (props: CallScreenProps): JSX.Element => {
         console.log(`Call Id: ${callIdRef.current}`);
       }
     });
-    /* @conditional-compile-remove(call-transfer) */
     adapter.on('transferAccepted', (e) => {
       console.log('Call being transferred to: ' + e);
     });
@@ -99,6 +98,13 @@ const AzureCommunicationCallScreen = (props: AzureCommunicationCallScreenProps):
         callEnded: { url: '/assets/sounds/callEnded.mp3' },
         callRinging: { url: '/assets/sounds/callRinging.mp3' },
         callBusy: { url: '/assets/sounds/callBusy.mp3' }
+      },
+      reactionResources: {
+        likeReaction: { url: '/assets/reactions/likeEmoji.png', frameCount: 102 },
+        heartReaction: { url: '/assets/reactions/heartEmoji.png', frameCount: 102 },
+        laughReaction: { url: '/assets/reactions/laughEmoji.png', frameCount: 102 },
+        applauseReaction: { url: '/assets/reactions/clapEmoji.png', frameCount: 102 },
+        surprisedReaction: { url: '/assets/reactions/surprisedEmoji.png', frameCount: 102 }
       }
     };
   }, []);
@@ -133,6 +139,13 @@ const AzureCommunicationOutboundCallScreen = (props: AzureCommunicationCallScree
         callEnded: { url: '/assets/sounds/callEnded.mp3' },
         callRinging: { url: '/assets/sounds/callRinging.mp3' },
         callBusy: { url: '/assets/sounds/callBusy.mp3' }
+      },
+      reactionResources: {
+        likeReaction: { url: '/assets/reactions/likeEmoji.png', frameCount: 102 },
+        heartReaction: { url: '/assets/reactions/heartEmoji.png', frameCount: 102 },
+        laughReaction: { url: '/assets/reactions/laughEmoji.png', frameCount: 102 },
+        applauseReaction: { url: '/assets/reactions/clapEmoji.png', frameCount: 102 },
+        surprisedReaction: { url: '/assets/reactions/surprisedEmoji.png', frameCount: 102 }
       }
     };
   }, []);

Calling/src/index.tsx

@@ -21,3 +21,4 @@ createRoot(domNode).render(
     </SwitchableFluentThemeProvider>
   </React.StrictMode>
 );
+export {}; /*The above line is generated by conditional compilation, when no export detected after CC.*/