Skip to content

Commit

Permalink
chore: update to Nx v18
Browse files Browse the repository at this point in the history
  • Loading branch information
beeman committed Feb 12, 2024
1 parent 7e31769 commit eccfebb
Show file tree
Hide file tree
Showing 11 changed files with 3,665 additions and 676 deletions.
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Nx 18 enables using plugins to infer targets by default
# This is disabled for existing workspaces to maintain compatibility
# For more info, see: https://nx.dev/concepts/inferred-tasks
NX_ADD_PLUGINS=false
9 changes: 9 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
"codeCoverage": true
}
}
},
"@nx/eslint:lint": {
"cache": true,
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/.eslintignore",
"{workspaceRoot}/eslint.config.js"
]
}
},
"namedInputs": {
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@clack/prompts": "^0.7.0",
"@inquirer/prompts": "^3.2.0",
"@nx/devkit": "17.2.7",
"@nx/devkit": "18.0.4",
"@swc/helpers": "~0.5.2",
"commander": "^11.1.0",
"create-nx-workspace": "17.0.1",
Expand All @@ -28,33 +28,33 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@nx/eslint": "17.2.7",
"@nx/eslint-plugin": "17.2.7",
"@nx/jest": "17.2.7",
"@nx/js": "17.2.7",
"@nx/next": "17.2.7",
"@nx/plugin": "17.2.7",
"@nx/react": "17.2.7",
"@nx/webpack": "17.2.7",
"@nx/workspace": "17.2.7",
"@swc-node/register": "~1.6.7",
"@nx/eslint": "18.0.4",
"@nx/eslint-plugin": "18.0.4",
"@nx/jest": "18.0.4",
"@nx/js": "18.0.4",
"@nx/next": "18.0.4",
"@nx/plugin": "18.0.4",
"@nx/react": "18.0.4",
"@nx/webpack": "18.0.4",
"@nx/workspace": "18.0.4",
"@swc-node/register": "~1.8.0",
"@swc/cli": "~0.1.62",
"@swc/core": "~1.3.85",
"@types/jest": "^29.4.0",
"@types/node": "18.16.9",
"@typescript-eslint/eslint-plugin": "6.10.0",
"@typescript-eslint/parser": "6.10.0",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"eslint": "8.48.0",
"eslint-config-prettier": "^9.0.0",
"husky": "^8.0.3",
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.4.1",
"lint-staged": "^15.0.2",
"nx": "17.2.7",
"nx": "18.0.4",
"prettier": "^2.6.2",
"ts-jest": "^29.1.0",
"ts-node": "^10.9.1",
"typescript": "5.2.2",
"typescript": "5.3.3",
"verdaccio": "^5.0.4"
},
"lint-staged": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,7 @@ exports[`anchor-application generator should generate app with "counter" templat
"}",
"},",
""lint": {",
""executor": "@nx/eslint:lint",",
""outputs": ["{options.outputFile}"]",
""executor": "@nx/eslint:lint"",
"},",
""test": {",
""executor": "nx:run-commands",",
Expand Down Expand Up @@ -1164,8 +1163,7 @@ exports[`anchor-application generator should generate app with "hello-world" tem
"}",
"},",
""lint": {",
""executor": "@nx/eslint:lint",",
""outputs": ["{options.outputFile}"]",
""executor": "@nx/eslint:lint"",
"},",
""test": {",
""executor": "nx:run-commands",",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "This library is a preset for create-solana-dapp with shared code for the other presets.",
"dependencies": {
"@nx/devkit": "17.2.7",
"@nx/devkit": "18.0.4",
"tslib": "^2.3.0"
},
"type": "commonjs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from 'path'
import { genericSubstitutions } from '../../utils/generic-substitutions'
import { CommonTemplateSchema } from './common-template-schema'

export async function commonTemplateGenerator(tree: Tree, options: CommonTemplateSchema, templatePath: string = '') {
export async function commonTemplateGenerator(tree: Tree, options: CommonTemplateSchema, templatePath = '') {
const substitutions = genericSubstitutions({
anchor: options.anchor,
anchorName: options.anchorName,
Expand Down
Loading

0 comments on commit eccfebb

Please sign in to comment.