Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update v3 with v2 branch content #607

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Update v3 with v2 branch content #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc2c57c
Update v3 with v2 branch content
1000TurquoisePogs Aug 9, 2024
0680f23
Add types/node to prevent build failure even though its not used in o…
1000TurquoisePogs Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,841 changes: 805 additions & 3,036 deletions bootstrap/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2,505 changes: 1,768 additions & 737 deletions system-apps/admin-notification-app/webClient/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system-apps/app-generator/README.md
View file
Open in desktop
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.
1,857 changes: 1,317 additions & 540 deletions system-apps/app-generator/nodeServer/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions system-apps/app-generator/nodeServer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions system-apps/app-generator/nodeServer/src/service/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion system-apps/app-generator/templates/angular/Basic/webClient/package.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion system-apps/app-generator/templates/react/Basic/webClient/package.json
View file
Open in desktop
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
Loading