Skip to content

Commit

Permalink
Removed control statement that was effecting return code status, inst…
Browse files Browse the repository at this point in the history
…ead rely on on/pull_requests/paths to identify matching paths. Change prettier configuration to use single space indenting. Updated package-lock.json with new indenting. Added configuration to define node and npm versions.
  • Loading branch information
whitingjr committed Apr 19, 2024
1 parent 7947060 commit e9606c0
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 82 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,4 @@ jobs:
run: npm install prettier

- name: Check formatting
run: |
if [[ -n "$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} -- horreum-web/package-lock.json)" ]]; then
npx prettier --check "horreum-web/package-lock.json"
fi
run: npx prettier --check "horreum-web/package-lock.json"
2 changes: 1 addition & 1 deletion horreum-web/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"trailingComma": "es5",
"singleQuote": false,
"printWidth": 120,
"tabWidth": 2,
"tabWidth": 1,
"arrowParens": "avoid",
"useTabs": false
}
4 changes: 4 additions & 0 deletions horreum-web/package-lock.json

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

157 changes: 80 additions & 77 deletions horreum-web/package.json
Original file line number Diff line number Diff line change
@@ -1,80 +1,83 @@
{
"name": "horreum-web",
"version": "0.1.0",
"private": true,
"type": "module",
"dependencies": {
"@monaco-editor/react": "4.6.0",
"@patternfly/patternfly": "5.2.1",
"@patternfly/react-core": "5.2.3",
"@patternfly/react-table": "5.2.4",
"@types/jsonpath": "0.2.4",
"@types/luxon": "3.2.0",
"@types/react": "17.0.74",
"@types/react-autosuggest": "10.1.11",
"@types/react-dom": "18.2.18",
"@types/react-redux": "7.1.20",
"@types/react-table": "7.7.19",
"@types/uuid": "9.0.1",
"@vitejs/plugin-react": "4.2.1",
"clsx": "2.1.0",
"fetchival": "0.3.3",
"github-markdown-css": "5.5.1",
"jshint": "2.13.6",
"jsonpath": "1.1.1",
"keycloak-js": "23.0.3",
"luxon": "3.3.0",
"moment": "2.30.1",
"monaco-editor": "0.47.0",
"react": "18.2.0",
"react-autosuggest": "10.1.0",
"react-dom": "18.2.0",
"react-markdown": "8.0.7",
"react-redux": "7.2.7",
"react-router": "6.22.3",
"react-router-dom": "6.22.3",
"react-table": "7.8.0",
"react-to-print": "2.14.15",
"recharts": "2.12.1",
"redux": "4.2.1",
"redux-thunk": "2.4.2",
"typescript": "5.3.3",
"uuid": "9.0.0",
"vite": "5.2.9",
"vite-tsconfig-paths": "4.3.1"
},
"scripts": {
"dev": "vite",
"build": "tsc && vite build ",
"preview": "vite preview",
"lint": "eslint \"**/*.{ts,tsx}\"",
"prettier-format": "prettier --config .prettierrc \"**/*.{ts,tsx}\" --write"
},
"eslintConfig": {
"extends": "react-app",
"rules": {
"no-lone-blocks": 0
}
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/node": "20.12.5",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"eslint": "8.57.0",
"prettier": "3.2.5",
"react-error-overlay": "6.0.11"

"name": "horreum-web",
"version": "0.1.0",
"private": true,
"type": "module",
"dependencies": {
"@monaco-editor/react": "4.6.0",
"@patternfly/patternfly": "5.2.1",
"@patternfly/react-core": "5.2.3",
"@patternfly/react-table": "5.2.4",
"@types/jsonpath": "0.2.4",
"@types/luxon": "3.2.0",
"@types/react": "17.0.74",
"@types/react-autosuggest": "10.1.11",
"@types/react-dom": "18.2.18",
"@types/react-redux": "7.1.20",
"@types/react-table": "7.7.19",
"@types/uuid": "9.0.1",
"@vitejs/plugin-react": "4.2.1",
"clsx": "2.1.0",
"fetchival": "0.3.3",
"github-markdown-css": "5.5.1",
"jshint": "2.13.6",
"jsonpath": "1.1.1",
"keycloak-js": "23.0.3",
"luxon": "3.3.0",
"moment": "2.30.1",
"monaco-editor": "0.47.0",
"react": "18.2.0",
"react-autosuggest": "10.1.0",
"react-dom": "18.2.0",
"react-markdown": "8.0.7",
"react-redux": "7.2.7",
"react-router": "6.22.3",
"react-router-dom": "6.22.3",
"react-table": "7.8.0",
"react-to-print": "2.14.15",
"recharts": "2.12.1",
"redux": "4.2.1",
"redux-thunk": "2.4.2",
"typescript": "5.3.3",
"uuid": "9.0.0",
"vite": "5.2.9",
"vite-tsconfig-paths": "4.3.1"
},
"scripts": {
"dev": "vite",
"build": "tsc && vite build ",
"preview": "vite preview",
"lint": "eslint \"**/*.{ts,tsx}\"",
"prettier-format": "prettier --config .prettierrc \"**/*.{ts,tsx}\" --write"
},
"eslintConfig": {
"extends": "react-app",
"rules": {
"no-lone-blocks": 0
}
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/node": "20.12.5",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"eslint": "8.57.0",
"prettier": "3.2.5",
"react-error-overlay": "6.0.11"
},
"engines": {
"npm": "10",
"node": "20"
}
}

0 comments on commit e9606c0

Please sign in to comment.