diff --git a/projects/addon-charts/jest.config.ts b/projects/addon-charts/jest.config.ts deleted file mode 100644 index 721d00ddc5fb..000000000000 --- a/projects/addon-charts/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/addon-charts`, - testMatch: [`/projects/addon-charts/**/*.spec.ts`], - collectCoverageFrom: [`/projects/addon-charts/**/*.ts`], -}; - -export default config; diff --git a/projects/addon-charts/project.json b/projects/addon-charts/project.json index 200ae4b8a41b..3e5b2c74f339 100644 --- a/projects/addon-charts/project.json +++ b/projects/addon-charts/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-charts"], "options": { - "jestConfig": "projects/addon-charts/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-charts", + "collectCoverageFrom": ["/projects/addon-charts/**/*.ts"], + "testMatch": ["/projects/addon-charts/**/*.spec.ts"] } }, "publish": { diff --git a/projects/addon-commerce/jest.config.ts b/projects/addon-commerce/jest.config.ts deleted file mode 100644 index 2f300af7141f..000000000000 --- a/projects/addon-commerce/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/addon-commerce`, - testMatch: [`/projects/addon-commerce/**/*.spec.ts`], - collectCoverageFrom: [`/projects/addon-commerce/**/*.ts`], -}; - -export default config; diff --git a/projects/addon-commerce/project.json b/projects/addon-commerce/project.json index 039208b0b83f..a07df2afcfd9 100644 --- a/projects/addon-commerce/project.json +++ b/projects/addon-commerce/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-commerce"], "options": { - "jestConfig": "projects/addon-commerce/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-commerce", + "collectCoverageFrom": ["/projects/addon-commerce/**/*.ts"], + "testMatch": ["/projects/addon-commerce/**/*.spec.ts"] } }, "publish": { diff --git a/projects/addon-doc/jest.config.ts b/projects/addon-doc/jest.config.ts deleted file mode 100644 index 5eda1769fc54..000000000000 --- a/projects/addon-doc/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/addon-doc`, - collectCoverageFrom: [`/projects/addon-doc/**/*.ts`], - testMatch: [`/projects/addon-doc/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/addon-doc/project.json b/projects/addon-doc/project.json index 2561190017fc..8c1514eedbc5 100644 --- a/projects/addon-doc/project.json +++ b/projects/addon-doc/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-doc"], "options": { - "jestConfig": "projects/addon-doc/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-doc", + "collectCoverageFrom": ["/projects/addon-doc/**/*.ts"], + "testMatch": ["/projects/addon-doc/**/*.spec.ts"] } }, "publish": { diff --git a/projects/addon-mobile/jest.config.ts b/projects/addon-mobile/jest.config.ts deleted file mode 100644 index a5812f02a2ce..000000000000 --- a/projects/addon-mobile/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/addon-mobile`, - collectCoverageFrom: [`/projects/addon-mobile/**/*.ts`], - testMatch: [`/projects/addon-mobile/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/addon-mobile/project.json b/projects/addon-mobile/project.json index 0f4b4bc394a7..dd46628e2342 100644 --- a/projects/addon-mobile/project.json +++ b/projects/addon-mobile/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-mobile"], "options": { - "jestConfig": "projects/addon-mobile/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-mobile", + "collectCoverageFrom": ["/projects/addon-mobile/**/*.ts"], + "testMatch": ["/projects/addon-mobile/**/*.spec.ts"] } }, "publish": { diff --git a/projects/addon-preview/jest.config.ts b/projects/addon-preview/jest.config.ts deleted file mode 100644 index bca24229477e..000000000000 --- a/projects/addon-preview/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/addon-preview`, - testMatch: [`/projects/addon-preview/**/*.spec.ts`], - collectCoverageFrom: [`/projects/addon-preview/**/*.ts`], -}; - -export default config; diff --git a/projects/addon-preview/project.json b/projects/addon-preview/project.json index bccc5b304b7a..e67e457be17c 100644 --- a/projects/addon-preview/project.json +++ b/projects/addon-preview/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-preview"], "options": { - "jestConfig": "projects/addon-preview/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-preview", + "collectCoverageFrom": ["/projects/addon-preview/**/*.ts"], + "testMatch": ["/projects/addon-preview/**/*.spec.ts"] } }, "publish": { diff --git a/projects/addon-table/jest.config.ts b/projects/addon-table/jest.config.ts deleted file mode 100644 index 932873f6441a..000000000000 --- a/projects/addon-table/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/addon-table`, - collectCoverageFrom: [`/projects/addon-table/**/*.ts`], - testMatch: [`/projects/addon-table/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/addon-table/project.json b/projects/addon-table/project.json index 76c59ec9c922..44d5ac4660a3 100644 --- a/projects/addon-table/project.json +++ b/projects/addon-table/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-table"], "options": { - "jestConfig": "projects/addon-table/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-table", + "collectCoverageFrom": ["/projects/addon-table/**/*.ts"], + "testMatch": ["/projects/addon-table/**/*.spec.ts"] } }, "publish": { diff --git a/projects/addon-tablebars/jest.config.ts b/projects/addon-tablebars/jest.config.ts deleted file mode 100644 index 2c6dd4461a9e..000000000000 --- a/projects/addon-tablebars/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `coverage/addon-tablebars`, - testMatch: [`/projects/addon-tablebars/**/*.spec.ts`], - collectCoverageFrom: [`/projects/addon-tablebars/**/*.ts`], -}; - -export default config; diff --git a/projects/addon-tablebars/project.json b/projects/addon-tablebars/project.json index c5a7072fac9a..827316930213 100644 --- a/projects/addon-tablebars/project.json +++ b/projects/addon-tablebars/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/addon-tablebars"], "options": { - "jestConfig": "projects/addon-tablebars/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/addon-tablebars", + "collectCoverageFrom": ["/projects/addon-tablebars/**/*.ts"], + "testMatch": ["/projects/addon-tablebars/**/*.spec.ts"] } }, "publish": { diff --git a/projects/cdk/jest.config.ts b/projects/cdk/jest.config.ts deleted file mode 100644 index 3e9d160fb448..000000000000 --- a/projects/cdk/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/cdk`, - testMatch: [`/projects/cdk/**/*.spec.ts`], - collectCoverageFrom: [`/projects/cdk/**/*.ts`], -}; - -export default config; diff --git a/projects/cdk/project.json b/projects/cdk/project.json index d758c34f7b9f..0e981d0413ba 100644 --- a/projects/cdk/project.json +++ b/projects/cdk/project.json @@ -38,7 +38,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/cdk"], "options": { - "jestConfig": "projects/cdk/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/cdk", + "collectCoverageFrom": ["/projects/cdk/**/*.ts"], + "testMatch": ["/projects/cdk/**/*.spec.ts"] }, "dependsOn": [ { diff --git a/projects/core/jest.config.ts b/projects/core/jest.config.ts deleted file mode 100644 index ead76be61b96..000000000000 --- a/projects/core/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/core`, - testMatch: [`/projects/core/**/*.spec.ts`], - collectCoverageFrom: [`/projects/core/**/*.ts`], -}; - -export default config; diff --git a/projects/core/project.json b/projects/core/project.json index 4ec0c97fdb6b..1a1848e5208d 100644 --- a/projects/core/project.json +++ b/projects/core/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/core"], "options": { - "jestConfig": "projects/core/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/core", + "collectCoverageFrom": ["/projects/core/**/*.ts"], + "testMatch": ["/projects/core/**/*.spec.ts"] } }, "publish": { diff --git a/projects/demo/jest.config.ts b/projects/demo/jest.config.ts deleted file mode 100644 index 93e2ce10d4bd..000000000000 --- a/projects/demo/jest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - collectCoverage: false, - testMatch: [`/projects/demo/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/demo/project.json b/projects/demo/project.json index 389b79ad4ca8..9a724d4b4fc3 100644 --- a/projects/demo/project.json +++ b/projects/demo/project.json @@ -263,7 +263,9 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/demo"], "options": { - "jestConfig": "projects/demo/jest.config.ts" + "jestConfig": "jest.config.ts", + "collectCoverage": false, + "testMatch": ["/projects/demo/**/*.spec.ts"] } } } diff --git a/projects/experimental/jest.config.ts b/projects/experimental/jest.config.ts deleted file mode 100644 index 0fd6d74688c5..000000000000 --- a/projects/experimental/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/experimental`, - testMatch: [`/projects/experimental/**/*.spec.ts`], - collectCoverageFrom: [`/projects/experimental/**/*.ts`], -}; - -export default config; diff --git a/projects/experimental/project.json b/projects/experimental/project.json index 6e639a1d2f4c..0e9f75ef6f73 100644 --- a/projects/experimental/project.json +++ b/projects/experimental/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/experimental"], "options": { - "jestConfig": "projects/experimental/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/core", + "collectCoverageFrom": ["/projects/experimental/**/*.ts"], + "testMatch": ["/projects/experimental/**/*.spec.ts"] } }, "publish": { diff --git a/projects/i18n/jest.config.ts b/projects/i18n/jest.config.ts deleted file mode 100644 index 916c172baac2..000000000000 --- a/projects/i18n/jest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - collectCoverage: false, - testMatch: [`/projects/i18n/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/i18n/project.json b/projects/i18n/project.json index a55543319793..cbb9f5208c46 100644 --- a/projects/i18n/project.json +++ b/projects/i18n/project.json @@ -25,7 +25,9 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/i18n"], "options": { - "jestConfig": "projects/i18n/jest.config.ts" + "jestConfig": "jest.config.ts", + "collectCoverage": false, + "testMatch": ["/projects/i18n/**/*.spec.ts"] } }, "publish": { diff --git a/projects/icons/jest.config.ts b/projects/icons/jest.config.ts deleted file mode 100644 index e587fde7b80f..000000000000 --- a/projects/icons/jest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - collectCoverage: false, - testMatch: [`/projects/icons/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/icons/project.json b/projects/icons/project.json index 5478fd322d93..2531fca1873e 100644 --- a/projects/icons/project.json +++ b/projects/icons/project.json @@ -36,7 +36,9 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/icons"], "options": { - "jestConfig": "projects/icons/jest.config.ts" + "jestConfig": "jest.config.ts", + "collectCoverage": false, + "testMatch": ["/projects/icons/**/*.spec.ts"] } }, "publish": { diff --git a/projects/kit/jest.config.ts b/projects/kit/jest.config.ts deleted file mode 100644 index d89f622df6b5..000000000000 --- a/projects/kit/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/kit`, - testMatch: [`/projects/kit/**/*.spec.ts`], - collectCoverageFrom: [`/projects/kit/**/*.ts`], -}; - -export default config; diff --git a/projects/kit/project.json b/projects/kit/project.json index 2f377aea0756..798d443a5499 100644 --- a/projects/kit/project.json +++ b/projects/kit/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/kit"], "options": { - "jestConfig": "projects/kit/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/kit", + "collectCoverageFrom": ["/projects/kit/**/*.ts"], + "testMatch": ["/projects/kit/**/*.spec.ts"] } }, "publish": { diff --git a/projects/layout/jest.config.ts b/projects/layout/jest.config.ts deleted file mode 100644 index 4b3c928ea714..000000000000 --- a/projects/layout/jest.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - coverageDirectory: `/coverage/layout`, - testMatch: [`/projects/layout/**/*.spec.ts`], - collectCoverageFrom: [`/projects/layout/**/*.ts`], -}; - -export default config; diff --git a/projects/layout/project.json b/projects/layout/project.json index 49c1a1ae209b..ed3af2f4c5aa 100644 --- a/projects/layout/project.json +++ b/projects/layout/project.json @@ -25,7 +25,10 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/layout"], "options": { - "jestConfig": "projects/layout/jest.config.ts" + "jestConfig": "jest.config.ts", + "coverageDirectory": "coverage/layout", + "collectCoverageFrom": ["/projects/layout/**/*.ts"], + "testMatch": ["/projects/layout/**/*.spec.ts"] } }, "publish": { diff --git a/projects/testing/jest.config.ts b/projects/testing/jest.config.ts deleted file mode 100644 index f739edb77921..000000000000 --- a/projects/testing/jest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Config} from 'jest'; - -import rootConfig from '../../jest.config'; - -const config: Config = { - ...rootConfig, - collectCoverage: false, - testMatch: [`/projects/testing/**/*.spec.ts`], -}; - -export default config; diff --git a/projects/testing/project.json b/projects/testing/project.json index ff76ba97f763..bad434e609c1 100644 --- a/projects/testing/project.json +++ b/projects/testing/project.json @@ -24,7 +24,9 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/testing"], "options": { - "jestConfig": "projects/testing/jest.config.ts" + "jestConfig": "jest.config.ts", + "collectCoverage": false, + "testMatch": ["/projects/testing/**/*.spec.ts"] } }, "publish": {