Skip to content

Commit 08bec54

Browse files
committed
chore: fix-inferred-tasks
1 parent f9d154d commit 08bec54

35 files changed

+292
-395
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ node_modules
22
pnpm-lock.yaml
33
packages/*/docs
44
packages/*/coverage
5+
*tsconfig.tsbuildinfo*
56

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- run: git branch --track main origin/main
4545

4646
- run: pnpm exec nx-cloud record -- nx format:check
47-
- run: pnpm exec nx affected -t typecheck build lint test docs e2e-ci
47+
- run: pnpm exec nx affected -t build typecheck lint test docs e2e-ci
4848

4949
- uses: codecov/codecov-action@v5
5050
with:

e2e/davinci-app/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
},
1414
"devDependencies": {},
1515
"scripts": {
16-
"build": "nx exec -- vite build --watch false",
17-
"serve": "vite dev",
18-
"preview": "vite preview",
19-
"lint": "nx exec -- eslint **/*.ts --fix"
16+
"lint": "eslint **/*.ts --fix"
2017
}
2118
}

e2e/davinci-app/tsconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
"useDefineForClassFields": true,
77
"lib": ["ESNext", "DOM"],
88
"strict": true,
9-
"resolveJsonModule": true,
10-
"moduleDetection": "force",
11-
"verbatimModuleSyntax": true,
129
"isolatedModules": true,
1310
"esModuleInterop": true,
1411
"noUnusedLocals": true,

e2e/mock-api-v2/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ dist
88
.eslintignore
99
coverage
1010
html/*
11+
*tsconfig.tsbuildinfo*

e2e/mock-api-v2/build.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

e2e/mock-api-v2/package.json

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,33 @@
33
"version": "1.0.0",
44
"description": "",
55
"main": "./dist/index.js",
6-
"type": "commonjs",
7-
"scripts": {
8-
"build": "tsc --project tsconfig.app.json",
9-
"build:watch": "tsc --project tsconfig.app.json --watch",
10-
"serve": "node dist/e2e/mock-api-v2/src/main.js",
11-
"serve:dev": "nodemon dist/e2e/mock-api-v2/src/main.js",
12-
"test": "vitest",
13-
"test:watch": "vitest watch --coverage --coverage.reportsDirectory=../../coverage/mock-api-v2",
14-
"lint": "nx exec -- eslint --fix --ignore-path .eslintignore \"**/*.ts\""
15-
},
6+
"type": "module",
167
"dependencies": {
178
"@effect/language-service": "^0.2.0",
189
"@effect/platform": "^0.58.27",
1910
"@effect/platform-node": "^0.53.26",
2011
"effect": "^3.12.7",
2112
"effect-http": "^0.73.0",
2213
"effect-http-node": "^0.16.1",
23-
"@effect/schema": "^0.68.23",
14+
"@effect/schema": "^0.68.23"
15+
},
16+
"devDependencies": {
2417
"@effect/vitest": "^0.17.3"
18+
},
19+
"nx": {
20+
"tags": ["scope:e2e"],
21+
"targets": {
22+
"build": {
23+
"executor": "@nx/js:tsc",
24+
"outputs": ["{options.outputPath}"],
25+
"options": {
26+
"outputPath": "e2e/mock-api-v2/dist",
27+
"main": "e2e/mock-api-v2/src/main.ts",
28+
"tsConfig": "e2e/mock-api-v2/tsconfig.app.json",
29+
"generatePackageJson": true,
30+
"assets": []
31+
}
32+
}
33+
}
2534
}
2635
}

e2e/mock-api-v2/src/helpers/test/cookie.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { it, expect } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import {
34
getElementFromCookie,
45
incrementCookieHeader,

e2e/mock-api-v2/src/helpers/test/match.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { it, expect } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import { PingRequestData, validator } from '../match.js';
34
import { Effect, Exit } from 'effect';
45
import { InvalidUsernamePassword, InvalidProtectNode } from '../../errors/index.js';

e2e/mock-api-v2/src/services/tests/authorize.service.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { it, expect } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import { Effect, Layer } from 'effect';
34
import { Authorize, authorizeMock } from '../authorize.service.js';
45
import { mockRequest } from '../request.service.js';

e2e/mock-api-v2/src/services/tests/cookie.service.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { it, expect } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import { CookieService, cookieServiceTest } from '../cookie.service.js';
34
import { Effect, Either } from 'effect';
45
import { Cookies } from '@effect/platform';

e2e/mock-api-v2/src/services/tests/custom-html-template.service.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { it, expect } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import { CustomHtmlTemplate, mockCustomHtmlTemplate } from '../custom-html-template.service.js';
34
import { Effect, Exit, Layer } from 'effect';
45
import { mockRequest } from '../request.service.js';

e2e/mock-api-v2/src/services/tests/request.service.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { it, expect } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import { Request, mockRequest } from '../request.service.js';
34
import { Effect } from 'effect';
45
import { CustomHtmlResponseBody } from '../custom-html-template.service.js';

e2e/mock-api-v2/src/services/tests/userinfo.service.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { expect, it } from '@effect/vitest';
1+
import { it } from '@effect/vitest';
2+
import { expect } from 'vitest';
23
import { UserInfo, userInfoMock } from '../userinfo.service.js';
34
import { userInfoResponse } from '../../responses/userinfo/userinfo.js';
45
import { Effect } from 'effect';

e2e/mock-api-v2/tsconfig.spec.json

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,13 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"module": "NodeNext",
6-
"moduleResolution": "NodeNext",
7-
"target": "ES2020",
8-
"types": [
9-
"vitest/vitest",
10-
"vitest/globals",
11-
"vitest/importMeta",
12-
"vite/client",
13-
"node"
14-
]
5+
"module": "Node16",
6+
"moduleResolution": "Node16",
7+
"types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"]
158
},
169
"include": [
1710
"src/**/*.ts",
18-
"vite.config.ts",
11+
"vite.config.mts",
1912
"vitest.config.ts",
2013
"src/**/*.test.ts",
2114
"src/**/*.spec.ts",

e2e/mock-api-v2/vite.config.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@ export default defineConfig({
55
cacheDir: '../../node_modules/.vite/e2e/mock-api-v2',
66

77
test: {
8-
globals: true,
9-
cache: {
10-
dir: '../../node_modules/.vitest',
11-
},
12-
watch: !process.env['CI'],
8+
globals: false,
9+
watch: Boolean(process.env['CI']) === false,
1310
environment: 'jsdom',
1411
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
15-
1612
reporters: ['default', 'json', 'html'],
1713
coverage: {
1814
enabled: Boolean(process.env['CI']),

nx.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
},
1414
"targetDefaults": {
1515
"typecheck": {
16-
"dependsOn": ["build", "^build"]
16+
"outputs": ["{projectRoot}/out-tsc"],
17+
"dependsOn": ["^typecheck"]
1718
},
1819
"docs": {
1920
"dependsOn": ["build", "^build", "^docs"],
@@ -26,7 +27,7 @@
2627
"e2e": {
2728
"dependsOn": ["^e2e"],
2829
"inputs": ["noMarkdown", "^noMarkdown"],
29-
"outputs": ["{projectRoot}/./.playwright"],
30+
"outputs": ["{projectRoot}/.playwright"],
3031
"cache": true
3132
},
3233
"lint": {
@@ -37,13 +38,13 @@
3738
"test": {
3839
"inputs": ["noMarkdown", "^noMarkdown"],
3940
"dependsOn": ["^test"],
40-
"outputs": ["{projectRoot}/./coverage"],
41+
"outputs": ["{projectRoot}/coverage"],
4142
"cache": true
4243
},
4344
"build": {
4445
"inputs": ["noMarkdown", "^noMarkdown"],
4546
"dependsOn": ["^build"],
46-
"outputs": ["{projectRoot}/./dist"],
47+
"outputs": ["{projectRoot}/dist"],
4748
"cache": true
4849
},
4950
"e2e-ci--**/*": {
@@ -80,6 +81,9 @@
8081
"cache": true
8182
}
8283
},
84+
"sync": {
85+
"applyChanges": true
86+
},
8387
"plugins": [
8488
{
8589
"plugin": "@nx/js/typescript",
@@ -91,21 +95,23 @@
9195
"targetName": "build",
9296
"configName": "tsconfig.lib.json"
9397
}
94-
}
98+
},
99+
"include": ["e2e/**/**/*", "packages/**/**/*"]
95100
},
96101
{
97102
"plugin": "@nx/playwright/plugin",
98103
"options": {
99104
"ciTargetName": "e2e-ci",
100105
"targetName": "e2e"
101-
}
106+
},
107+
"include": ["e2e/**/**/*"]
102108
},
103109
{
104110
"plugin": "@nx/eslint/plugin",
105111
"options": {
106112
"targetName": "lint"
107113
},
108-
"include": ["tools/create-package/**/*", "packages/**/**/*"]
114+
"include": ["e2e/**/**/*", "packages/**/**/*"]
109115
},
110116
{
111117
"plugin": "@nx/vite/plugin",
@@ -117,17 +123,14 @@
117123
"serveStaticTargetName": "serve-static",
118124
"typecheckTargetName": "typecheck"
119125
},
120-
"include": ["tools/create-package/**/*"]
126+
"include": ["packages/**/**/*", "e2e/**/**/*"]
121127
}
122128
],
123129
"parallel": 1,
124130
"workspaceLayout": {
125131
"appsDir": "",
126132
"libsDir": ""
127133
},
128-
"sync": {
129-
"applyChanges": true
130-
},
131134
"generators": {
132135
"@nx/js:library": {
133136
"publishable": true,

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
"@typescript-eslint/parser": "7.16.1",
6161
"@typescript-eslint/typescript-estree": "5.59.5",
6262
"@typescript-eslint/utils": "^8.13.0",
63-
"@vitest/coverage-v8": "^3.0.4",
64-
"@vitest/ui": "^3.0.4",
63+
"@vitest/coverage-v8": "2.0.5",
64+
"@vitest/ui": "2.0.5",
6565
"conventional-changelog-conventionalcommits": "^7.0.2",
6666
"cz-conventional-changelog": "^3.3.0",
6767
"cz-git": "^1.6.1",
@@ -95,7 +95,7 @@
9595
"vite-plugin-eslint": "^1.8.1",
9696
"vite-plugin-externalize-deps": "^0.8.0",
9797
"vite-tsconfig-paths": "^4.3.2",
98-
"vitest": "^3.0.4",
98+
"vitest": "2.0.5",
9999
"vitest-canvas-mock": "^0.3.3"
100100
},
101101
"config": {

packages/davinci-client/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ dist
99
docs
1010
coverage
1111
vite.config.*.timestamp*
12+
*tsconfig.tsbuildinfo*

packages/davinci-client/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"parser": "jsonc-eslint-parser",
2020
"rules": {
2121
"@nx/dependency-checks": [
22-
"error",
22+
"warn",
2323
{
2424
"ignoredFiles": ["{projectRoot}/vite.config.{js,ts,mjs,mts}"]
2525
}

packages/davinci-client/package.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,13 @@
2020
"@reduxjs/toolkit": "catalog:",
2121
"immer": "catalog:"
2222
},
23+
"devDependencies": {
24+
"vitest": "2.0.5"
25+
},
2326
"exports": {
2427
".": "./dist/src/index.js",
2528
"./types": "./dist/src/types.d.ts"
2629
},
27-
"scripts": {
28-
"build": "nx exec -- tsc --project ./tsconfig.lib.json",
29-
"test": "nx exec -- vitest --typecheck",
30-
"test:watch": "vitest --watch",
31-
"test:coverage": "nx exec -- vitest --coverage",
32-
"lint": "nx exec -- eslint **/*.ts --fix"
33-
},
3430
"nx": {
3531
"tags": ["scope:package"],
3632
"targets": {

packages/davinci-client/src/lib/mock-data/mock-form-fields.data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const obj = {
1+
export const obj = {
22
interactionId: '18fa40b7-0eb8-4a5c-803c-d3f3f807ed46',
33
companyId: '02fb4743-189a-4bc7-9d6c-a919edfe6447',
44
connectionId: '8209285e0d2f3fc76bfd23fd10d45e6f',

packages/davinci-client/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"noImplicitOverride": true,
77
"noPropertyAccessFromIndexSignature": true,
88
"noImplicitReturns": true,
9-
"noFallthroughCasesInSwitch": true
9+
"noFallthroughCasesInSwitch": true,
10+
"resolveJsonModule": true
1011
},
1112
"references": [
1213
{

packages/davinci-client/tsconfig.lib.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"vite.config.ts",
2323
"src/**/*.spec.ts",
2424
"src/**/*.test.ts",
25+
"src/**/*.test-d.ts",
2526
"src/lib/mock-data/*"
2627
]
2728
}

packages/davinci-client/tsconfig.spec.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55
"outDir": "../../dist/out-tsc",
66
"composite": true,
77
"moduleResolution": "NodeNext",
8+
"resolveJsonModule": true,
89
"target": "ESNext",
9-
"types": [
10-
"vitest/vitest",
11-
"vitest/globals",
12-
"vitest/importMeta",
13-
"vite/client",
14-
"node"
15-
]
10+
"types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"]
1611
},
1712
"include": [
1813
"src/**/*.ts",

0 commit comments

Comments
 (0)