Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ jobs:
- name: '[Prep 1] Checkout'
uses: actions/checkout@v2

- name: '[Prep 2] Cache node modules'
- name: '[Prep 2] Validate package.json'
uses: zowe-actions/shared-actions/validate-package-json@main

- name: '[Prep 3] Cache node modules'
uses: actions/cache@v4
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
Expand All @@ -135,17 +138,17 @@ jobs:
key: ${{ runner.os }}-build-cache-node-modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-cache-node-modules-
- name: '[Prep 3] Setup Node'
- name: '[Prep 4] Setup Node'
uses: actions/setup-node@v2
with:
node-version: 22

- name: '[Prep 4] Setup jFrog CLI'
- name: '[Prep 5] Setup jFrog CLI'
uses: jfrog/setup-jfrog-cli@v2
env:
JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}

- name: '[Prep 5] Prepare Workflow'
- name: '[Prep 6] Prepare Workflow'
uses: zowe-actions/zlux-builds/plugins/prepare-workflow@v3.x/main
with:
github-user: ${{ secrets.ZOWE_ROBOT_USER }}
Expand All @@ -155,28 +158,28 @@ jobs:
release: ${{ github.event.inputs.PERFORM_RELEASE }}
plugin-version: ${{ github.event.inputs.BUILD_VERSION }}

- name: '[Prep 6] Build'
- name: '[Prep 7] Build'
uses: zowe-actions/zlux-builds/plugins/zlux-plugins@v3.x/main
with:
build-zss: true

- name: '[Prep 7] Packaging'
- name: '[Prep 8] Packaging'
uses: zowe-actions/zlux-builds/plugins/make-pax@v3.x/main
with:
pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }}
pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }}
pax-name: sample-angular-app

- name: '[Prep 8] Deploy '
- name: '[Prep 9] Deploy '
uses: zowe-actions/zlux-builds/plugins/deploy-pax@v3.x/main

- name: '[Prep 9] Bump Staging Version '
- name: '[Prep 10] Bump Staging Version '
if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/plugins/bump-version@v3.x/main
env:
GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}

- name: '[Prep 10] NodeJS project setup'
- name: '[Prep 11] NodeJS project setup'
if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/plugins/npm-setup@v3.x/main
with:
Expand All @@ -189,6 +192,6 @@ jobs:
publish-registry-username: ${{ secrets.NPM_PRIVATE_REGISTRY_USERNAME }}
publish-registry-password: ${{ secrets.NPM_PRIVATE_REGISTRY_PASSWORD }}

- name: '[Prep 11] Publish NPM Package '
- name: '[Prep 12] Publish NPM Package '
if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/plugins/npm-publish@v3.x/main
13 changes: 13 additions & 0 deletions build/component/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions nodeServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"dependencies": {},
"devDependencies": {
"@types/express": "~4.16.0",
"@types/node": "~8.10.23",
"typescript": "~2.9.0"
"@types/express": "4.16.1",
"@types/node": "8.10.49",
"typescript": "2.9.2"
}
}
13 changes: 0 additions & 13 deletions sample-angular-app.ppf

This file was deleted.

58 changes: 29 additions & 29 deletions webClient/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions webClient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@
},
"private": true,
"devDependencies": {
"@angular-devkit/build-angular": "~18.2.14",
"@angular/animations": "~18.2.14",
"@angular/cli": "~18.2.14",
"@angular/common": "~18.2.14",
"@angular/compiler": "~18.2.14",
"@angular/compiler-cli": "~18.2.14",
"@angular/core": "~18.2.14",
"@angular/forms": "~18.2.14",
"@angular/language-service": "~18.2.14",
"@angular/platform-browser": "~18.2.14",
"@angular/platform-browser-dynamic": "~18.2.14",
"@angular/router": "~18.2.14",
"@ngtools/webpack": "^18.2.14",
"@angular-devkit/build-angular": "18.2.21",
"@angular/animations": "18.2.14",
"@angular/cli": "18.2.21",
"@angular/common": "18.2.14",
"@angular/compiler": "18.2.14",
"@angular/compiler-cli": "18.2.14",
"@angular/core": "18.2.14",
"@angular/forms": "18.2.14",
"@angular/language-service": "18.2.14",
"@angular/platform-browser": "18.2.14",
"@angular/platform-browser-dynamic": "18.2.14",
"@angular/router": "18.2.14",
"@ngtools/webpack": "18.2.21",
"@zlux/widgets": "github:zowe/zlux-widgets#v3.x/master",
"angular-l10n": "~17.0.1",
"codelyzer": "~6.0.2",
"compression-webpack-plugin": "~11.0.0",
"copy-webpack-plugin": "~11.0.0",
"core-js": "~3.19.0",
"css-loader": "~6.8.1",
"ngx-i18nsupport": "~0.17.1",
"rxjs": "~7.8.1",
"source-map-loader": "~3.0.0",
"tslib": "~2.6.3",
"tslint": "~6.1.0",
"typescript": "~5.4.5",
"webpack": "~5.92.0",
"webpack-cli": "~5.1.4",
"webpack-config": "~7.5.0",
"zone.js": "~0.14.4"
"angular-l10n": "17.0.1",
"codelyzer": "6.0.2",
"compression-webpack-plugin": "11.0.0",
"copy-webpack-plugin": "11.0.0",
"core-js": "3.19.3",
"css-loader": "6.8.1",
"ngx-i18nsupport": "0.17.1",
"rxjs": "7.8.2",
"source-map-loader": "3.0.2",
"tslib": "2.6.3",
"tslint": "6.1.3",
"typescript": "5.4.5",
"webpack": "5.92.1",
"webpack-cli": "5.1.4",
"webpack-config": "7.5.0",
"zone.js": "0.14.10"
}
}
16 changes: 15 additions & 1 deletion webClient/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var path = require('path');
var webpackConfig = require('webpack-config');
var CopyWebpackPlugin = require('copy-webpack-plugin');
const CompressionPlugin = require('compression-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin');
const { AngularWebpackPlugin } = require('@ngtools/webpack');

if (process.env.MVD_DESKTOP_DIR == null) {
Expand Down Expand Up @@ -46,7 +47,8 @@ var config = {
}),
new CompressionPlugin({
threshold: 100000,
minRatio: 0.8
minRatio: 0.8,
deleteOriginalAssets: true
}),
new AngularWebpackPlugin({
tsConfigPath: './tsconfig.json',
Expand All @@ -55,6 +57,18 @@ var config = {
]
};

config.optimization = {
minimizer: [
new TerserPlugin({
extractComments: {
condition: /^\**!|@preserve|@license|@cc_on/i,
filename: 'ATTRIBUTION.txt',
banner: false
}
})
]
};

module.exports = new webpackConfig.Config()
.extend(path.resolve(process.env.MVD_DESKTOP_DIR, 'plugin-config/webpack5.base.js'))
.merge(config);
Expand Down
3 changes: 2 additions & 1 deletion zssServer/build/build31.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
################################################################################
export _C89_ACCEPTABLE_RC=0
WORKDIR=$(dirname "$0")
TMP="${WORKDIR}/tmp"
TMP="${WORKDIR}/tmp-sample-angular"
mkdir "${TMP}" 2>/dev/null
cd "${TMP}" || exit 8

Expand Down Expand Up @@ -42,6 +42,7 @@ then
echo "${TARGET_ABS} - build failed"
RC=8
else
rm -rf "${TMP}"
echo "${TARGET_ABS} - build successful"
extattr +p "${TARGET}"
RC=0
Expand Down
3 changes: 2 additions & 1 deletion zssServer/build/build64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
################################################################################
export _C89_ACCEPTABLE_RC=0
WORKDIR=$(dirname "$0")
TMP="${WORKDIR}/tmp"
TMP="${WORKDIR}/tmp-sample-angular"
mkdir "${TMP}" 2>/dev/null
cd "${TMP}" || exit 8

Expand Down Expand Up @@ -42,6 +42,7 @@ then
echo "${TARGET_ABS} - build failed"
RC=8
else
rm -rf "${TMP}"
echo "${TARGET_ABS} - build successful"
extattr +p "${TARGET}"
RC=0
Expand Down
Loading