Skip to content

Commit 88d804c

Browse files
committed
chore: update Nx
1 parent 26303b3 commit 88d804c

File tree

18 files changed

+4259
-1577
lines changed

18 files changed

+4259
-1577
lines changed

.eslintrc.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@
2929
{
3030
"files": ["*.ts", "*.tsx"],
3131
"extends": ["plugin:@nx/typescript"],
32-
"rules": {}
32+
"rules": {
33+
"@typescript-eslint/no-extra-semi": "error",
34+
"no-extra-semi": "off"
35+
}
3336
},
3437
{
3538
"files": ["*.js", "*.jsx"],
3639
"extends": ["plugin:@nx/javascript"],
37-
"rules": {}
40+
"rules": {
41+
"@typescript-eslint/no-extra-semi": "error",
42+
"no-extra-semi": "off"
43+
}
3844
},
3945
{
4046
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ testem.log
3939
Thumbs.db
4040

4141
.nx/cache
42+
.nx/workspace-data
4243
nx-cloud.env

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ tmp
77
/.nx/cache
88

99
pnpm-lock.yaml
10+
11+
/.nx/workspace-data

apps/web/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "apps/web/src",
55
"projectType": "application",
6+
"tags": [],
67
"targets": {
78
"build": {
89
"executor": "@nx/webpack:webpack",
@@ -64,8 +65,7 @@
6465
}
6566
},
6667
"lint": {
67-
"executor": "@nx/eslint:lint",
68-
"outputs": ["{options.outputFile}"]
68+
"executor": "@nx/eslint:lint"
6969
},
7070
"test": {
7171
"executor": "@nx/jest:jest",
@@ -74,6 +74,5 @@
7474
"jestConfig": "apps/web/jest.config.ts"
7575
}
7676
}
77-
},
78-
"tags": []
77+
}
7978
}

nx.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
"dependsOn": ["^build"],
77
"inputs": ["production", "^production"]
88
},
9-
"lint": {
10-
"cache": true,
11-
"inputs": [
12-
"default",
13-
"{workspaceRoot}/.eslintrc.json",
14-
"{workspaceRoot}/.eslintignore",
15-
"{workspaceRoot}/eslint.config.js"
16-
]
17-
},
18-
"e2e": {
19-
"cache": true
20-
},
219
"@nx/jest:jest": {
2210
"cache": true,
2311
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
@@ -30,6 +18,15 @@
3018
"codeCoverage": true
3119
}
3220
}
21+
},
22+
"@nx/eslint:lint": {
23+
"cache": true,
24+
"inputs": [
25+
"default",
26+
"{workspaceRoot}/.eslintrc.json",
27+
"{workspaceRoot}/.eslintignore",
28+
"{workspaceRoot}/eslint.config.js"
29+
]
3330
}
3431
},
3532
"namedInputs": {
@@ -64,5 +61,6 @@
6461
}
6562
}
6663
},
64+
"useInferencePlugins": false,
6765
"nxCloudAccessToken": "NDVmNWIyZjMtODIxNi00ZDFjLTg5OGUtMTcyM2Y1MWRmY2I5fHJlYWQ="
6866
}

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,57 +23,57 @@
2323
"@mantine/modals": "^7.4.1",
2424
"@mantine/notifications": "^7.4.1",
2525
"@mantine/spotlight": "^7.4.1",
26-
"@nx/devkit": "17.2.8",
26+
"@nx/devkit": "19.5.6",
2727
"@pubkeyapp/wallet-adapter-mantine-ui": "^2.3.0",
2828
"@solana/spl-token": "^0.3.11",
2929
"@solana/wallet-adapter-base": "^0.9.23",
3030
"@solana/wallet-adapter-react": "^0.15.35",
3131
"@solana/wallet-adapter-react-ui": "^0.9.34",
3232
"@solana/wallet-adapter-solflare": "^0.6.28",
3333
"@solana/web3.js": "^1.88.0",
34-
"@swc/helpers": "~0.5.3",
34+
"@swc/helpers": "0.5.12",
3535
"@tabler/icons-react": "^2.45.0",
3636
"@tanstack/react-query": "^5.17.9",
3737
"clsx": "^2.1.0",
38-
"core-js": "^3.35.0",
38+
"core-js": "3.36.1",
3939
"create-nx-workspace": "17.2.8",
4040
"dayjs": "^1.11.10",
4141
"jotai": "^2.6.1",
42-
"react": "18.2.0",
43-
"react-dom": "18.2.0",
42+
"react": "18.3.1",
43+
"react-dom": "18.3.1",
4444
"react-router-dom": "^6.21.1",
4545
"timeago-react": "^3.0.6",
4646
"tslib": "^2.6.2"
4747
},
4848
"devDependencies": {
4949
"@babel/core": "^7.23.7",
5050
"@babel/preset-react": "^7.23.3",
51-
"@nx/eslint": "17.2.8",
52-
"@nx/eslint-plugin": "17.2.8",
53-
"@nx/jest": "17.2.8",
54-
"@nx/js": "17.2.8",
55-
"@nx/plugin": "17.2.8",
56-
"@nx/react": "17.2.8",
57-
"@nx/rollup": "17.2.8",
58-
"@nx/webpack": "17.2.8",
59-
"@nx/workspace": "17.2.8",
51+
"@nx/eslint": "19.5.6",
52+
"@nx/eslint-plugin": "19.5.6",
53+
"@nx/jest": "19.5.6",
54+
"@nx/js": "19.5.6",
55+
"@nx/plugin": "19.5.6",
56+
"@nx/react": "19.5.6",
57+
"@nx/rollup": "19.5.6",
58+
"@nx/webpack": "19.5.6",
59+
"@nx/workspace": "19.5.6",
6060
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
61-
"@rollup/plugin-url": "^8.0.2",
62-
"@svgr/rollup": "^8.1.0",
61+
"@rollup/plugin-url": "8.0.2",
62+
"@svgr/rollup": "8.1.0",
6363
"@svgr/webpack": "^8.1.0",
64-
"@swc-node/register": "~1.6.8",
65-
"@swc/cli": "~0.1.63",
66-
"@swc/core": "~1.3.102",
67-
"@testing-library/react": "14.1.2",
64+
"@swc-node/register": "1.9.2",
65+
"@swc/cli": "0.3.14",
66+
"@swc/core": "1.5.7",
67+
"@testing-library/react": "15.0.6",
6868
"@types/jest": "^29.5.11",
69-
"@types/node": "20.10.8",
70-
"@types/react": "18.2.47",
71-
"@types/react-dom": "18.2.18",
72-
"@typescript-eslint/eslint-plugin": "^6.18.1",
73-
"@typescript-eslint/parser": "^6.18.1",
69+
"@types/node": "18.19.9",
70+
"@types/react": "18.3.1",
71+
"@types/react-dom": "18.3.0",
72+
"@typescript-eslint/eslint-plugin": "7.18.0",
73+
"@typescript-eslint/parser": "7.18.0",
7474
"babel-jest": "^29.7.0",
7575
"commander": "^11.1.0",
76-
"eslint": "8.56.0",
76+
"eslint": "8.57.0",
7777
"eslint-config-prettier": "^9.1.0",
7878
"eslint-plugin-import": "2.29.1",
7979
"eslint-plugin-jsx-a11y": "6.8.0",
@@ -84,15 +84,15 @@
8484
"jest-environment-jsdom": "^29.7.0",
8585
"json-schema-to-typescript": "^13.1.1",
8686
"lint-staged": "^15.2.0",
87-
"nx": "17.2.8",
88-
"postcss": "^8.4.33",
87+
"nx": "19.5.6",
88+
"postcss": "8.4.38",
8989
"postcss-preset-mantine": "^1.12.3",
9090
"postcss-simple-vars": "^7.0.1",
9191
"prettier": "^2.6.2",
9292
"react-refresh": "^0.14.0",
9393
"ts-jest": "^29.1.1",
9494
"ts-node": "10.9.2",
95-
"typescript": "~5.3.3",
95+
"typescript": "5.5.4",
9696
"url-loader": "^4.1.1",
9797
"verdaccio": "^5.29.0"
9898
},

packages/core/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"tags": [],
77
"targets": {
88
"lint": {
9-
"executor": "@nx/eslint:lint",
10-
"outputs": ["{options.outputFile}"]
9+
"executor": "@nx/eslint:lint"
1110
},
1211
"build": {
1312
"executor": "@nx/rollup:rollup",

packages/create-pubkey-ui-app/project.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "packages/create-pubkey-ui-app/bin",
55
"projectType": "library",
6+
"tags": [],
7+
"implicitDependencies": ["generators"],
68
"targets": {
79
"build": {
810
"executor": "@nx/js:tsc",
@@ -19,8 +21,7 @@
1921
"dependsOn": ["build"]
2022
},
2123
"lint": {
22-
"executor": "@nx/eslint:lint",
23-
"outputs": ["{options.outputFile}"]
24+
"executor": "@nx/eslint:lint"
2425
},
2526
"test": {
2627
"executor": "@nx/jest:jest",
@@ -29,7 +30,5 @@
2930
"jestConfig": "packages/create-pubkey-ui-app/jest.config.ts"
3031
}
3132
}
32-
},
33-
"tags": [],
34-
"implicitDependencies": ["generators"]
33+
}
3534
}

packages/generators-e2e/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"projectType": "application",
55
"sourceRoot": "packages/generators-e2e/src",
6+
"implicitDependencies": ["generators"],
67
"targets": {
78
"e2e": {
89
"executor": "@nx/jest:jest",
@@ -14,9 +15,7 @@
1415
"dependsOn": ["^build"]
1516
},
1617
"lint": {
17-
"executor": "@nx/eslint:lint",
18-
"outputs": ["{options.outputFile}"]
18+
"executor": "@nx/eslint:lint"
1919
}
20-
},
21-
"implicitDependencies": ["generators"]
20+
}
2221
}

packages/generators/jest.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ export default {
88
transformIgnorePatterns: ['node_modules/(?!.*\\.d.ts$)'],
99
moduleFileExtensions: ['ts', 'js', 'html'],
1010
coverageDirectory: '../../coverage/packages/generators',
11+
testTimeout: 30000,
1112
}

packages/generators/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
"name": "@pubkey-ui/generators",
33
"version": "0.0.1",
44
"dependencies": {
5-
"@nx/devkit": "17.2.8",
65
"tslib": "^2.3.0",
7-
"@nx/js": "17.2.8",
8-
"@nx/react": "17.2.8",
6+
"@nx/react": "19.5.6",
97
"@beeman/preset-anchor": "2.0.0",
10-
"@nx/eslint": "17.2.8"
8+
"@nx/eslint": "19.5.6"
119
},
1210
"type": "commonjs",
1311
"main": "./src/index.js",

packages/generators/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "packages/generators/src",
55
"projectType": "library",
6+
"tags": [],
67
"targets": {
78
"build": {
89
"executor": "@nx/js:tsc",
@@ -41,8 +42,7 @@
4142
"dependsOn": ["build"]
4243
},
4344
"lint": {
44-
"executor": "@nx/eslint:lint",
45-
"outputs": ["{options.outputFile}"]
45+
"executor": "@nx/eslint:lint"
4646
},
4747
"test": {
4848
"executor": "@nx/jest:jest",
@@ -51,6 +51,5 @@
5151
"jestConfig": "packages/generators/jest.config.ts"
5252
}
5353
}
54-
},
55-
"tags": []
54+
}
5655
}

0 commit comments

Comments
 (0)