Skip to content

Commit 243cbde

Browse files
crutchcorncrutchcorn
committed
chore: fix up test configs
1 parent 1e863ee commit 243cbde

File tree

12 files changed

+166
-19
lines changed

12 files changed

+166
-19
lines changed

‎angular.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
"test": {
2828
"builder": "@angular-devkit/build-angular:jest",
2929
"options": {
30+
"exclude": [
31+
"**/schematics/ng-add/*.spec.ts"
32+
],
3033
"tsConfig": "projects/angular-redux/tsconfig.spec.json",
3134
"polyfills": [
3235
"zone.js",

‎package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"start": "ng serve",
77
"build": "ng build",
88
"watch": "ng build --watch --configuration development",
9-
"test": "ng test"
9+
"test": "yarn test:ng && yarn test:schematics",
10+
"test:ng": "ng test",
11+
"test:schematics": "cd projects/angular-redux/schematics && jest"
1012
},
1113
"workspaces": {
1214
"packages": [
@@ -44,6 +46,7 @@
4446
"jest": "^29.7.0",
4547
"jest-environment-jsdom": "^29.7.0",
4648
"ng-packagr": "^18.2.0",
49+
"ts-jest": "^29.2.5",
4750
"typescript": "~5.5.2"
4851
},
4952
"packageManager": "yarn@4.1.0"

‎projects/angular-redux/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"peerDependencies": {
1414
"@angular/common": ">=17.3.0",
1515
"@angular/core": ">=17.3.0",
16-
"redux": "^5.0.0",
17-
"@reduxjs/toolkit": "^2.2.7"
16+
"@reduxjs/toolkit": "^2.2.7",
17+
"redux": "^5.0.0"
1818
},
1919
"peerDependenciesMeta": {
20-
"redux": {
20+
"@reduxjs/toolkit": {
2121
"optional": true
2222
},
23-
"@reduxjs/toolkit": {
23+
"redux": {
2424
"optional": true
2525
}
2626
},

‎projects/angular-redux/schematics-core/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ export const stringUtils = {
6969
pluralize,
7070
};
7171

72-
export { updatePackage } from './utility/update';
73-
7472
export { parseName } from './utility/parse-name';
7573

7674
export { addPackageToPackageJson } from './utility/package';

‎projects/angular-redux/schematics-core/utility/project.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { TargetDefinition } from '@angular-devkit/core/src/workspace';
1+
// import { TargetDefinition } from '@angular-devkit/core/src/workspace';
22
import { getWorkspace } from './config';
33
import { SchematicsException, Tree } from '@angular-devkit/schematics';
44

55
export interface WorkspaceProject {
66
root: string;
77
projectType: string;
88
architect: {
9-
[key: string]: TargetDefinition;
9+
// [key: string]: TargetDefinition;
10+
[key: string]: any;
1011
};
1112
}
1213

‎projects/angular-redux/schematics/jest.config.mjs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
export default {
2+
displayName: 'Schematics',
3+
coverageDirectory: '../../coverage/modules/schematics',
4+
transform: {
5+
'^.+\\.(ts|mjs|js)$': [
6+
'ts-jest',
7+
{
8+
tsconfig: '<rootDir>/tsconfig.spec.json'
9+
},
10+
],
11+
},
12+
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)']
13+
};

‎projects/angular-redux/schematics/ng-add/files/__statePath__/counter-slice.ts.template renamed to ‎projects/angular-redux/schematics/ng-add/files/__storePath__/counter-slice.ts.template

File renamed without changes.

‎projects/angular-redux/schematics/ng-add/files/__statePath__/index.ts.template renamed to ‎projects/angular-redux/schematics/ng-add/files/__storePath__/index.ts.template

File renamed without changes.

‎projects/angular-redux/schematics/ng-add/index.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as fs from "fs";
22
import * as path from "path";
3-
import { fileURLToPath } from 'url';
43
import * as ts from 'typescript';
54
import {
65
Rule,
@@ -95,10 +94,7 @@ function addImportToNgModule(options: AngularReduxOptions): Rule {
9594
};
9695
}
9796

98-
const __filename = fileURLToPath(import.meta.url);
99-
const __dirname = path.dirname(__filename);
100-
101-
const angularReduxPackageMeta = fs.readFile(path.resolve(__dirname, '../../package.json')) as {
97+
const angularReduxPackageMeta = fs.readFileSync(path.resolve(__dirname, '../../package.json')) as unknown as {
10298
version: string;
10399
peerDependencies: {
104100
[key: string]: string;

‎projects/angular-redux/schematics/tsconfig.spec.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"extends": "../../../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "../../out-tsc/spec",
5+
"emitDecoratorMetadata": true,
6+
"types": [
7+
"jest",
8+
"node"
9+
]
10+
},
11+
"include": [
12+
"**/*.spec.ts",
13+
"**/*.d.ts"
14+
]
15+
}

‎projects/angular-redux/tsconfig.spec.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@
1212
"include": [
1313
"**/*.spec.ts",
1414
"**/*.d.ts"
15+
],
16+
"exclude": [
17+
"./schematics/**/*.ts",
18+
"./schematics-core/**/*.ts"
1519
]
1620
}

‎yarn.lock

Lines changed: 119 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3162,6 +3162,7 @@ __metadata:
31623162
ng-packagr: "npm:^18.2.0"
31633163
redux: "npm:^5.0.1"
31643164
rxjs: "npm:~7.8.0"
3165+
ts-jest: "npm:^29.2.5"
31653166
tslib: "npm:^2.3.0"
31663167
typescript: "npm:~5.5.2"
31673168
zone.js: "npm:~0.14.10"
@@ -3176,8 +3177,11 @@ __metadata:
31763177
peerDependencies:
31773178
"@angular/common": ">=17.3.0"
31783179
"@angular/core": ">=17.3.0"
3180+
"@reduxjs/toolkit": ^2.2.7
31793181
redux: ^5.0.0
31803182
peerDependenciesMeta:
3183+
"@reduxjs/toolkit":
3184+
optional: true
31813185
redux:
31823186
optional: true
31833187
languageName: unknown
@@ -4499,6 +4503,13 @@ __metadata:
44994503
languageName: node
45004504
linkType: hard
45014505

4506+
"async@npm:^3.2.3":
4507+
version: 3.2.6
4508+
resolution: "async@npm:3.2.6"
4509+
checksum: 10/cb6e0561a3c01c4b56a799cc8bab6ea5fef45f069ab32500b6e19508db270ef2dffa55e5aed5865c5526e9907b1f8be61b27530823b411ffafb5e1538c86c368
4510+
languageName: node
4511+
linkType: hard
4512+
45024513
"asynckit@npm:^0.4.0":
45034514
version: 0.4.0
45044515
resolution: "asynckit@npm:0.4.0"
@@ -4777,6 +4788,15 @@ __metadata:
47774788
languageName: node
47784789
linkType: hard
47794790

4791+
"bs-logger@npm:^0.2.6":
4792+
version: 0.2.6
4793+
resolution: "bs-logger@npm:0.2.6"
4794+
dependencies:
4795+
fast-json-stable-stringify: "npm:2.x"
4796+
checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212
4797+
languageName: node
4798+
linkType: hard
4799+
47804800
"bser@npm:2.1.1":
47814801
version: 2.1.1
47824802
resolution: "bser@npm:2.1.1"
@@ -4915,7 +4935,7 @@ __metadata:
49154935
languageName: node
49164936
linkType: hard
49174937

4918-
"chalk@npm:^4.0.0, chalk@npm:^4.1.0":
4938+
"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0":
49194939
version: 4.1.2
49204940
resolution: "chalk@npm:4.1.2"
49214941
dependencies:
@@ -5685,6 +5705,17 @@ __metadata:
56855705
languageName: node
56865706
linkType: hard
56875707

5708+
"ejs@npm:^3.1.10":
5709+
version: 3.1.10
5710+
resolution: "ejs@npm:3.1.10"
5711+
dependencies:
5712+
jake: "npm:^10.8.5"
5713+
bin:
5714+
ejs: bin/cli.js
5715+
checksum: 10/a9cb7d7cd13b7b1cd0be5c4788e44dd10d92f7285d2f65b942f33e127230c054f99a42db4d99f766d8dbc6c57e94799593ee66a14efd7c8dd70c4812bf6aa384
5716+
languageName: node
5717+
linkType: hard
5718+
56885719
"electron-to-chromium@npm:^1.5.4":
56895720
version: 1.5.18
56905721
resolution: "electron-to-chromium@npm:1.5.18"
@@ -6324,7 +6355,7 @@ __metadata:
63246355
languageName: node
63256356
linkType: hard
63266357

6327-
"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
6358+
"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
63286359
version: 2.1.0
63296360
resolution: "fast-json-stable-stringify@npm:2.1.0"
63306361
checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e
@@ -6365,6 +6396,15 @@ __metadata:
63656396
languageName: node
63666397
linkType: hard
63676398

6399+
"filelist@npm:^1.0.4":
6400+
version: 1.0.4
6401+
resolution: "filelist@npm:1.0.4"
6402+
dependencies:
6403+
minimatch: "npm:^5.0.1"
6404+
checksum: 10/4b436fa944b1508b95cffdfc8176ae6947b92825483639ef1b9a89b27d82f3f8aa22b21eed471993f92709b431670d4e015b39c087d435a61e1bb04564cf51de
6405+
languageName: node
6406+
linkType: hard
6407+
63686408
"fill-range@npm:^7.1.1":
63696409
version: 7.1.1
63706410
resolution: "fill-range@npm:7.1.1"
@@ -7402,6 +7442,20 @@ __metadata:
74027442
languageName: node
74037443
linkType: hard
74047444

7445+
"jake@npm:^10.8.5":
7446+
version: 10.9.2
7447+
resolution: "jake@npm:10.9.2"
7448+
dependencies:
7449+
async: "npm:^3.2.3"
7450+
chalk: "npm:^4.0.2"
7451+
filelist: "npm:^1.0.4"
7452+
minimatch: "npm:^3.1.2"
7453+
bin:
7454+
jake: bin/cli.js
7455+
checksum: 10/3be324708f99f031e0aec49ef8fd872eb4583cbe8a29a0c875f554f6ac638ee4ea5aa759bb63723fd54f77ca6d7db851eaa78353301734ed3700db9cb109a0cd
7456+
languageName: node
7457+
linkType: hard
7458+
74057459
"jasmine-core@npm:~5.2.0":
74067460
version: 5.2.0
74077461
resolution: "jasmine-core@npm:5.2.0"
@@ -7794,7 +7848,7 @@ __metadata:
77947848
languageName: node
77957849
linkType: hard
77967850

7797-
"jest-util@npm:^29.7.0":
7851+
"jest-util@npm:^29.0.0, jest-util@npm:^29.7.0":
77987852
version: 29.7.0
77997853
resolution: "jest-util@npm:29.7.0"
78007854
dependencies:
@@ -8245,6 +8299,13 @@ __metadata:
82458299
languageName: node
82468300
linkType: hard
82478301

8302+
"lodash.memoize@npm:^4.1.2":
8303+
version: 4.1.2
8304+
resolution: "lodash.memoize@npm:4.1.2"
8305+
checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da
8306+
languageName: node
8307+
linkType: hard
8308+
82488309
"lodash@npm:^4.17.21":
82498310
version: 4.17.21
82508311
resolution: "lodash@npm:4.17.21"
@@ -8337,6 +8398,13 @@ __metadata:
83378398
languageName: node
83388399
linkType: hard
83398400

8401+
"make-error@npm:^1.3.6":
8402+
version: 1.3.6
8403+
resolution: "make-error@npm:1.3.6"
8404+
checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
8405+
languageName: node
8406+
linkType: hard
8407+
83408408
"make-fetch-happen@npm:^13.0.0, make-fetch-happen@npm:^13.0.1":
83418409
version: 13.0.1
83428410
resolution: "make-fetch-happen@npm:13.0.1"
@@ -8495,7 +8563,7 @@ __metadata:
84958563
languageName: node
84968564
linkType: hard
84978565

8498-
"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1":
8566+
"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
84998567
version: 3.1.2
85008568
resolution: "minimatch@npm:3.1.2"
85018569
dependencies:
@@ -8504,6 +8572,15 @@ __metadata:
85048572
languageName: node
85058573
linkType: hard
85068574

8575+
"minimatch@npm:^5.0.1":
8576+
version: 5.1.6
8577+
resolution: "minimatch@npm:5.1.6"
8578+
dependencies:
8579+
brace-expansion: "npm:^2.0.1"
8580+
checksum: 10/126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429
8581+
languageName: node
8582+
linkType: hard
8583+
85078584
"minimatch@npm:^9.0.0, minimatch@npm:^9.0.4":
85088585
version: 9.0.5
85098586
resolution: "minimatch@npm:9.0.5"
@@ -10242,7 +10319,7 @@ __metadata:
1024210319
languageName: node
1024310320
linkType: hard
1024410321

10245-
"semver@npm:7.6.3, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4":
10322+
"semver@npm:7.6.3, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3":
1024610323
version: 7.6.3
1024710324
resolution: "semver@npm:7.6.3"
1024810325
bin:
@@ -10985,6 +11062,43 @@ __metadata:
1098511062
languageName: node
1098611063
linkType: hard
1098711064

11065+
"ts-jest@npm:^29.2.5":
11066+
version: 29.2.5
11067+
resolution: "ts-jest@npm:29.2.5"
11068+
dependencies:
11069+
bs-logger: "npm:^0.2.6"
11070+
ejs: "npm:^3.1.10"
11071+
fast-json-stable-stringify: "npm:^2.1.0"
11072+
jest-util: "npm:^29.0.0"
11073+
json5: "npm:^2.2.3"
11074+
lodash.memoize: "npm:^4.1.2"
11075+
make-error: "npm:^1.3.6"
11076+
semver: "npm:^7.6.3"
11077+
yargs-parser: "npm:^21.1.1"
11078+
peerDependencies:
11079+
"@babel/core": ">=7.0.0-beta.0 <8"
11080+
"@jest/transform": ^29.0.0
11081+
"@jest/types": ^29.0.0
11082+
babel-jest: ^29.0.0
11083+
jest: ^29.0.0
11084+
typescript: ">=4.3 <6"
11085+
peerDependenciesMeta:
11086+
"@babel/core":
11087+
optional: true
11088+
"@jest/transform":
11089+
optional: true
11090+
"@jest/types":
11091+
optional: true
11092+
babel-jest:
11093+
optional: true
11094+
esbuild:
11095+
optional: true
11096+
bin:
11097+
ts-jest: cli.js
11098+
checksum: 10/f89e562816861ec4510840a6b439be6145f688b999679328de8080dc8e66481325fc5879519b662163e33b7578f35243071c38beb761af34e5fe58e3e326a958
11099+
languageName: node
11100+
linkType: hard
11101+
1098811102
"tslib@npm:2.6.3":
1098911103
version: 2.6.3
1099011104
resolution: "tslib@npm:2.6.3"

0 commit comments

Comments
 (0)