Skip to content

Commit

Permalink
Merge branch 'release' into feature/#163-support-for-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
bbortt authored Oct 1, 2023
2 parents 0463774 + 8a36dc1 commit 431c5ff
Show file tree
Hide file tree
Showing 19 changed files with 13,504 additions and 13,328 deletions.
8 changes: 6 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:prettier/recommended"
"plugin:prettier/recommended",
"eslint:recommended"
],
"rules": {
"@angular-eslint/component-selector": [
Expand All @@ -29,7 +30,10 @@
"style": "camelCase",
"type": "attribute"
}
]
],
"no-unused-vars": "warn",
"no-undef": "warn",
"no-self-assign": "warn"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: Prettier Check Codebase
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
cache: 'npm'
Expand All @@ -17,7 +17,7 @@ jobs:
name: Lint Codebase
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Publish to GitHub Pages
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-20.04
environment: NPM
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_PAT }}
- uses: actions/setup-node@v3
Expand Down
21 changes: 19 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,27 @@ jobs:
name: Node.js CI
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x, 19.x]
node-version: [16.x, 18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
cache: 'npm'
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build:lib
- run: npm test
- run: npm run build:pages
support:
name: Node.js unstable
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [19.x, 20.x]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
cache: 'npm'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/out-tsc

# dependencies
/.npm
/node_modules
yarn.lock

Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install pretty-quick --staged
npx --no-install lint-staged
9 changes: 9 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"{,e2e/**/,projects/**/,src/**/}*.{js,ts,tsx,css}": [
"eslint --fix",
"prettier --write -u"
],
"{,e2e/**/,projects/**/,src/**/}*.{md,json,html,css,scss}": [
"prettier --write -u"
]
}
21 changes: 3 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,9 @@ imports: [
<form [formGroup]="group">
<mat-form-field>
<mat-placeholder>Start DateTime</mat-placeholder>
<mat-datetimepicker-toggle
[for]="datetimePicker"
matSuffix
></mat-datetimepicker-toggle>
<mat-datetimepicker
#datetimePicker
type="datetime"
openOnFocus="true"
timeInterval="5"
>
</mat-datetimepicker>
<input
matInput
formControlName="start"
[matDatetimepicker]="datetimePicker"
required
autocomplete="false"
/>
<mat-datetimepicker-toggle [for]="datetimePicker" matSuffix></mat-datetimepicker-toggle>
<mat-datetimepicker #datetimePicker type="datetime" openOnFocus="true" timeInterval="5"> </mat-datetimepicker>
<input matInput formControlName="start" [matDatetimepicker]="datetimePicker" required autocomplete="false" />
</mat-form-field>
</form>
```
Expand Down
Loading

0 comments on commit 431c5ff

Please sign in to comment.