Skip to content

Commit

Permalink
Merge branch 'v2.x/staging' into dependabot/npm_and_yarn/system-apps/…
Browse files Browse the repository at this point in the history
…app-prop-viewer/webClient/ip-1.1.9

Signed-off-by: Timothy Gerstel <[email protected]>
  • Loading branch information
timgerstel authored Apr 23, 2024
2 parents 7338a98 + 9c96d47 commit f2f3b29
Show file tree
Hide file tree
Showing 20 changed files with 71,362 additions and 23,043 deletions.
319 changes: 134 additions & 185 deletions bootstrap/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bootstrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2,505 changes: 1,768 additions & 737 deletions system-apps/admin-notification-app/webClient/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system-apps/app-generator/README.md
Original file line number Diff line number Diff line change
@@ -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.
303 changes: 241 additions & 62 deletions system-apps/app-generator/nodeServer/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system-apps/app-generator/nodeServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "EPL-2.0",
"dependencies": {
"body-parser": "^1.19.0",
"express": "^4.17.3",
"express": "^4.19.2",
"fs-extra": "^8.0.1",
"js-beautify": "^1.10.0",
"q": "^1.5.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit f2f3b29

Please sign in to comment.