From dbc673d74fa111cca4978b65d8bee7c62d9f16bd Mon Sep 17 00:00:00 2001 From: Jonathan Cammisuli Date: Fri, 2 Dec 2022 10:17:37 -0500 Subject: [PATCH] fix(testing): remove jest.config.ts from vitest setups (#13586) --- .../files/common-vite/tsconfig.app.json__tmpl__ | 2 +- .../library/files/vite/tsconfig.lib.json__tmpl__ | 14 ++++++++++++++ .../application/files/app-vite/tsconfig.app.json | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ diff --git a/packages/react/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ b/packages/react/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ index c8ea6c6486..1e4a14aded 100644 --- a/packages/react/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ +++ b/packages/react/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ @@ -9,6 +9,6 @@ "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts", "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts" ], - "exclude": ["jest.config.ts","**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"], + "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"], "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] } diff --git a/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ b/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ new file mode 100644 index 0000000000..eddbbe340d --- /dev/null +++ b/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "<%= offsetFromRoot %>dist/out-tsc", + "types": ["node"] + }, + "files": [<% if (style === 'styled-jsx') { %> + "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %> + "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts", + "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts" + ], + "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/packages/web/src/generators/application/files/app-vite/tsconfig.app.json b/packages/web/src/generators/application/files/app-vite/tsconfig.app.json index 0ee582ddab..29c1be079a 100644 --- a/packages/web/src/generators/application/files/app-vite/tsconfig.app.json +++ b/packages/web/src/generators/application/files/app-vite/tsconfig.app.json @@ -4,6 +4,6 @@ "outDir": "<%= offsetFromRoot %>dist/out-tsc", "types": ["node"] }, - "exclude": ["jest.config.ts","**/*.spec.ts", "**/*.test.ts"], + "exclude": ["**/*.spec.ts", "**/*.test.ts"], "include": ["**/*.ts"] }