Skip to content

Commit

Permalink
Merge pull request #414 from metrico/fix/security_update_braces
Browse files Browse the repository at this point in the history
fix: security updates and version workflow
  • Loading branch information
jacovinus authored Jun 17, 2024
2 parents 379fbbe + 2635cff commit 7ca4464
Show file tree
Hide file tree
Showing 4 changed files with 3,827 additions and 3,092 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,27 @@ jobs:

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: "Main Package Version Bump"
if: github.event_name != 'pull_request'
id: main-version
uses: "phips28/gh-action-bump-version@master"
with:
tag-prefix: "v"
skip-tag: true

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PACKAGEJSON_DIR: 'packages/main'

- name: "version check"
if: github.event_name != 'pull_request'
run: echo ${{steps.version.outputs.newTag}}

- name: "main version check"
if: github.event_name != 'pull_request'
run: echo ${{steps.main-version.outputs.newTag}}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@types/node": "^20.11.30",
"@types/react": "^18.2.68",
"@types/node": "^20.14.2",
"@types/react": "^18.3.3",
"jsdom": "24.1.0",
"turbo": "^1.13.0",
"typescript": "^5.4.3"
"turbo": "^1.13.4",
"typescript": "^5.4.5"
},
"dependencies": {
"jsdom": "24.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"ts-node": "^10.9.2"
}
}
42 changes: 21 additions & 21 deletions packages/main/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ui/main",
"private": true,
"version": "0.28.8",
"version": "1.0.0",
"type": "module",
"scripts": {
"dev": "VITE_APP_VERSION=$npm_package_version vite",
Expand All @@ -13,27 +13,27 @@
"@emotion/css": "^11.11.2",
"@emotion/is-prop-valid": "^1.2.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@emotion/styled": "^11.11.5",
"@microlink/react-json-view": "latest",
"@mui/base": "5.0.0-beta.5",
"@mui/icons-material": "^5.15.14",
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.15.20",
"@mui/styles": "^5.15.14",
"@mui/styles": "^5.15.20",
"@mui/x-charts": "6.0.0-alpha.12",
"@szhsin/react-menu": "^4.1.0",
"@tanstack/match-sorter-utils": "^8.11.8",
"@tanstack/react-table": "^8.15.0",
"axios": "^1.6.8",
"@tanstack/match-sorter-utils": "^8.15.1",
"@tanstack/react-table": "^8.17.3",
"axios": "^1.7.2",
"classnames": "^2.5.1",
"combokeys": "^3.0.1",
"date-fns": "^2.30.0",
"dayjs": "^1.11.10",
"dayjs": "^1.11.11",
"deep-freeze": "^0.0.1",
"dnd-core": "^16.0.1",
"fuzzy": "^0.1.3",
"immutability-helper": "^3.1.1",
"isomorphic-dompurify": "^1.13.0",
"javascript-time-ago": "^2.5.9",
"javascript-time-ago": "^2.5.10",
"jquery": "^3.7.1",
"jsdom": "24.1.0",
"json-markup": "^1.1.4",
Expand All @@ -45,45 +45,45 @@
"nanoid": "^4.0.2",
"papaparse": "^5.4.1",
"prismjs": "^1.29.0",
"react": "^18.2.0",
"react": "^18.3.1",
"react-cookie": "^4.1.1",
"react-day-picker": "^8.10.1",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"react-flot": "^1.3.0",
"react-redux": "^8.1.3",
"react-responsive": "^9.0.2",
"react-router-dom": "^6.22.3",
"react-router-dom": "^6.23.1",
"react-select": "^5.8.0",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
"reselect": "^4.1.8",
"slate": "^0.94.1",
"slate-history": "^0.93.0",
"slate-react": "^0.105.0",
"tss-react": "^4.9.6",
"tss-react": "^4.9.10",
"zustand": "^4.5.2"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.11.0",
"@testing-library/react": "^14.2.2",
"@testing-library/react": "^14.3.1",
"@types/jest": "^29.5.12",
"@types/react": "^18.2.68",
"@types/react-dom": "^18.2.22",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.3.5",
"happy-dom": "^13.10.1",
"jsdom": "24.1.0",
"prettier": "^3.2.5",
"sass": "^1.72.0",
"prettier": "^3.3.2",
"sass": "^1.77.5",
"scss": "^0.2.4",
"typescript": "^5.4.3",
"typescript": "^5.4.5",
"vite": "^5.3.1",
"vitest": "^0.32.4"
}
Expand Down
Loading

0 comments on commit 7ca4464

Please sign in to comment.