vx: ignore tests in ts config generation

ealush · Jun 6, 2023 · ee4f343 · ee4f343 · vercel · Jun 6, 2023
1 parent cb5c828
commit ee4f343
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 189 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [18.16.0]
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -19,4 +19,4 @@ jobs:
         with:
           package-manager: yarn
           skip-step: install
-          test-script: yarn jest
+          test-script: yarn test
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [18.16.0]
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -36,7 +36,7 @@ jobs:
       - name: Install
         run: yarn install --immutable
       - name: Test
-        run: yarn test -i
+        run: yarn test
       - name: Lint
         run: yarn lint
       - name: Release

diff --git a/packages/anyone/tsconfig.json b/packages/anyone/tsconfig.json
diff --git a/packages/context/tsconfig.json b/packages/context/tsconfig.json
diff --git a/packages/n4s/tsconfig.json b/packages/n4s/tsconfig.json
diff --git a/packages/vast/tsconfig.json b/packages/vast/tsconfig.json
diff --git a/packages/vest-utils/tsconfig.json b/packages/vest-utils/tsconfig.json
diff --git a/packages/vest/tsconfig.json b/packages/vest/tsconfig.json
diff --git a/packages/vestjs-runtime/tsconfig.json b/packages/vestjs-runtime/tsconfig.json
diff --git a/vx/config/jest/jest.config.js b/vx/config/jest/jest.config.js
@@ -43,7 +43,7 @@ function baseConfig(packageName) {
   const allowResolve = packageJson.getVxAllowResolve(packageName);
   return {
     clearMocks: true,
-    preset: 'ts-jest/presets/js-with-ts',
+    maxWorkers: 1,
     rootDir: vxPath.ROOT_PATH,
     roots: ['<rootDir>'],
     setupFiles: [
@@ -60,6 +60,7 @@ function baseConfig(packageName) {
       [`.+\\.(ts|tsx)$`]: [
         'ts-jest',
         {
+          isolatedModules: true,
           tsconfig: {
             // This is needed to allow jest to transform js files
             // That are originated in node_modules
@@ -68,9 +69,12 @@ function baseConfig(packageName) {
         },
       ],
     },
-    transformIgnorePatterns: [
-      `node_modules/(?!(${allowResolve.join('|')})/.*)`,
-    ],
+    ...(allowResolve.length > 0 && {
+      preset: 'ts-jest/presets/js-with-ts',
+      transformIgnorePatterns: [
+        `node_modules/(?!(${allowResolve.join('|')})/.*)`,
+      ],
+    }),
   };
 }
 

diff --git a/vx/util/pathsPerPackage.js b/vx/util/pathsPerPackage.js
@@ -10,7 +10,7 @@ const matches = glob.sync(vxPath.rel(vxPath.packageSrc('*', '**/*.ts')), {
   absolute: false,
   ignore: [
     vxPath.rel(vxPath.packageSrc('*', '**/*/index.ts')),
-    vxPath.rel(vxPath.packageSrc('*', `**/${opts.dir.TESTS}/**/*`)),
+    `**/${opts.dir.TESTS}/**`,
   ],
 });