Update v3 with v2 branch content

Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Aug 9, 2024 · fc2c57c · fc2c57c
1 parent 1d9882b
commit fc2c57c
Show file tree

Hide file tree

Showing 17 changed files with 8,125 additions and 49,381 deletions.
diff --git a/bootstrap/package-lock.json b/bootstrap/package-lock.json
diff --git a/system-apps/admin-notification-app/webClient/package-lock.json b/system-apps/admin-notification-app/webClient/package-lock.json
diff --git a/system-apps/app-generator/README.md b/system-apps/app-generator/README.md
@@ -1,6 +1,6 @@
 # App Generator
 
 This app can be installed for use in the Zowe Desktop in order to quickly create apps.
-It will guide you through the choices for app creation and validate input, so that app createion is easy and correct.
+It will guide you through the choices for app creation and validate input, so that app creation is easy and correct.
 The generator comes with "templates", which are boilerplate files that when combined with user input are used to create the first iteration of the new apps.
 This App Generator is licensed Eclipse Public License 2.0, but the templates are unlicensed as they are intended to be utilized in your own project.
diff --git a/system-apps/app-generator/nodeServer/package-lock.json b/system-apps/app-generator/nodeServer/package-lock.json
diff --git a/system-apps/app-generator/nodeServer/package.json b/system-apps/app-generator/nodeServer/package.json
@@ -9,12 +9,10 @@
   "author": "",
   "license": "EPL-2.0",
   "dependencies": {
-    "body-parser": "^1.19.0",
-    "express": "^4.17.3",
+    "body-parser": "^1.20.0",
+    "express": "^4.19.2",
     "fs-extra": "^8.0.1",
-    "js-beautify": "^1.10.0",
-    "q": "^1.5.1",
-    "unzipper": "^0.10.0"
+    "q": "^1.5.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.27",

diff --git a/system-apps/app-generator/nodeServer/src/service/project.ts b/system-apps/app-generator/nodeServer/src/service/project.ts
@@ -13,8 +13,6 @@ import * as path from 'path';
 import { Project } from '../models/project'
 
 const fs = require('fs-extra');
-const beautify = require('js-beautify');
-const unzipper = require('unzipper');
 const ZLUX_ROOT_FOLDER = path.join(process.env['PWD'], '../../');
 const DESTINATION = process.env['INSTANCE_DIR'] ? path.join(process.env['INSTANCE_DIR'], 'workspace/app-server/devPlugins') : ZLUX_ROOT_FOLDER;
 const installApp = require(path.join(ZLUX_ROOT_FOLDER,'zlux-server-framework/utils/install-app'));

diff --git a/system-apps/app-generator/templates/angular/Basic/webClient/package.json b/system-apps/app-generator/templates/angular/Basic/webClient/package.json
@@ -32,7 +32,7 @@
     "rxjs-compat": "~6.2.2",
     "source-map-loader": "~0.2.3",
     "ts-loader": "~4.4.2",
-    "tslint": "~5.10.0",
+    "tslint": "~6.1.0",
     "typescript": "~2.7.2",
     "webpack": "^4.41.0",
     "webpack-cli": "^3.1.0",

diff --git a/system-apps/app-generator/templates/react/Basic/webClient/package.json b/system-apps/app-generator/templates/react/Basic/webClient/package.json
@@ -31,7 +31,7 @@
     "svg-inline-loader": "^0.8.2",
     "svg-sprite-loader": "^4.2.1",
     "ts-loader": "~4.4.2",
-    "tslint": "~5.10.0",
+    "tslint": "~6.1.0",
     "typescript": "~2.9.0",
     "url-loader": "^1.1.2",
     "webpack": "^4.41.0",