Skip to content

Commit

Permalink
updates for 1.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dmceachernmsft committed Apr 15, 2024
1 parent 0a4ee48 commit 105e116
Show file tree
Hide file tree
Showing 16 changed files with 2,315 additions and 1,733 deletions.
11 changes: 11 additions & 0 deletions Calling/common.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -40,6 +41,10 @@ const webpackConfig = (sampleAppDir, env, babelConfig) => {
{
test: /\.svg/,
type: 'asset/inline'
},
{
test: /\.mp3$/,
loader: 'file-loader'
}
]
},
Expand All @@ -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: {
Expand Down
3,643 changes: 1,954 additions & 1,689 deletions Calling/package-lock.json

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions Calling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}
Binary file added Calling/public/assets/reactions/clapEmoji.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calling/public/assets/reactions/heartEmoji.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calling/public/assets/reactions/laughEmoji.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calling/public/assets/reactions/likeEmoji.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Calling/src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions Calling/src/app/utils/AppUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.*/
2 changes: 1 addition & 1 deletion Calling/src/app/utils/AppUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ declare let __CALLINGVERSION__: string; // Injected by webpack
export const callingSDKVersion = __CALLINGVERSION__;

declare let __COMMUNICATIONREACTVERSION__: string; //Injected by webpack
export const communicationReactSDKVersion = __COMMUNICATIONREACTVERSION__;
export const communicationReactSDKVersion = __COMMUNICATIONREACTVERSION__;

Check failure on line 119 in Calling/src/app/utils/AppUtils.ts

View workflow job for this annotation

GitHub Actions / Run clean code tests on frontend

Insert `␍⏎`
Loading

0 comments on commit 105e116

Please sign in to comment.