Skip to content

Commit b6e1ac6

Browse files
authored
Merge pull request #4 from daiscog/angular-14
Angular 14
2 parents 4cd5fa2 + 653b058 commit b6e1ac6

21 files changed

+7920
-6364
lines changed

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"singleQuote": true
3-
}
3+
}

angular.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"builder": "@nrwl/jest:jest",
9191
"outputs": ["coverage/apps/examples"],
9292
"options": {
93-
"jestConfig": "apps/examples/jest.config.js",
93+
"jestConfig": "apps/examples/jest.config.ts",
9494
"passWithNoTests": true
9595
}
9696
}
@@ -134,7 +134,7 @@
134134
"options": {
135135
"tsConfig": "libs/ngx-http-request-state/tsconfig.lib.json",
136136
"project": "libs/ngx-http-request-state/ng-package.json",
137-
"updateBuildableProjectDepsInPackageJson": false
137+
"updateBuildableProjectDepsInPackageJson": true
138138
},
139139
"configurations": {
140140
"production": {
@@ -156,7 +156,7 @@
156156
"builder": "@nrwl/jest:jest",
157157
"outputs": ["coverage/libs/ngx-http-request-state"],
158158
"options": {
159-
"jestConfig": "libs/ngx-http-request-state/jest.config.js",
159+
"jestConfig": "libs/ngx-http-request-state/jest.config.ts",
160160
"passWithNoTests": true
161161
}
162162
}

apps/examples/jest.config.js renamed to apps/examples/jest.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'examples',
34
preset: '../../jest.preset.js',
45
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

apps/examples/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
7-
"files": ["src/main.ts", "src/polyfills.ts"]
7+
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"exclude": ["jest.config.ts"]
89
}

apps/examples/tsconfig.editor.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"include": ["**/*.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
6-
}
6+
},
7+
"exclude": ["jest.config.ts"]
78
}

apps/examples/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
{
1313
"path": "./tsconfig.editor.json"
1414
}
15-
]
15+
],
16+
"compilerOptions": {
17+
"target": "es2020"
18+
}
1619
}

apps/examples/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
const { getJestProjects } = require('@nrwl/jest');
22

3-
module.exports = { projects: getJestProjects() };
3+
export default { projects: getJestProjects() };

jest.preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
22

33
module.exports = { ...nxPreset };

libs/ngx-http-request-state/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ An Angular library for wrapping HttpClient responses with loading & error inform
55
Allows observing the whole lifecycle of HTTP requests as a single observable stream
66
of state changes, simplifying handling of loading, loaded & error states.
77

8+
## Versions
9+
10+
Use version `2.x.x` for Angular 14.
11+
Use version `1.2.0` for Angular 13 or earlier.
12+
813
## API
914

1015
The library declares an `HttpRequestState` interface to reflect the state of an HTTP

0 commit comments

Comments
 (0)