Use ts-check instead of relying on ts-node, fix absolute path resolut…

…ion in tests
eternagame · Aug 12, 2022 · 3457641 · 3457641
1 parent 7317f7e
commit 3457641
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/packages/jest-utils/package.json b/packages/jest-utils/package.json
@@ -3,6 +3,7 @@
   "description": "Eterna standard Jest setup and utilities",
   "version": "1.1.0",
   "license": "BSD-3-Clause",
+  "type": "module",
   "scripts": {
     "prepublishOnly": "nx build",
     "build": "vite build",

diff --git a/packages/jest-utils/src/index.ts b/packages/jest-utils/src/index.ts
@@ -14,6 +14,7 @@ export function getConfig(mode: 'typescript' | 'vue') {
       '!**/*.(spec|test).(js|mjs|cjs|ts|mts|cts)',
       '!**/(__tests__|test|tests|spec)/**/*.(js|mjs|cjs|ts|mts|cts)',
     ],
+    modulePaths: ['<rootDir>/src/'],
     globals: {
       'ts-jest': {
         tsconfig: 'tsconfig.spec.json',

diff --git a/...ators/ts-iso/files/jest.config.ts__tmpl__ → ...ators/ts-iso/files/jest.config.js__tmpl__ b/...ators/ts-iso/files/jest.config.ts__tmpl__ → ...ators/ts-iso/files/jest.config.js__tmpl__
@@ -1,3 +1,4 @@
+// @ts-check
 import { getConfig } from '@eternagame/jest-utils';
 
 export default getConfig('typescript');
diff --git a/packages/nx-plugin/src/generators/ts-iso/files/tsconfig.spec.json__tmpl__ b/packages/nx-plugin/src/generators/ts-iso/files/tsconfig.spec.json__tmpl__
@@ -3,6 +3,9 @@
   "references": [
     {"path": "./tsconfig.build.json"}
   ],
+  "compilerOptions": {
+    "baseUrl": "src"
+  },
   "include": [
     "**/*.spec.ts",
     "**/*.test.ts",

diff --git a/packages/nx-plugin/src/generators/ts-iso/index.ts b/packages/nx-plugin/src/generators/ts-iso/index.ts
@@ -92,8 +92,6 @@ function updatePackageJson(tree: Tree, options: NormalizedSchema) {
       '@types/jest',
       'ts-jest',
       'typescript',
-      // For loading TS jest config files
-      'ts-node',
     ]),
   );
 }

diff --git a/packages/nx-plugin/src/utils/dependencies.ts b/packages/nx-plugin/src/utils/dependencies.ts
@@ -46,7 +46,6 @@ const VERSIONS = {
   jest: '^27.5.0',
   '@types/jest': '^27.4.0',
   'ts-jest': '^27.1.3',
-  'ts-node': '^10.9.1',
 } as const;
 
 export default function getDependencyVersions(