Skip to content

Commit

Permalink
Merge pull request #354 from nlnwa/angular14
Browse files Browse the repository at this point in the history
 Update to Angular 14
  • Loading branch information
andrbo authored Aug 23, 2022
2 parents e084a3c + 25e3f4b commit 7adfd08
Show file tree
Hide file tree
Showing 218 changed files with 5,184 additions and 27,245 deletions.
33 changes: 33 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}
28 changes: 28 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,34 @@ jobs:
- name: Test
run: yarn test -- --watch=false --browsers=ChromeHeadless

lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: 14.x

- id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: yarn install --non-interactive --frozen-lockfile --prefer-offline

- name: Lint
run: yarn lint

build-docs:
runs-on: ubuntu-latest

Expand Down
28 changes: 24 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
"node_modules/prismjs/themes/prism.css",
"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
"node_modules/prismjs/plugins/match-braces/prism-match-braces.css",
"node_modules/nano-editor/src/style.css"
"node_modules/nano-editor/src/style.css",
"node_modules/nano-editor/lib/style.css",
"node_modules/@fullcalendar/common/main.css",
"node_modules/@fullcalendar/daygrid/main.css",
"node_modules/@fullcalendar/timegrid/main.css"
],
"scripts": [],
"allowedCommonJsDependencies": [
Expand Down Expand Up @@ -119,7 +123,11 @@
"src/styles/theme.scss",
"node_modules/prismjs/themes/prism.css",
"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
"node_modules/nano-editor/src/style.css"
"node_modules/nano-editor/src/style.css",
"node_modules/nano-editor/lib/style.css",
"node_modules/@fullcalendar/common/main.css",
"node_modules/@fullcalendar/daygrid/main.css",
"node_modules/@fullcalendar/timegrid/main.css"
],
"assets": [
"src/assets",
Expand All @@ -130,13 +138,25 @@
}
]
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"defaultProject": "veidemann-dashboard",
"cli": {
"analytics": false,
"packageManager": "yarn"
"packageManager": "yarn",
"schematicCollections": [
"@angular-eslint/schematics",
"@angular-eslint/schematics"
]
}
}
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = function (config) {
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},

reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
Expand Down
Loading

0 comments on commit 7adfd08

Please sign in to comment.