Update angular version for virtual desktop and for prop viewer

Signed-off-by: Satish Wadkar <[email protected]>
zowe · Aug 26, 2024 · 2668eee · 2668eee
1 parent 48ea73b
commit 2668eee
Show file tree

Hide file tree

Showing 65 changed files with 15,833 additions and 19,739 deletions.
diff --git a/system-apps/app-prop-viewer/webClient/package-lock.json b/system-apps/app-prop-viewer/webClient/package-lock.json
diff --git a/system-apps/app-prop-viewer/webClient/package.json b/system-apps/app-prop-viewer/webClient/package.json
@@ -2,42 +2,40 @@
   "name": "org.zowe.zlux.appmanager.app.propview.webclient",
   "version": "2.0.0",
   "scripts": {
-    "start": "webpack --progress --color --watch",
-    "build": "webpack --progress --color",
+    "start": "webpack --progress --watch",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider && webpack --progress",
     "i18n": "ng-xi18n -p tsconfig.i18n.json --i18nFormat=xlf  --outFile=messages.xlf",
     "lint": "tslint -c tslint.json \"./**/*.ts\""
   },
   "license": "EPL-2.0",
+  "dependencies": {},
   "devDependencies": {
-    "@angular-devkit/build-angular": "~12.0.0",
-    "@angular/animations": "~12.0.0",
-    "@angular/cli": "~12.0.0",
-    "@angular/common": "~12.0.0",
-    "@angular/compiler": "~12.0.0",
-    "@angular/compiler-cli": "~12.0.0",
-    "@angular/core": "~12.0.0",
-    "@angular/forms": "~12.0.0",
-    "@angular/language-service": "~12.0.0",
-    "@angular/platform-browser": "~12.0.0",
-    "@angular/platform-browser-dynamic": "~12.0.0",
-    "@angular/router": "~12.0.0",
+    "@angular/animations": "~18.0.0",
+    "@angular/common": "~18.0.0",
+    "@angular/compiler": "~18.0.0",
+    "@angular/core": "~18.0.0",
+    "@angular/forms": "~18.0.0",
+    "@angular/language-service": "~18.0.0",
+    "@angular/platform-browser": "~18.0.0",
+    "@angular/platform-browser-dynamic": "~18.0.0",
+    "@angular/router": "~18.0.0",
+    "core-js": "~3.19.0",
+    "rxjs": "~7.8.1",
+    "tslib": "^2.6.3",
+    "zone.js": "~0.14.4",
     "angular2-template-loader": "~0.6.2",
     "codelyzer": "~6.0.2",
-    "copy-webpack-plugin": "~10.2.0",
-    "core-js": "~3.19.0",
-    "css-loader": "~6.5.1",
-    "url-loader": "~3.0.0",
+    "copy-webpack-plugin": "~11.0.0",
+    "css-loader": "~6.8.1",
     "exports-loader": "~3.1.0",
-    "html-loader": "~3.0.1",
-    "rxjs": "~6.6.0",
-    "rxjs-compat": "~6.2.2",
+    "html-loader": "~4.2.0",
     "source-map-loader": "~3.0.0",
-    "ts-loader": "~8.3.0",
+    "ts-loader": "~9.2.2",
     "tslint": "~6.1.0",
-    "typescript": "~4.2.0",
-    "webpack": "~5.76.0",
-    "webpack-cli": "~4.9.1",
-    "webpack-config": "~7.5.0",
-    "zone.js": "~0.11.4"
-  }
+    "typescript": "~5.4.5",
+    "url-loader": "~3.0.0",
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-config": "~7.5.0"
 }
+}
diff --git a/system-apps/app-prop-viewer/webClient/src/app/app.component.html b/system-apps/app-prop-viewer/webClient/src/app/app.component.html
@@ -8,11 +8,14 @@
   
   Copyright Contributors to the Zowe Project.
 -->
-<div class="viewer" *ngIf=isViewerWindow>
+@if(isViewerWindow){
+<div class="viewer">
   TO VIEW ALL INSTALLED APPs
 </div>
+}
 
-<div class="window" *ngIf=isPropertyWindow>
+@if(isPropertyWindow){
+<div class="window">
 
   <!-- Window body -->
 
@@ -39,6 +42,7 @@
        {{copyright}}
       </p>
 </div>
+}
 <!-- 
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
@@ -47,4 +51,4 @@
   SPDX-License-Identifier: EPL-2.0
   
   Copyright Contributors to the Zowe Project.
--->
+-->
diff --git a/system-apps/app-prop-viewer/webClient/webpack.config.js b/system-apps/app-prop-viewer/webClient/webpack.config.js
@@ -8,22 +8,23 @@
   Copyright Contributors to the Zowe Project.
 */
 
-const path = require('path');
-const { merge } = require('webpack-merge');
-const baseConfig = require(path.resolve(process.env.MVD_DESKTOP_DIR, 'plugin-config/webpack5.base.js'));
-const CopyWebpackPlugin = require('copy-webpack-plugin');
+var path = require('path');
+var webpackConfig = require('webpack-config');
+var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 if (process.env.MVD_DESKTOP_DIR == null) {
   throw new Error('You must specify MVD_DESKTOP_DIR in your environment');
 }
 
-const config = {
-  entry: path.resolve(__dirname, './src/plugin.ts'),
-  output: {
-    path: path.resolve(__dirname, '../web'),
-    filename: 'main.js',
+var config = {
+  'entry': [
+    path.resolve(__dirname, './src/plugin.ts')
+  ],
+  'output': {
+    'path': path.resolve(__dirname, '../web'),
+    'filename': 'main.js',
   },
-  plugins: [
+  'plugins': [
     new CopyWebpackPlugin({
       patterns: [
         {
@@ -35,7 +36,10 @@ const config = {
   ],
 };
 
-module.exports = merge(baseConfig, config);
+module.exports = new webpackConfig.Config()
+  .extend(path.resolve(process.env.MVD_DESKTOP_DIR, 'plugin-config/webpack5.base.js'))
+  .merge(config);
+
 
 /*
   This program and the accompanying materials are

diff --git a/virtual-desktop/.gitignore b/virtual-desktop/.gitignore
@@ -44,6 +44,7 @@
 npm-debug.log
 testem.log
 /typings
+.angular
 
 # developer proxy file
 proxy.conf.json

diff --git a/virtual-desktop/angular.json b/virtual-desktop/angular.json
@@ -0,0 +1,99 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "org.zowe.zlux.ng2desktop": {
+      "projectType": "application",
+      "schematics": {},
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+            "outputPath": {
+              "base": "web",
+              "browser": ""
+            },
+            "index": "src/index.html",
+            "browser": "src/desktop.ts",
+            "polyfills": [
+              "zone.js"
+            ], 
+            "baseHref": "./",
+            "tsConfig": "tsconfig.json",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "assets"
+              }
+            ],
+            "styles": [],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kB",
+                  "maximumError": "5MB"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kB",
+                  "maximumError": "500kB"
+                }
+              ],
+              "outputHashing": "none"
+            },
+            "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "buildTarget": "org.zowe.zlux.ng2desktop:build:production"
+            },
+            "development": {
+              "buildTarget": "org.zowe.zlux.ng2desktop:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
+            "tsConfig": "tsconfig.spec.json",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          }
+        }
+      }
+    }
+  }
+}