Skip to content

Commit

Permalink
Merge pull request #127 from ggtakec/update/os_node_ver
Browse files Browse the repository at this point in the history 
Changed supported NodeJS/OS version and fixed code
  • Loading branch information
@ggtakec
ggtakec authored Dec 3, 2024
2 parents ff3f792 + dd70557 commit 5b804d3
Show file tree
Hide file tree
Showing 24 changed files with 1,042 additions and 1,252 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
fail-fast: false

matrix:
node-version: [18, 20]
node-version: [18, 20, 22]

steps:
#
Expand Down Expand Up @@ -137,8 +137,8 @@ jobs:
# <default tag flag>: If you want to use the created Docker image as the default image, specify "default".
#
imageinfo:
- alpine:3.19,alpine:3.19,alpine,default
- ubuntu:22.04,ubuntu:22.04,ubuntu
- alpine:3.20,alpine:3.20,alpine,default
- ubuntu:24.04,ubuntu:24.04,ubuntu

#
# Run building and pushing helper
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_helper.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ fi
if echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "ubuntu" -e "debian"; then
SETUP_PC_SCRIPT_NAME="script.deb.sh"
SETUP_PC_SCRIPT_EXEC="bash"
elif echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "rocky" -e "centos" -e "fedora"; then
elif echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "rocky" -e "fedora"; then
SETUP_PC_SCRIPT_NAME="script.rpm.sh"
SETUP_PC_SCRIPT_EXEC="bash"
elif echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "alpine"; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs_helper.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ PRNSUCCESS "Start to check options and environments"
CPPCHECK_TARGET="."
CPPCHECK_BASE_OPT="--quiet --error-exitcode=1 --inline-suppr -j 4 --std=c++03 --xml --enable=warning,style,information,missingInclude"
CPPCHECK_ENABLE_VALUES="warning style information missingInclude"
CPPCHECK_IGNORE_VALUES="unmatchedSuppression"
CPPCHECK_IGNORE_VALUES="unmatchedSuppression missingIncludeSystem normalCheckLevelMaxBranches"
CPPCHECK_BUILD_DIR="/tmp/cppcheck"

SHELLCHECK_TARGET_DIRS="."
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/nodejstypevars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,20 @@ if [ -z "${CI_NODEJS_MAJOR_VERSION}" ]; then
# Unknown NodeJS Major version : Nothing to do
#
:
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "14" ]; then
INSTALL_PKG_LIST="git"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
IS_PUBLISHER=0

elif [ "${CI_NODEJS_MAJOR_VERSION}" = "16" ]; then
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then
INSTALL_PKG_LIST="git"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
IS_PUBLISHER=0

elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then
INSTALL_PKG_LIST="git"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
IS_PUBLISHER=1

elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "22" ]; then
INSTALL_PKG_LIST="git"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
Expand Down Expand Up @@ -131,7 +126,7 @@ RUN_POST_PUBLISH=1
# CPPCHECK_TARGET "."
# CPPCHECK_BASE_OPT "--quiet --error-exitcode=1 --inline-suppr -j 4 --std=c++03 --xml"
# CPPCHECK_ENABLE_VALUES "warning style information missingInclude"
# CPPCHECK_IGNORE_VALUES "unmatchedSuppression"
# CPPCHECK_IGNORE_VALUES "unmatchedSuppression missingIncludeSystem normalCheckLevelMaxBranches"
# CPPCHECK_BUILD_DIR "/tmp/cppcheck"
#
# SHELLCHECK_TARGET_DIRS "."
Expand Down
64 changes: 32 additions & 32 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
"name": "k2hr3-app",
"version": "1.0.34",
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.15",
"@mui/material": "^5.15.15",
"ajv": "^8.12.0",
"body-parser": "^1.20.2",
"config": "^3.3.11",
"cookie-parser": "^1.4.6",
"debug": "^4.3.4",
"ejs": "^3.1.9",
"express": "^4.19.2",
"express-session": "^1.18.0",
"jose": "^5.2.4",
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@mui/icons-material": "^6.1.9",
"@mui/material": "^6.1.9",
"ajv": "^8.17.1",
"body-parser": "^1.20.3",
"config": "^3.3.12",
"cookie-parser": "^1.4.7",
"debug": "^4.3.7",
"ejs": "^3.1.10",
"express": "^4.21.1",
"express-session": "^1.18.1",
"jose": "^5.9.6",
"morgan": "^1.10.0",
"openid-client": "^5.6.5",
"openid-client": "^6.1.6",
"passport": "^0.7.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-transition-group": "^4.4.5",
"rotating-file-stream": "^3.2.1",
"rotating-file-stream": "^3.2.5",
"serve-favicon": "^2.5.0",
"whatwg-fetch": "^3.6.20"
},
Expand All @@ -42,26 +42,26 @@
"views": "views"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.25.9",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.25.9",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.24.4",
"@babel/preset-react": "^7.24.1",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.9",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"css-loader": "^7.0.0",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.1",
"babel-loader": "^9.2.1",
"css-loader": "^7.1.2",
"eslint": "^8.57.1",
"eslint-plugin-react": "^7.37.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"license-checker": "^25.0.1",
"react-test-context-provider": "^2.2.0",
"react-test-renderer": "^18.2.0",
"style-loader": "^3.3.4",
"webpack": "^5.91.0",
"react-test-renderer": "^18.3.1",
"style-loader": "^4.0.0",
"webpack": "^5.96.1",
"webpack-cli": "^5.1.4"
},
"browser": {
Expand Down Expand Up @@ -93,9 +93,9 @@
"test": "npm run test:all",
"test:all": "echo 'All Test - ESLint and JEST' && npm run test:lint && npm run test:jest",
"test:lint": "echo 'Run ESlint(NOTE: maybe install eslint in global)' && eslint app.js webpack.config.js bin/www routes/*.js routes/*/*.js src/*/*.js src/*.jsx src/*/*.jsx tests/*/*.js tests/*/*.jsx && echo 'ESlint - Success' && echo ''",
"test:jest": "echo 'Run JEST' && jest --env=jsdom && echo 'JEST - Success' && echo ''",
"test:update": "echo 'Update JEST snapshot' && jest --env=jsdom --updateSnapshot && echo 'Update JEST snapshot - Success' && echo ''",
"test:watch": "echo 'Start JEST watch' && jest --env=jsdom --watch && echo 'Start JEST watch - Success' && echo ''",
"test:jest": "echo 'Run JEST' && jest --env=jsdom --silent && echo 'JEST - Success' && echo ''",
"test:update": "echo 'Update JEST snapshot' && jest --env=jsdom --updateSnapshot --silent && echo 'Update JEST snapshot - Success' && echo ''",
"test:watch": "echo 'Start JEST watch' && jest --env=jsdom --watch --silent && echo 'Start JEST watch - Success' && echo ''",
"deploy": "echo 'Deploy github pages for demo' && demo/demo_deploy.sh && echo 'Deploy github pages for demo - Success' && echo ''"
},
"repository": {
Expand Down
40 changes: 28 additions & 12 deletions tests/__tests__/__snapshots__/r3aboutdialog-test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`R3AboutDialog test snapshot for R3AboutDialog 1`] = `
<
aria-label="about dialog"
className="MuiDialog-root css-1h8td7x-MuiDialog-root"
className="MuiDialog-root css-1pivxxs-MuiDialog-root"
closeAfterTransition={true}
components={
{
Expand Down Expand Up @@ -33,6 +33,11 @@ exports[`R3AboutDialog test snapshot for R3AboutDialog 1`] = `
"__emotion_styles": [
"label:MuiDialog-backdrop;",
[Function],
{
"name": "1mbdz04",
"next": undefined,
"styles": "z-index:-1;",
},
[Function],
[Function],
],
Expand Down Expand Up @@ -72,41 +77,52 @@ exports[`R3AboutDialog test snapshot for R3AboutDialog 1`] = `
}
>
<div
className="MuiDialog-container MuiDialog-scrollBody css-1hsk4vd-MuiDialog-container"
className="MuiDialog-container MuiDialog-scrollBody css-xmd51d-MuiDialog-container"
onMouseDown={[Function]}
>
<div
aria-labelledby=":r0:"
className="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollBody MuiDialog-paperWidthSm MuiDialog-paperFullWidth css-3q99l0-MuiPaper-root-MuiDialog-paper"
aria-modal={true}
className="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollBody MuiDialog-paperWidthSm MuiDialog-paperFullWidth css-155t3jt-MuiPaper-root-MuiDialog-paper"
role="dialog"
style={
{
"--Paper-shadow": "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
}
}
>
<h2
className="MuiTypography-root MuiTypography-h6 MuiDialogTitle-root css-5unaky-MuiTypography-root-MuiDialogTitle-root"
className="MuiTypography-root MuiTypography-h6 MuiDialogTitle-root css-1cw1x2b-MuiTypography-root-MuiDialogTitle-root"
id=":r0:"
label="about-dialog"
style={{}}
>
<span
className="MuiTypography-root MuiTypography-h5 MuiTypography-noWrap css-1h4f5vm-MuiTypography-root"
className="MuiTypography-root MuiTypography-h5 MuiTypography-noWrap css-paidjd-MuiTypography-root"
style={{}}
>
About
K2HR3
</span>
</h2>
<div
className="MuiDialogContent-root css-1eb5co6-MuiDialogContent-root"
className="MuiDialogContent-root css-1ozqmnk-MuiDialogContent-root"
>
<span
className="MuiTypography-root MuiDialogContentText-root MuiTypography-body1 MuiDialogContentText-root css-8d6sz0-MuiTypography-root-MuiDialogContentText-root"
className="MuiTypography-root MuiDialogContentText-root MuiTypography-body1 MuiDialogContentText-root css-asjdh5-MuiTypography-root-MuiDialogContentText-root"
style={{}}
>
<span
className="MuiTypography-root MuiTypography-h6 css-1noxuy3-MuiTypography-root"
className="MuiTypography-root MuiTypography-h6 css-md3at6-MuiTypography-root"
style={{}}
>
License:
MIT
<br />
</span>
<span
className="MuiTypography-root MuiTypography-body2 css-wa45k7-MuiTypography-root"
className="MuiTypography-root MuiTypography-body2 css-1a8qmnc-MuiTypography-root"
style={{}}
>
K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers commonmanagement information for the cloud.K2HR3 can dynamically manage information as "who", "what", "operate".These are stored as roles, resources, policies in K2hdkc, and the clientsystem can dynamically read and modify these information.
<br />
Expand All @@ -116,11 +132,11 @@ exports[`R3AboutDialog test snapshot for R3AboutDialog 1`] = `
</span>
</div>
<div
className="MuiDialogActions-root MuiDialogActions-spacing css-knqc4i-MuiDialogActions-root"
className="MuiDialogActions-root MuiDialogActions-spacing css-15fu35s-MuiDialogActions-root"
>
<button
aria-label="close about dialog"
className="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorSecondary MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorSecondary css-1rcb7ll-MuiButtonBase-root-MuiButton-root"
className="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorSecondary MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorSecondary css-2olak9-MuiButtonBase-root-MuiButton-root"
disabled={false}
onBlur={[Function]}
onClick={[Function]}
Expand All @@ -141,7 +157,7 @@ exports[`R3AboutDialog test snapshot for R3AboutDialog 1`] = `
CLOSE
<svg
aria-hidden={true}
className="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1kpp06s-MuiSvgIcon-root"
className="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-2zpagu-MuiSvgIcon-root"
data-testid="CancelIcon"
focusable="false"
viewBox="0 0 24 24"
Expand Down
Loading

0 comments on commit 5b804d3

Please sign in to comment.