From be5f860d38743198c030ac37f6a2c9600bd493d3 Mon Sep 17 00:00:00 2001 From: Jeffrey Bosch Date: Mon, 9 Sep 2019 16:30:17 +0200 Subject: [PATCH 1/5] chore: update jest config to support src and libs folder --- src/lib/application/files/js/package.json | 3 ++- src/lib/application/files/ts/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/application/files/js/package.json b/src/lib/application/files/js/package.json index 025663e77..e3c4ea616 100644 --- a/src/lib/application/files/js/package.json +++ b/src/lib/application/files/js/package.json @@ -38,7 +38,8 @@ "js", "json" ], - "rootDir": "src", + "rootDir": ".", + "roots":["/src/","/libs/" ], "testRegex": ".spec.js$", "coverageDirectory": "../coverage" } diff --git a/src/lib/application/files/ts/package.json b/src/lib/application/files/ts/package.json index 2cec92b11..99b4338ef 100644 --- a/src/lib/application/files/ts/package.json +++ b/src/lib/application/files/ts/package.json @@ -46,7 +46,8 @@ }, "jest": { "moduleFileExtensions": ["js", "json", "ts"], - "rootDir": "src", + "rootDir": ".", + "roots":["/src/","/libs/" ], "testRegex": ".spec.ts$", "transform": { "^.+\\.(t|j)s$": "ts-jest" From ef3e6b4b5e3fe7febd844a6dcdec712686be9f6f Mon Sep 17 00:00:00 2001 From: Kamil Mysliwiec Date: Thu, 19 Sep 2019 10:33:41 +0200 Subject: [PATCH 2/5] Update package.json --- src/lib/application/files/js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/application/files/js/package.json b/src/lib/application/files/js/package.json index e3c4ea616..ed6a1c392 100644 --- a/src/lib/application/files/js/package.json +++ b/src/lib/application/files/js/package.json @@ -39,7 +39,7 @@ "json" ], "rootDir": ".", - "roots":["/src/","/libs/" ], + "roots":["/src/", "/libs/", "/apps/"], "testRegex": ".spec.js$", "coverageDirectory": "../coverage" } From a68433cfdf6f1df0487f230131674819643e802a Mon Sep 17 00:00:00 2001 From: Kamil Mysliwiec Date: Thu, 19 Sep 2019 10:33:58 +0200 Subject: [PATCH 3/5] Update package.json --- src/lib/application/files/js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/application/files/js/package.json b/src/lib/application/files/js/package.json index ed6a1c392..74d031bcc 100644 --- a/src/lib/application/files/js/package.json +++ b/src/lib/application/files/js/package.json @@ -41,6 +41,6 @@ "rootDir": ".", "roots":["/src/", "/libs/", "/apps/"], "testRegex": ".spec.js$", - "coverageDirectory": "../coverage" + "coverageDirectory": "./coverage" } } From 674d871a7df8939e9e12839e46d20cbf483dbbbc Mon Sep 17 00:00:00 2001 From: Kamil Mysliwiec Date: Thu, 19 Sep 2019 10:34:51 +0200 Subject: [PATCH 4/5] Update package.json --- src/lib/application/files/ts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/application/files/ts/package.json b/src/lib/application/files/ts/package.json index 99b4338ef..5d5ce5d65 100644 --- a/src/lib/application/files/ts/package.json +++ b/src/lib/application/files/ts/package.json @@ -47,12 +47,12 @@ "jest": { "moduleFileExtensions": ["js", "json", "ts"], "rootDir": ".", - "roots":["/src/","/libs/" ], + "roots":["/src/", "/libs/", "/apps/"], "testRegex": ".spec.ts$", "transform": { "^.+\\.(t|j)s$": "ts-jest" }, - "coverageDirectory": "../coverage", + "coverageDirectory": "./coverage", "testEnvironment": "node" } } From 5d2b572a656a84f6e948277ff52bd927c1016c56 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 19 Sep 2019 08:35:46 +0000 Subject: [PATCH 5/5] Update angularcli monorepo to v8.3.5 --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe4ab4442..9d1c61217 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "@nestjs/schematics", - "version": "6.4.5", + "version": "6.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@angular-devkit/core": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz", - "integrity": "sha512-QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==", + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.5.tgz", + "integrity": "sha512-ag7Nr94wQUqCFtZjw+rMET+djGBmLk989Id5lLWViW99g4XFeS+e45mJv3JYRzF218+6EdicZz0DGQRYHekVeg==", "requires": { "ajv": "6.10.2", "fast-json-stable-stringify": "2.0.0", @@ -24,11 +24,11 @@ } }, "@angular-devkit/schematics": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz", - "integrity": "sha512-+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==", + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.5.tgz", + "integrity": "sha512-RMtM10kS+Docg90jzFMa4HQ+UzX95Gi5rCT/kSydEkBhp+Jeu/B0K2y67Fm2/qTdVNRCujrCpEmtiRcp1qsOQg==", "requires": { - "@angular-devkit/core": "8.3.4", + "@angular-devkit/core": "8.3.5", "rxjs": "6.4.0" } }, diff --git a/package.json b/package.json index e310a8bc2..9974fb0eb 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ }, "homepage": "https://github.com/nestjs/schematics#readme", "dependencies": { - "@angular-devkit/core": "8.3.4", - "@angular-devkit/schematics": "8.3.4", + "@angular-devkit/core": "8.3.5", + "@angular-devkit/schematics": "8.3.5", "fs-extra": "^8.1.0", "ts-morph": "^4.0.0", "typescript": "3.4.5"