From d3a995fa3870adcdd9dd77e6b83da793f45c41c4 Mon Sep 17 00:00:00 2001
From: Enda Zhang <enda.zhang@zoom.us>
Date: Mon, 6 Nov 2023 12:06:14 -0800
Subject: [PATCH] update 2.18.0

---
 CDN/index.html                 | 18 +++++++++---------
 CDN/js/index.js                |  4 ++--
 CDN/js/meeting.js              |  4 ++--
 CDN/meeting.html               | 16 ++++++++--------
 CDN/package.json               |  2 +-
 Components/config-overrides.js |  6 +++++-
 Components/package.json        |  4 ++--
 Components/public/cdn.html     |  6 +++---
 Components/public/nav.html     |  6 +++---
 Local/index.html               |  2 +-
 Local/js/index.js              |  4 ++--
 Local/package.json             |  4 ++--
 12 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/CDN/index.html b/CDN/index.html
index ee2abe1c..84cc6d75 100755
--- a/CDN/index.html
+++ b/CDN/index.html
@@ -3,8 +3,8 @@
 <head>
     <title>Zoom WebSDK CDN</title>
     <meta charset="utf-8" />
-    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/bootstrap.css" />
-    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/react-select.css" />
+    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
+    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/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">
 
@@ -62,7 +62,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="2.17.0#CDN" maxLength="100"
+                        <input type="text" name="display_name" id="display_name" value="2.18.0#CDN" maxLength="100"
                             placeholder="Name" class="form-control" required>
                     </div>
                     <div class="form-group">
@@ -138,12 +138,12 @@
         })
     </script>
 
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/react.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/react-dom.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/redux.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/redux-thunk.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/lodash.min.js"></script>
-    <script src="https://source.zoom.us/zoom-meeting-2.17.0.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/redux.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/redux-thunk.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/lodash.min.js"></script>
+    <script src="https://source.zoom.us/zoom-meeting-2.18.0.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/index.js b/CDN/js/index.js
index 571e8d5d..fe68391e 100755
--- a/CDN/js/index.js
+++ b/CDN/js/index.js
@@ -12,8 +12,8 @@ function websdkready() {
   console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));
 
   // it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
-  // if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.17.0/lib', '/av'); // CDN version default
-  // else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.17.0/lib', '/av'); // china cdn option
+  // if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.18.0/lib', '/av'); // CDN version default
+  // else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.18.0/lib', '/av'); // china cdn option
   // ZoomMtg.setZoomJSLib('http://localhost:9999/node_modules/@zoomus/websdk/dist/lib', '/av'); // Local version default, Angular Project change to use cdn version
   ZoomMtg.preLoadWasm(); // pre download wasm file to save time.
 
diff --git a/CDN/js/meeting.js b/CDN/js/meeting.js
index 6f42398e..9e3aad73 100644
--- a/CDN/js/meeting.js
+++ b/CDN/js/meeting.js
@@ -49,9 +49,9 @@ function websdkready() {
   console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));
 
   // it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
-  // ZoomMtg.setZoomJSLib("https://source.zoom.us/2.17.0/lib", "/av"); // CDN version defaul
+  // ZoomMtg.setZoomJSLib("https://source.zoom.us/2.18.0/lib", "/av"); // CDN version defaul
   if (meetingConfig.china)
-    ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/2.17.0/lib", "/av"); // china cdn option
+    ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/2.18.0/lib", "/av"); // china cdn option
   ZoomMtg.preLoadWasm();
   ZoomMtg.prepareJssdk();
   function beginJoin(signature) {
diff --git a/CDN/meeting.html b/CDN/meeting.html
index 24b09f87..4c1bb179 100644
--- a/CDN/meeting.html
+++ b/CDN/meeting.html
@@ -3,20 +3,20 @@
 <head>
     <title>Zoom WebSDK CDN</title>
     <meta charset="utf-8" />
-    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/bootstrap.css" />
-    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/react-select.css" />
+    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
+    <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/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">
     <meta http-equiv="origin-trial" content="">
 </head>
 
 <body>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/react.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/react-dom.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/redux.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/redux-thunk.min.js"></script>
-    <script src="https://source.zoom.us/2.17.0/lib/vendor/lodash.min.js"></script>
-    <script src="https://source.zoom.us/zoom-meeting-2.17.0.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/redux.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/redux-thunk.min.js"></script>
+    <script src="https://source.zoom.us/2.18.0/lib/vendor/lodash.min.js"></script>
+    <script src="https://source.zoom.us/zoom-meeting-2.18.0.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
index 5f0a5053..95f9a9cd 100755
--- a/CDN/package.json
+++ b/CDN/package.json
@@ -1,6 +1,6 @@
 {
   "name": "websdk-cdn",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Zoom sample app for web client WebSDK",
   "main": "index.js",
   "scripts": {
diff --git a/Components/config-overrides.js b/Components/config-overrides.js
index 0e842f18..12b8b04b 100644
--- a/Components/config-overrides.js
+++ b/Components/config-overrides.js
@@ -29,7 +29,11 @@ module.exports = {
           {
             from: path.resolve(__dirname, 'node_modules', '@zoomus', 'websdk', 'dist', 'lib', 'av'),
             to: path.resolve(__dirname, 'public', 'lib')
-          }
+          },
+          {
+            from: path.resolve(__dirname, 'node_modules', '@zoomus', 'websdk', 'dist', 'lib', 'image'),
+            to: path.resolve(__dirname, 'public', 'image')
+          },
         ]
       })
     )
diff --git a/Components/package.json b/Components/package.json
index 4081cfb4..3cce454c 100644
--- a/Components/package.json
+++ b/Components/package.json
@@ -1,13 +1,13 @@
 {
   "name": "websdk-component-demo",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "private": true,
   "dependencies": {
     "@ant-design/icons": "^4.6.2",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^12.8.3",
-    "@zoomus/websdk": "2.17.0",
+    "@zoomus/websdk": "2.18.0",
     "antd": "^4.14.1",
     "classnames": "^2.2.6",
     "crypto-js": "^4.0.0",
diff --git a/Components/public/cdn.html b/Components/public/cdn.html
index e1ce971f..a8ec12f0 100644
--- a/Components/public/cdn.html
+++ b/Components/public/cdn.html
@@ -5,9 +5,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/2.17.0/lib/vendor/react.min.js"></script>
-  <script src="https://source.zoom.us/2.17.0/lib/vendor/react-dom.min.js"></script>
-  <script src="https://source.zoom.us/2.17.0/zoom-meeting-embedded-2.17.0.min.js"></script>
+  <script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
+  <script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
+  <script src="https://source.zoom.us/2.18.0/zoom-meeting-embedded-2.18.0.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
index 2a0dd296..4f521bce 100644
--- 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/2.17.0/css/bootstrap.css" />
-  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/react-select.css" />
+  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
+  <link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/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="2.17.0#CDN" maxLength="100"
+            <input type="text" name="display_name" id="display_name" value="2.18.0#CDN" maxLength="100"
               placeholder="Name" class="form-control" required>
           </div>
           <div class="form-group">
diff --git a/Local/index.html b/Local/index.html
index 91afd2ec..d67605c4 100755
--- a/Local/index.html
+++ b/Local/index.html
@@ -60,7 +60,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="2.17.0#Local" maxLength="100"
+                        <input type="text" name="display_name" id="display_name" value="2.18.0#Local" maxLength="100"
                             placeholder="Name" class="form-control" required>
                     </div>
                     <div class="form-group">
diff --git a/Local/js/index.js b/Local/js/index.js
index e4a0684f..9d6f6fc0 100755
--- a/Local/js/index.js
+++ b/Local/js/index.js
@@ -4,8 +4,8 @@ console.log("checkSystemRequirements");
 console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));
 
 // it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
-// if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.17.0/lib', '/av'); // CDN version default
-// else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.17.0/lib', '/av'); // china cdn option
+// if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.18.0/lib', '/av'); // CDN version default
+// else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.18.0/lib', '/av'); // china cdn option
 // ZoomMtg.setZoomJSLib('http://localhost:9999/node_modules/@zoomus/websdk/dist/lib', '/av'); // Local version default, Angular Project change to use cdn version
 ZoomMtg.preLoadWasm();
 ZoomMtg.prepareWebSDK();
diff --git a/Local/package.json b/Local/package.json
index db78e611..92271bdb 100755
--- a/Local/package.json
+++ b/Local/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/coffeelint",
   "name": "websdk-local",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Zoom sample app for web client WebSDK",
   "main": "index.js",
   "scripts": {
@@ -19,7 +19,7 @@
   "author": "Zoom Video Communications, Inc.",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@zoomus/websdk": "2.17.0",
+    "@zoomus/websdk": "2.18.0",
     "lodash": "^4.17.21",
     "react": "16.14.0",
     "react-dom": "16.14.0",
