Merge branch 'v3.x/staging' into dependabot/npm_and_yarn/virtual-desk…

…top/multi-9423f4c335
zowe · Oct 18, 2024 · a7d0cfc · a7d0cfc
2 parents 11082e9 + d294acd
commit a7d0cfc
Show file tree

Hide file tree

Showing 7 changed files with 183 additions and 204 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@ All notable changes to the Zlux App Manager will be documented in this file.
 
 ## `3.0.0`
 
-- Enhancement: Updated all webpack configurations across supported zlux-app-manager apps (virtual-desktop, bootstrap, app-prop-viewer,
-web-browser-app, system-settings-preferences) from 4 --> 5. This includes all associated loaders, modules, and dependencies with removal of deprecated ones. Old Webpack 4 base configuration has been left for app's backwards compatibility. For more information, visit https://www.zowe.org/vnext (#550)
+- Enhancement: Updated the Desktop Angular version from 12 to 18. This makes V2 Angular apps incompatible with V3. Iframe and React is unaffected.
+- Enhancement: Added ability for the Desktop load the compatibility Desktop mode (V2 Desktop) via the ?use-v2-desktop=true parameter
+- Enhancement: Updated all webpack configurations across supported zlux-app-manager apps (virtual-desktop, bootstrap, app-prop-viewer, web-browser-app, system-settings-preferences) from 4 --> 5. This includes all associated loaders, modules, and dependencies with removal of deprecated ones. Old Webpack 4 base configuration has been left for app's backwards compatibility. For more information, visit https://www.zowe.org/vnext (#550)
 
 ## `2.10.0`
 

diff --git a/bootstrap/package-lock.json b/bootstrap/package-lock.json
diff --git a/bootstrap/package.json b/bootstrap/package.json
@@ -25,7 +25,7 @@
     "ts-loader": "~8.3.0",
     "tslint": "~6.1.0",
     "typescript": "~4.2.0",
-    "webpack": "~5.76.0",
+    "webpack": "~5.94.0",
     "webpack-cli": "~4.9.1"
   },
   "dependencies": {

diff --git a/system-apps/web-browser-app/webClient/package-lock.json b/system-apps/web-browser-app/webClient/package-lock.json
diff --git a/virtual-desktop/src/app/authentication-manager/login/login.component.css b/virtual-desktop/src/app/authentication-manager/login/login.component.css
@@ -96,7 +96,6 @@
 
 .login-form .password {
   font-family: 'Roboto', sans-serif;
-  text-transform: uppercase;
 }
 
 .login-form label {
@@ -221,4 +220,4 @@
   SPDX-License-Identifier: EPL-2.0
   
   Copyright Contributors to the Zowe Project.
-*/
+*/
diff --git a/virtual-desktop/src/app/plugin-manager/plugin-factory/angular2/angular2-plugin-factory.ts b/virtual-desktop/src/app/plugin-manager/plugin-factory/angular2/angular2-plugin-factory.ts
@@ -81,8 +81,8 @@ export class Angular2PluginFactory extends PluginFactory {
     let pluginDefBase = pluginDefinition.getBasePlugin();
     let pluginDefAny:any = (pluginDefBase as any);
     let entryPoint = 'main.js';
-    if (pluginDefAny.getWebEntryPoint) {
-      entryPoint = pluginDefAny.getWebEntryPoint() || 'main.js';
+    if (pluginDefAny.getWebEntrypoint) {
+      entryPoint = pluginDefAny.getWebEntrypoint() || 'main.js';
     }
     return ZoweZLUX.uriBroker.pluginResourceUri(pluginDefBase, entryPoint);
   }

diff --git a/virtual-desktop/src/app/plugin-manager/plugin-factory/react/react-plugin-factory.ts b/virtual-desktop/src/app/plugin-manager/plugin-factory/react/react-plugin-factory.ts
@@ -30,8 +30,8 @@ export class ReactPluginFactory extends PluginFactory {
     let pluginDefBase = pluginDefinition.getBasePlugin();
     let pluginDefAny:any = (pluginDefBase as any);
     let entryPoint = 'main.js';
-    if (pluginDefAny.getWebEntryPoint) {
-      entryPoint = pluginDefAny.getWebEntryPoint() || 'main.js';
+    if (pluginDefAny.getWebEntrypoint) {
+      entryPoint = pluginDefAny.getWebEntrypoint() || 'main.js';
     }
     return ZoweZLUX.uriBroker.pluginResourceUri(pluginDefBase, entryPoint);
   }