Skip to content

Commit 5b60f70

Browse files
authored
Merge pull request #18 from daiscog/angular-17
Angular 17
2 parents ffd8fac + a3f17a9 commit 5b60f70

File tree

19 files changed

+6582
-21251
lines changed

19 files changed

+6582
-21251
lines changed

.github/workflows/npm-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-node@v2
1616
with:
17-
node-version: 16
17+
node-version: 18
1818
registry-url: https://registry.npmjs.org/
1919
- run: npm ci
2020
- run: npm run build

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
with:
1616
ref: ${{ github.base_ref }}
1717
- uses: actions/checkout@v2
18-
- name: Use Node.js 16.x
18+
- name: Use Node.js 18.x
1919
uses: actions/setup-node@v2
2020
with:
21-
node-version: 16.x
21+
node-version: 18.x
2222
- run: npm ci
2323
- run: npm run build
2424
- run: npm run test

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ testem.log
3939
Thumbs.db
4040

4141
.angular
42+
43+
.nx/cache

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
18

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
/dist
44
/coverage
55
.angular
6+
7+
/.nx/cache

apps/examples-e2e/project.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
}
2222
},
2323
"lint": {
24-
"executor": "@nx/linter:eslint",
25-
"outputs": ["{options.outputFile}"],
26-
"options": {
27-
"lintFilePatterns": ["apps/examples-e2e/**/*.{js,ts}"]
28-
}
24+
"executor": "@nx/eslint:lint",
25+
"outputs": ["{options.outputFile}"]
2926
}
3027
},
3128
"tags": [],

apps/examples/project.json

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,29 @@
5050
"executor": "@angular-devkit/build-angular:dev-server",
5151
"configurations": {
5252
"production": {
53-
"browserTarget": "examples:build:production"
53+
"buildTarget": "examples:build:production"
5454
},
5555
"development": {
56-
"browserTarget": "examples:build:development"
56+
"buildTarget": "examples:build:development"
5757
}
5858
},
5959
"defaultConfiguration": "development"
6060
},
6161
"extract-i18n": {
6262
"executor": "@angular-devkit/build-angular:extract-i18n",
6363
"options": {
64-
"browserTarget": "examples:build"
64+
"buildTarget": "examples:build"
6565
}
6666
},
6767
"lint": {
68-
"executor": "@nx/linter:eslint",
69-
"outputs": ["{options.outputFile}"],
70-
"options": {
71-
"lintFilePatterns": ["apps/examples/**/*.ts", "apps/examples/**/*.html"]
72-
}
68+
"executor": "@nx/eslint:lint",
69+
"outputs": ["{options.outputFile}"]
7370
},
7471
"test": {
7572
"executor": "@nx/jest:jest",
7673
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
7774
"options": {
78-
"jestConfig": "apps/examples/jest.config.ts",
79-
"passWithNoTests": true
80-
},
81-
"configurations": {
82-
"ci": {
83-
"ci": true,
84-
"codeCoverage": true
85-
}
75+
"jestConfig": "apps/examples/jest.config.ts"
8676
}
8777
},
8878
"serve-static": {

apps/examples/src/app/basic-smart-dumb-example/basic-smart/basic-smart.component.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { Brewery } from '../model/brewery';
66
import { RandomBreweryService } from '../random-brewery.service';
77
import * as angularCore from '@angular/core';
88

9+
jest.mock('@angular/core');
10+
911
describe('BasicSmartComponent', () => {
1012
function createComponent(): {
1113
component: BasicSmartComponent;

apps/examples/src/app/multiple-data-sources/container/multiple-sources-container.component.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import {
1212
} from 'ngx-http-request-state';
1313
import { HttpErrorResponse } from '@angular/common/http';
1414

15+
jest.mock('@angular/core');
16+
1517
describe('MultipleSourcesContainerComponent', () => {
1618
function setup(): {
1719
component: MultipleSourcesContainerComponent;

libs/ngx-http-request-state/.eslintrc.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22
"extends": ["../../.eslintrc.json"],
33
"ignorePatterns": ["!**/*"],
44
"overrides": [
5+
{
6+
"files": "package.json",
7+
"parser": "jsonc-eslint-parser",
8+
"rules": {
9+
"@nx/dependency-checks": [
10+
"error",
11+
{
12+
"ignoredDependencies": ["tslib"],
13+
"ignoredFiles": [
14+
"**/jest.config.ts",
15+
"**/test-setup.ts",
16+
"**/*.spec.ts"
17+
]
18+
}
19+
]
20+
}
21+
},
522
{
623
"files": ["*.ts"],
724
"rules": {

0 commit comments

Comments
 (0)