Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update nx #25

Merged
merged 1 commit into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,35 @@
"migrations": [
{
"cli": "nx",
"version": "16.3.1-beta.0",
"description": "Replace @nrwl/node:webpack and @nx/node:webpack with @nx/webpack:webpack for all project targets",
"implementation": "./src/migrations/update-16-3-1/update-webpack-executor",
"package": "@nx/node",
"name": "update-16-3-1-update-executor"
"version": "16.6.0-beta.6",
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
"implementation": "./src/migrations/update-15-0-0/prefix-outputs",
"package": "nx",
"name": "16.6.0-prefix-outputs"
},
{
"cli": "nx",
"version": "16.4.0-beta.8",
"description": "Replace @nx/node:node with @nx/js:node for all project targets",
"implementation": "./src/migrations/update-16-4-0/replace-node-executor",
"package": "@nx/node",
"name": "update-16-4-0-replace-node-executor"
"version": "16.8.0-beta.3",
"description": "Escape $ in env variables",
"implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
"package": "nx",
"name": "16.8.0-escape-dollar-sign-env"
},
{
"cli": "nx",
"version": "16.6.0-beta.0",
"description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
"factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps",
"package": "@nx/js",
"name": "explicitly-set-projects-to-update-buildable-deps"
},
{
"cli": "nx",
"version": "16.5.0-beta.2",
"description": "Add test-setup.ts to ignored files in production input",
"implementation": "./src/migrations/update-16-5-0/add-test-setup-to-inputs-ignore",
"package": "@nx/jest",
"name": "add-test-setup-to-inputs-ignore"
}
]
}
39 changes: 9 additions & 30 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"cacheableOperations": ["build", "lint", "test", "e2e"],
"accessToken": "ZTY5ODM4MGMtNTcxNi00OGFiLWIwY2EtYTQxYzNmZTZjYWM2fHJlYWQtd3JpdGU="
}
}
Expand All @@ -24,45 +19,29 @@
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
],
"inputs": [
"production",
"^production"
]
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"link-plugin": {
"dependsOn": [
"build"
]
"dependsOn": ["build"]
},
"test": {
"inputs": [
"default",
"^production",
"{workspaceRoot}/jest.preset.js"
]
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
},
"lint": {
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json"
]
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
}
},
"namedInputs": {
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [],
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s",
"!{projectRoot}/.eslintrc.json"
"!{projectRoot}/.eslintrc.json",
"!{projectRoot}/src/test-setup.[jt]s"
]
}
}
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@
"packageManager": "[email protected]",
"dependencies": {
"@ltd/j-toml": "1.38.0",
"@nx/devkit": "16.4.1",
"@nx/js": "16.4.1",
"@nx/devkit": "16.8.0-rc.0",
"@nx/js": "16.8.0-rc.0",
"chalk": "^4.1.2",
"tslib": "^2.0.0"
},
"devDependencies": {
"@commitlint/cli": "17.3.0",
"@commitlint/config-conventional": "17.3.0",
"@jscutlery/semver": "^2.29.0",
"@nx/eslint-plugin": "16.4.1",
"@nx/jest": "16.4.1",
"@nx/linter": "16.4.1",
"@nx/node": "16.4.1",
"@nx/plugin": "16.4.1",
"@nx/workspace": "16.4.1",
"@nx/eslint-plugin": "16.8.0-rc.0",
"@nx/jest": "16.8.0-rc.0",
"@nx/linter": "16.8.0-rc.0",
"@nx/node": "16.8.0-rc.0",
"@nx/plugin": "16.8.0-rc.0",
"@nx/workspace": "16.8.0-rc.0",
"@swc-node/register": "^1.4.2",
"@swc/core": "^1.2.173",
"@types/jest": "29.4.0",
"@types/node": "18.7.1",
"@typescript-eslint/eslint-plugin": "5.59.6",
"@typescript-eslint/parser": "5.59.6",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"dotenv": "~10.0.0",
"eslint": "8.15.0",
"eslint": "8.46.0",
"eslint-config-prettier": "8.1.0",
"husky": "^8.0.0",
"jest": "29.4.3",
"jsonc-eslint-parser": "^2.1.0",
"nx": "16.4.1",
"nx-cloud": "16.0.5",
"nx": "16.8.0-rc.0",
"nx-cloud": "16.3.0",
"prettier": "2.8.0",
"ts-jest": "29.1.0",
"ts-node": "10.9.1",
Expand All @@ -48,3 +48,4 @@
"verdaccio": "^5.25.0"
}
}

3 changes: 2 additions & 1 deletion packages/rust/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"glob": "executors.json",
"output": "."
}
]
],
"updateBuildableProjectDepsInPackageJson": true
}
},
"version": {
Expand Down
2 changes: 1 addition & 1 deletion packages/rust/src/graph.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
} from '@nx/devkit';
import { Package } from './models/cargo-metadata';
import { cargoMetadata } from './utils/cargo';
import { ProjectGraphProcessor } from 'nx/src/config/project-graph';

type ProjectGraphProcessor = NonNullable<NxPlugin['processProjectGraph']>;
export const processProjectGraph: ProjectGraphProcessor = (
graph: ProjectGraph,
ctx: ProjectGraphProcessorContext
Expand Down
3 changes: 2 additions & 1 deletion packages/typescript-nx-imports-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"tsConfig": "packages/typescript-nx-imports-plugin/tsconfig.lib.json",
"packageJson": "packages/typescript-nx-imports-plugin/package.json",
"main": "packages/typescript-nx-imports-plugin/src/index.ts",
"assets": ["packages/typescript-nx-imports-plugin/*.md"]
"assets": ["packages/typescript-nx-imports-plugin/*.md"],
"updateBuildableProjectDepsInPackageJson": true
}
},
"version": {
Expand Down
Loading
Loading