Electron support+r17

.github/workflows/ci-mmsd-demo.yml

@@ -3,10 +3,7 @@ name: CI build mmsd-demo
 on:
   push:
     branches:
-      - master
-      - develop
-  schedule:
-    - cron:  '0 2 * * *'
+      - mmsd-demo
   repository_dispatch:
     types: [ uxkit-mmsd-demo ]
 

frontend/electron-builder.yml

@@ -1,19 +1,23 @@
-appId: io.voxeet.app
-productName: Voxeet
+appId: io.dolby.app
+productName: Dolby.io
 buildVersion: local
 extends: null
 electronVersion: 9.2.0
+artifactName: ${productName}-${version}.${ext}
 
 extraMetadata:
   description: DesktopSDK_0bb26b73_v9.2.0
 
 files:
+  - dist/*.png
+  - dist/*.ico
   - dist/*.svg
   - dist/*.ttf
   - dist/sounds/*.mp3
   - dist/index.html
   - dist/bundle.js
   - dist/images
+  - dist/fonts
   - src/main.js
   - src/preload.js
   - node_modules/
@@ -50,10 +54,11 @@ mac:
 
 win:
   target: nsis
-  icon: dist/icon.png
+  icon: dist/favicon.ico
   certificateFile: /Users/dolbyvoice/cert_win/code_signing.pfx
   certificatePassword: ''
 
 squirrelWindows:
+  artifactName: ${productName}-${version}.${ext}
   iconUrl: >-
     https://raw.githubusercontent.com/voxeet/voxeet-io-web/master/public/icon.png

frontend/package.json

@@ -1,13 +1,14 @@
 {
-  "name": "voxeet-io",
-  "version": "1.0.0-beta.1",
+  "name": "dolby-io",
+  "description": "Dolby Interactivity API Desktop Showcase App",
+  "version": "1.0.0-beta.2",
   "private": true,
   "main": "src/main.js",
   "scripts": {
     "dist": "npm run build:electron && ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true build",
     "bootstrap": "yarn link @voxeet/voxeet-web-sdk && yarn link @voxeet/media-engine && yarn link @voxeet/react-components",
-    "start": "webpack-dev-server -d --hot --inline --content-base",
-    "build": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js --progress -p",
+    "start": "webpack serve --hot --inline",
+    "build": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js --progress",
     "get-version": "cross-env-shell echo ${npm_package_version}",
     "builde": "cross-env webpack --config webpack.config.electron.js --progress",
     "builde:prod": "cross-env DEBUG=true NODE_ENV=production yarn builde",
@@ -16,12 +17,12 @@
     "builde:bin": "cross-env yarn run electron-builder -c.electronDist=${NDS_RUNTIME:-../../NDS} -c.buildVersion=${CI_PIPELINE_ID:-local} --publish=never",
     "builde:bin:osx": "yarn builde:bin -- --macos --x64",
     "builde:bin:win": "yarn builde:bin -- --windows --x64",
-    "builde:prod:bin:osx": "yarn builde:bin:osx -- '-c.productName=Voxeet'",
-    "builde:prod:bin:win": "yarn builde:bin:win -- '-c.productName=Voxeet'",
-    "builde:staging:bin:osx": "yarn builde:bin:osx -- '-c.productName=Voxeet(staging)'",
-    "builde:staging:bin:win": "yarn builde:bin:win -- '-c.productName=Voxeet(staging)'",
-    "builde:dev-staging:bin:osx": "yarn builde:bin:osx -- '-c.productName=Voxeet(dev-staging)'",
-    "builde:dev-staging:bin:win": "yarn builde:bin:win -- '-c.productName=Voxeet(dev-staging)'"
+    "builde:prod:bin:osx": "yarn builde:bin:osx -- '-c.productName=dolby-io'",
+    "builde:prod:bin:win": "yarn builde:bin:win -- '-c.productName=dolby-io'",
+    "builde:staging:bin:osx": "yarn builde:bin:osx -- '-c.productName=dolby-io(staging)'",
+    "builde:staging:bin:win": "yarn builde:bin:win -- '-c.productName=dolby-io(staging)'",
+    "builde:dev-staging:bin:osx": "yarn builde:bin:osx -- '-c.productName=dolby-io(dev-staging)'",
+    "builde:dev-staging:bin:win": "yarn builde:bin:win -- '-c.productName=dolby-io(dev-staging)'"
   },
   "author": "Dolby",
   "contributors": [
@@ -32,57 +33,57 @@
     "IE 11"
   ],
   "dependencies": {
-    "@babel/polyfill": "^7.8.7",
-    "@trodi/electron-splashscreen": "^0.3.4",
-    "@voxeet/react-components": "file:../../voxeet-uxkit-react/",
-    "@voxeet/voxeet-web-sdk": "file:../../voxeet-sdk/packages/voxeet-web-sdk",
-    "axios": "^0.19.2",
-    "browserslist": "^4.5.2",
-    "core-js": "2",
+    "@babel/polyfill": "^7.12.1",
+    "@trodi/electron-splashscreen": "^1.0.0",
+    "@voxeet/react-components": "^3.2.3",
+    "@voxeet/voxeet-web-sdk": "^3.3.0",
+    "about-window": "^1.14.0",
+    "axios": "^0.21.1",
+    "browserslist": "^4.16.6",
+    "core-js": "^3.15.2",
     "electron-window-state": "^5.0.3",
-    "express": "^4.0.0",
-    "react": "16.9.0",
-    "react-dom": "16.9.0",
-    "react-localization": "^1.0.14",
-    "react-redux": "7.1.1",
-    "react-router-dom": "5.0.1",
-    "redux": "4.0.4",
-    "redux-thunk": "2.3.0"
+    "express": "^4.17.1",
+    "prettier": "^2.3.2",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-localization": "^1.0.17",
+    "react-redux": "^7.2.4",
+    "react-router-dom": "^5.2.0",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.3.0"
   },
   "resolutions": {
-    "react": "16.9.0",
-    "react-dom": "16.9.0"
+    "react": "17.0.2",
+    "react-dom": "17.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.4",
-    "@babel/preset-env": "^7.3.4",
-    "@babel/preset-react": "^7.0.0",
-    "babel-loader": "^8.0.5",
-    "copy-webpack-plugin": "^4.2.0",
-    "cross-env": "^7.0.2",
-    "css-loader": "^2.1.1",
+    "@babel/core": "^7.14.8",
+    "@babel/preset-env": "^7.14.8",
+    "@babel/preset-react": "^7.14.5",
+    "babel-loader": "^8.2.2",
+    "copy-webpack-plugin": "^9.0.1",
+    "cross-env": "^7.0.3",
+    "css-loader": "^6.2.0",
     "electron": "9.4.4",
-    "electron-builder": "^22.11.7",
+    "electron-builder": "^22.10.5",
     "electron-builder-squirrel-windows": "^22.10.5",
-    "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "file-loader": "^3.0.1",
-    "html-webpack-plugin": "^3.2.0",
-    "prettier": "^1.18.2",
-    "prettier-webpack-plugin": "^1.2.0",
-    "react-hot-loader": "^3.0.0-beta.7",
-    "style-loader": "^0.23.1",
-    "uglifyjs-webpack-plugin": "^1.1.5",
-    "url-loader": "^0.5.9",
-    "webpack": "^4.29.6",
-    "webpack-cli": "^3.2.0",
-    "webpack-dev-server": "^3.1.14"
+    "html-webpack-plugin": "^5.3.2",
+    "mini-css-extract-plugin": "^2.1.0",
+    "style-loader": "^3.2.1",
+    "terser-webpack-plugin": "^5.1.4",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.45.1",
+    "webpack-cli": "^4.7.2",
+    "webpack-dev-server": "^3.11.2"
   },
   "peerDependencies": {
     "express": "^4.0.0"
   },
   "files": [
     "../README.md",
     "dist/",
-    "src/preload.js"
+    "src/preload.js",
+    "public/icon.png",
+    "public/favicon.ico"
   ]
 }

frontend/public/index.html

@@ -10,7 +10,7 @@
     <link href="./favicon.ico" rel="icon" type="image/x-icon" />
     <meta name="theme-color" content="#000000" />
     <link rel="manifest" href="manifest.json" />
-    <title>Dolby.io</title>
+    <title>Dolby Interactivity API Desktop Showcase App</title>
     <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
     <script src="https://s3.amazonaws.com/voxeet-cdn/ie11/webrtc-ie-shim.js"></script>
     <base href="./" />

frontend/src/app/App.js

@@ -71,15 +71,14 @@ class App extends Component {
     };
     this.handleClick = this.handleClick.bind(this);
     this.handleChangeUserName = this.handleChangeUserName.bind(this);
-    this.handleChangeConferenceName = this.handleChangeConferenceName.bind(
-      this
-    );
+    this.handleChangeConferenceName = this.handleChangeConferenceName.bind(this);
     this.escFunction = this.escFunction.bind(this);
     this.toggleChangeListener = this.toggleChangeListener.bind(this);
     this.toggleWidgetMode = this.toggleWidgetMode.bind(this);
     this.toggleSimulcastMode = this.toggleSimulcastMode.bind(this);
     this.toggleDolbyVoice = this.toggleDolbyVoice.bind(this);
     this.toggleConfiguration = this.toggleConfiguration.bind(this);
+    this.title = document.title;
   }
 
   componentDidMount() {
@@ -147,6 +146,10 @@ class App extends Component {
     /*ReactDOM.unmountComponentAtNode(document.getElementById('voxeet-widget'));
     const oldConferenceName = this.state.conferenceName*/
     this.setState({ isSubmit: false, isDemo: false });
+    document.title=`${this.title}`;
+    if(this.props.handleLeave) {
+      this.props.handleLeave();
+    }
     /*this.props.history.push('/')
     window.location.reload()*/
   }
@@ -176,6 +179,7 @@ class App extends Component {
   }
 
   handleClick() {
+    document.title=`${this.title} - ${this.state.conferenceName}`;
     this.props.history.push("/" + this.state.conferenceName);
 
     /*if (VoxeetSdk.isElectron) { // TODO: Check if possible to integrate into the SDK