Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dependabot/npm_and_ya…
Browse files Browse the repository at this point in the history
…rn/Calling/follow-redirects-1.15.6
  • Loading branch information
JamesBurnside committed Oct 2, 2024
2 parents 62e60f1 + 2aab54f commit 76f1c0f
Show file tree
Hide file tree
Showing 26 changed files with 42,205 additions and 55,936 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v1

- name: Setup Node 16
- name: Setup Node 20
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '20'

- name: Setup Server dependencies
working-directory: ./Server
Expand Down
Binary file modified Calling/Media/homepage-sample-calling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Loading

0 comments on commit 76f1c0f

Please sign in to comment.