Merge pull request #90 from zoom/3.5.1

3.5.1
zoom · Mar 13, 2024 · 86519b4 · 86519b4
2 parents fa0a39a + 0254e11
commit 86519b4
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 55 deletions.
diff --git a/CDN/corp.js b/CDN/corp.js
@@ -19,12 +19,13 @@ new WebpackDevServer(
     port: 9999,
     host: '0.0.0.0',
     open: https ? 'https://localhost:9999/' : 'http://127.0.0.1:9999/',
-    https: https
-      ? {
-          cert: fs.readFileSync('./localhost.crt'),
+    server: {
+      type: https ? 'https' : 'http',
+      options: {
+        cert: fs.readFileSync('./localhost.crt'),
           key: fs.readFileSync('./localhost.key')
-        }
-      : false,
+      },
+    },
     headers: {
       'Cross-Origin-Resource-Policy': 'cross-origin'
     },

diff --git a/CDN/index.html b/CDN/index.html
@@ -5,6 +5,7 @@
     <meta charset="utf-8" />
     <meta name="format-detection" content="telephone=no">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.5.1/css/bootstrap.css" />
 
 </head>
 
@@ -60,7 +61,7 @@
             <div id="navbar" class="websdktest">
                 <form class="navbar-form navbar-right" id="meeting_form">
                     <div class="form-group">
-                        <input type="text" name="display_name" id="display_name" value="3.1.6#CDN" maxLength="100"
+                        <input type="text" name="display_name" id="display_name" value="3.5.1#CDN" maxLength="100"
                             placeholder="Name" class="form-control" required>
                     </div>
                     <div class="form-group">
@@ -140,12 +141,12 @@
         })
     </script>
 
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/react.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/react-dom.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/redux.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/redux-thunk.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/lodash.min.js"></script>
-    <script src="https://source.zoom.us/zoom-meeting-3.1.6.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/react.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/react-dom.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/redux.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/redux-thunk.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/lodash.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/zoom-meeting-3.5.1.min.js"></script>
     <script src="js/tool.js"></script>
     <script src="js/vconsole.min.js"></script>
     <script src="js/index.js"></script>

diff --git a/CDN/js/meeting.js b/CDN/js/meeting.js
@@ -51,7 +51,7 @@ function websdkready() {
   // it's option if you want to change the MeetingSDK-Web dependency link resources. setZoomJSLib must be run at first
   // ZoomMtg.setZoomJSLib("https://source.zoom.us/{VERSION}/lib", "/av"); // default, don't need call it
   if (meetingConfig.china)
-    ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.1.6/lib", "/av"); // china cdn option
+    ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.5.1/lib", "/av"); // china cdn option
 
   ZoomMtg.preLoadWasm();
   ZoomMtg.prepareWebSDK();

diff --git a/CDN/meeting.html b/CDN/meeting.html
@@ -9,12 +9,12 @@
 </head>
 
 <body>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/react.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/react-dom.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/redux.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/redux-thunk.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/lodash.min.js"></script>
-    <script src="https://source.zoom.us/zoom-meeting-3.1.6.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/react.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/react-dom.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/redux.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/redux-thunk.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/lodash.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/zoom-meeting-3.5.1.min.js"></script>
     <script src="js/tool.js"></script>
     <script src="js/vconsole.min.js"></script>
     <script src="js/meeting.js"></script>

diff --git a/CDN/package.json b/CDN/package.json
@@ -1,6 +1,6 @@
 {
   "name": "websdk-cdn",
-  "version": "3.1.6",
+  "version": "3.5.1",
   "description": "Zoom sample app for MeetingSDK-Web client view",
   "main": "index.js",
   "scripts": {
@@ -11,8 +11,8 @@
   "author": "Zoom Video Communications, Inc.",
   "license": "SEE LICENSE IN LICENSE.md",
   "devDependencies": {
-    "webpack": "^5.89.0",
+    "webpack": "^5.90.3",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "4.15.1"
+    "webpack-dev-server": "^5.0.2"
   }
 }
diff --git a/Components/package.json b/Components/package.json
@@ -1,12 +1,12 @@
 {
   "name": "websdk-component-demo",
-  "version": "3.1.6",
+  "version": "3.5.1",
   "private": true,
   "dependencies": {
-    "@zoom/meetingsdk": "3.1.6",
-    "jsrsasign": "^10.9.0",
+    "@zoom/meetingsdk": "3.5.1",
+    "jsrsasign": "11.1.0",
     "react-scripts": "5.0.1",
-    "web-vitals": "3.5.0"
+    "web-vitals": "3.5.2"
   },
   "scripts": {
     "preinstall": "npx force-resolutions || echo 1",

diff --git a/Components/public/cdn.html b/Components/public/cdn.html
@@ -4,9 +4,9 @@
     <meta charset="UTF-8" />
     <title>WebSDK Embedded CDN demo</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/react.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/lib/vendor/react-dom.min.js"></script>
-    <script src="https://source.zoom.us/3.1.6/zoom-meeting-embedded-3.1.6.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/react.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/lib/vendor/react-dom.min.js"></script>
+    <script src="https://source.zoom.us/3.5.1/zoom-meeting-embedded-3.5.1.min.js"></script>
     <script src="./tools/tool.js"></script>
     <script src="./tools/vconsole.min.js"></script>
     <script src="./tools/token-tool.js"></script>

diff --git a/Components/public/nav.html b/Components/public/nav.html
@@ -3,8 +3,8 @@
 <head>
   <title>Zoom WebSDK Embedded Demo Nav</title>
   <meta charset="utf-8" />
-  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.1.6/css/bootstrap.css" />
-  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.1.6/css/react-select.css" />
+  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.5.1/css/bootstrap.css" />
+  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.5.1/css/react-select.css" />
   <meta name="format-detection" content="telephone=no">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <script src="./tools/jsrsasign-all-min.js"></script>
@@ -66,7 +66,7 @@
       <div id="navbar" class="websdktest">
         <form class="navbar-form navbar-right" id="meeting_form">
           <div class="form-group">
-            <input type="text" name="display_name" id="display_name" value="3.1.6#CDN" maxLength="100"
+            <input type="text" name="display_name" id="display_name" value="3.5.1#CDN" maxLength="100"
               placeholder="Name" class="form-control" required>
           </div>
           <div class="form-group">

diff --git a/Components/src/config/dev.ts b/Components/src/config/dev.ts
diff --git a/Local/index.html b/Local/index.html
@@ -3,6 +3,7 @@
 <head>
     <title>Zoom MeetingSDK Local</title>
     <meta charset="utf-8" />
+    <link type="text/css" rel="stylesheet" href="node_modules/@zoom/meetingsdk/dist/css/bootstrap.css" />
 
     <meta name="format-detection" content="telephone=no">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
@@ -58,7 +59,7 @@
             <div id="navbar" class="websdktest">
                 <form class="navbar-form navbar-right" id="meeting_form">
                     <div class="form-group">
-                        <input type="text" name="display_name" id="display_name" value="3.1.6#Local" maxLength="100"
+                        <input type="text" name="display_name" id="display_name" value="3.5.1#Local" maxLength="100"
                             placeholder="Name" class="form-control" required>
                     </div>
                     <div class="form-group">

diff --git a/Local/js/meeting.js b/Local/js/meeting.js
@@ -42,7 +42,7 @@ console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));
 // it's option if you want to change the MeetingSDK-Web dependency link resources. setZoomJSLib must be run at first
 // ZoomMtg.setZoomJSLib("https://source.zoom.us/{VERSION}/lib", "/av"); // default, don't need call it
 if (meetingConfig.china)
-  ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.1.6/lib", "/av"); // china cdn option
+  ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.5.1/lib", "/av"); // china cdn option
 
 ZoomMtg.preLoadWasm();
 ZoomMtg.prepareWebSDK();

diff --git a/Local/package.json b/Local/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/coffeelint",
   "name": "websdk-local",
-  "version": "3.1.6",
+  "version": "3.5.1",
   "description": "Zoom sample app for MeetingSDK-Web client view",
   "main": "index.js",
   "scripts": {
@@ -20,11 +20,11 @@
   "author": "Zoom Video Communications, Inc.",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@zoom/meetingsdk": "3.1.6",
+    "@zoom/meetingsdk": "3.5.1",
     "lodash": "^4.17.21",
-    "react": "16.14.0",
-    "react-dom": "16.14.0",
-    "react-redux": "7.2.9",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-redux": "8.1.2",
     "redux": "4.2.1",
     "redux-thunk": "2.4.2"
   },
@@ -55,9 +55,9 @@
     "url-loader": "4.1.1",
     "webpack": "^5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "^4.15.1"
+    "webpack-dev-server": "^5.0.2"
   },
   "resolutions": {
     "browserify-sign": "4.2.2"
   }
-}
+}