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.

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

[#771] add pre commit hook for linting and formatting #875

Merged
merged 3 commits into from
Dec 21, 2022
Merged
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
19 changes: 19 additions & 0 deletions ui/.husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#!/usr/bin/env sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add an apache header here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @bossenti,
thanks for your feedback :) I will add the missing apache header and also some documentation for the initial setup.

I'm also already working on a CI integration, but I think we should open a second PR for this. This second PR will be very large, because we have to "prettify" all existing files, in order to pass the CI pipeline. And I think this is not closely related to the pre commit hook. What's your opionion on this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great to here, +1 for having a dedicated PR for the reformatting
With regard to our Java codebase we apply the code style check module by module in #820.
Do you think splitting up would also make sense for the UI somehow although we don't have the same module structure there?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, thanks a lot for the PR @smlabt.
I'm in favor of activating it module by module (if that is possible), since I'm not sure if a "full" automated reformatting might have some unexpected side effects.
I guess it makes sense to first get a bit more comfortable with the styling guidelines. What do you think?

. "$(dirname -- "$0")/_/husky.sh"

cd ui && npm run lint-staged
4 changes: 4 additions & 0 deletions ui/.lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"*.*": "prettier --check",
"src/**/*.ts": ["ng-lint-staged lint --"]
}
38 changes: 38 additions & 0 deletions ui/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->

# Streampipes UI

## Development

Please make sure you have a recent version of [node](https://nodejs.org/en/) and npm (bundled with node) installed.

To build the ui, perform the following steps:

```
npm install
# for NPM > v7, run npm install --legacy-peer-deps
npm run build
```

### Formatting and Linting

Running `npm install` will cause a pre-commit hook to be created.
This hook ensures that if you want to commit changes to this repository, these changes are compliant with our [formatting](https://prettier.io/) and [linting](https://eslint.org/) rules.

If you see errors there, you can try to run `npm run format:fix` and `npm run lint:fix` to fix these issues automatically. Otherwise you have to run `npm run format` and `npm run lint` to get additional information about the problems.
16 changes: 12 additions & 4 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,16 @@
"run-prebuild-script": "node ./deployment/prebuild.js",
"build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=8192 && npm run build-libraries && ng build --configuration production",
"build-dev": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=8192 && npm run build-libraries && ng build",
"lint": "prettier --check . && ng lint",
"lint": "ng lint",
"lint:fix": "ng lint --fix",
"format": "prettier --check .",
"format:fix": "prettier --fix .",
"lint-staged": "lint-staged",
"analyze": "webpack-bundle-analyzer dist/stats.json",
"test-cypress-open": "cypress open",
"test-cypress-smoke": "npx cypress run --spec 'cypress/tests/**/*.smoke.spec.ts'",
"test-cypress-all": "npx cypress run --spec 'cypress/tests/**/*.spec.ts'"
"test-cypress-all": "npx cypress run --spec 'cypress/tests/**/*.spec.ts'",
"prepare": "cd ../ && husky install ./ui/.husky"
},
"peerDependencies": {
"@streampipes/platform-services": "0.0.1",
Expand Down Expand Up @@ -120,9 +125,10 @@
"csv-string": "^4.1.0",
"cypress": "^10.9.0",
"cypress-file-upload": "^5.0.8",
"eslint": "8.22.0",
"eslint": "8.28.0",
"eslint-config-prettier": "^8.5.0",
"html-webpack-plugin": "^5.5.0",
"husky": "^8.0.2",
"jasmine-core": "^3.6.0",
"js-yaml": "^3.14.0",
"karma": "~6.3.4",
Expand All @@ -132,10 +138,12 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-verbose-reporter": "0.0.6",
"lint-staged": "^13.1.0",
"mustache": "^2.3.0",
"ng-lint-staged": "^12.0.4",
"ng-packagr": "^14.2.2",
"path": "^0.12.7",
"prettier": "1.14.2",
"prettier": "2.8.0",
"raw-loader": "^4.0.2",
"resize-observer-polyfill": "^1.5.1",
"to-string-loader": "^1.1.5",
Expand Down