Merge branch 'v2.x/staging' into dependabot/npm_and_yarn/system-apps/…

…system-settings-preferences/webClient/ip-1.1.9
zowe · Apr 23, 2024 · 44f35e6 · 44f35e6
2 parents 22b9324 + 9aa1d1c
commit 44f35e6
Show file tree

Hide file tree

Showing 17 changed files with 70,968 additions and 22,976 deletions.
diff --git a/bootstrap/package-lock.json b/bootstrap/package-lock.json
diff --git a/bootstrap/package.json b/bootstrap/package.json
@@ -23,7 +23,7 @@
     "source-map-loader": "~3.0.0",
     "systemjs": "~0.21.4",
     "ts-loader": "~8.3.0",
-    "tslint": "~5.10.0",
+    "tslint": "~6.1.0",
     "typescript": "~4.2.0",
     "webpack": "~5.76.0",
     "webpack-cli": "~4.9.1"

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/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",

diff --git a/system-apps/app-generator/webClient/package.json b/system-apps/app-generator/webClient/package.json
@@ -34,7 +34,7 @@
     "@angular/compiler-cli": "~8.0.0",
     "@types/jasmine": "^2.8.2",
     "@types/node": "~8.0.53",
-    "codelyzer": "~5.1.0",
+    "codelyzer": "~6.0.2",
     "gzipper": "^3.5.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",