Skip to content
Closed
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,6 @@ apps/**/pnpm-lock.yaml

# Next.js
.next
out
out
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"runAllTestsOnStartup": false,
"type": "on-save"
},
"nxConsole.generateAiAgentRules": true,
"vitest.filesWatcherInclude": "apps/**,libs/**,packages/**",
"[json]": {
"editor.codeActionsOnSave": {
Expand Down
8 changes: 6 additions & 2 deletions e2e/nx-payload-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@
"runInBand": true
},
"configurations": {
"docker": { "testPathPattern": ["docker", "ui"] },
"docker": {
"testPathPatterns": ["docker", "ui"]
},
"skip-docker": {
"testPathIgnorePatterns": ["docker", "ui"]
},
"quick": { "testPathPattern": ["quick"] }
"quick": {
"testPathPatterns": ["quick"]
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ export default [
plugins: { import: importPlugin }
},
{
ignores: ['**/dist', '**/vite.config.[cm]?ts.timestamp-*.[cm]js']
ignores: [
'**/dist',
'**/vite.config.[cm]?ts.timestamp-*.[cm]js',
'**/vite.config.*.timestamp*',
'**/vitest.config.*.timestamp*'
]
},
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
Expand Down
5 changes: 2 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,8 @@
"version": {
"preVersionCommand": "pnpm nx run-many -t build",
"conventionalCommits": true,
"generatorOptions": {
"fallbackCurrentVersionResolver": "disk"
}
"fallbackCurrentVersionResolver": "disk",
"preserveLocalDependencyProtocols": false
},
"conventionalCommits": {
"types": {
Expand Down
68 changes: 35 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"http-status-codes": "^2.3.0",
"isbot": "^4.4.0",
"lucide-react": "^0.539.0",
"next": "15.2.3",
"next": "15.2.5",
"next-themes": "^0.4.6",
"nodemailer": "^6.10.0",
"nodemailer-sendgrid": "^1.0.3",
Expand Down Expand Up @@ -92,23 +92,23 @@
"@eslint/js": "^9.8.0",
"@evilmartians/lefthook": "^1.8.0",
"@homebridge/node-pty-prebuilt-multiarch": "^0.13.0",
"@nx/cypress": "20.4.5",
"@nx/devkit": "20.4.5",
"@nx/esbuild": "20.4.5",
"@nx/eslint": "20.4.5",
"@nx/eslint-plugin": "20.4.5",
"@nx/jest": "20.4.5",
"@nx/js": "20.4.5",
"@nx/next": "20.4.5",
"@nx/node": "20.4.5",
"@nx/playwright": "20.4.5",
"@nx/plugin": "20.4.5",
"@nx/react": "20.4.5",
"@nx/remix": "20.4.5",
"@nx/vite": "20.4.5",
"@nx/web": "20.4.5",
"@nx/webpack": "20.4.5",
"@nx/workspace": "20.4.5",
"@nx/cypress": "21.5.3",
"@nx/devkit": "21.5.3",
"@nx/esbuild": "21.5.3",
"@nx/eslint": "21.5.3",
"@nx/eslint-plugin": "21.5.3",
"@nx/jest": "21.5.3",
"@nx/js": "21.5.3",
"@nx/next": "21.5.3",
"@nx/node": "21.5.3",
"@nx/playwright": "21.5.3",
"@nx/plugin": "21.5.3",
"@nx/react": "21.5.3",
"@nx/remix": "21.5.3",
"@nx/vite": "21.5.3",
"@nx/web": "21.5.3",
"@nx/webpack": "21.5.3",
"@nx/workspace": "21.5.3",
"@octokit/core": "6.1.6",
"@octokit/graphql-schema": "^15.25.0",
"@octokit/plugin-rest-endpoint-methods": "^13.2.6",
Expand All @@ -121,17 +121,17 @@
"@remix-run/testing": "^2.14.0",
"@svgr/webpack": "^8.0.1",
"@swc-node/register": "~1.10.0",
"@swc/cli": "~0.6.0",
"@swc/cli": "0.6.0",
"@swc/core": "~1.10.0",
"@swc/helpers": "~0.5.11",
"@swc/jest": "~0.2.36",
"@swc/jest": "0.2.39",
"@tailwindcss/postcss": "~4.1.0",
"@tailwindcss/typography": "^0.5.16",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "6.7.0",
"@testing-library/react": "16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@types/jest": "30.0.0",
"@types/kill-port": "^2.0.3",
"@types/node": "22.17.1",
"@types/nodemailer": "^6.4.17",
Expand All @@ -146,34 +146,36 @@
"@vitejs/plugin-react-swc": "^3.5.0",
"@vitest/coverage-v8": "^1.0.4",
"@vitest/ui": "^1.3.1",
"babel-jest": "^29.7.0",
"babel-jest": "30.0.5",
"chalk": "^4.1.0",
"concurrently": "^9.1.2",
"create-nx-workspace": "20.4.5",
"create-nx-workspace": "21.5.3",
"cz-git": "^1.8.0",
"czg": "^1.8.0",
"docker-cli-js": "^2.10.0",
"enquirer": "^2.4.1",
"esbuild": "~0.19.0",
"eslint": "~9.20.0",
"eslint-config-next": "15.1.7",
"eslint-config-prettier": "^9.0.0",
"eslint-config-next": "15.5.3",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-import": "2.32.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-playwright": "^2.0.0",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "5.2.0",
"graphql-config": "^5.1.3",
"jest": "^29.7.0",
"jest": "30.0.5",
"jest-diff": "^29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-environment-jsdom": "30.0.5",
"jest-environment-node": "^29.7.0",
"jest-util": "30.0.5",
"jiti": "2.4.2",
"jsdom": "~26.1.0",
"kill-port": "^2.0.1",
"memfs": "^4.14.0",
"nodemon": "^3.1.9",
"npm-whoami": "^1.1.4",
"nx": "20.4.5",
"nx": "21.5.3",
"nx-cloud": "19.1.0",
"postcss": "~8.5.2",
"prettier": "^3.0.0",
Expand All @@ -185,15 +187,15 @@
"tcp-port-used": "^1.0.2",
"tiny-invariant": "^1.3.3",
"tree-kill": "^1.2.2",
"ts-jest": "^29.1.0",
"ts-jest": "29.4.4",
"ts-node": "10.9.2",
"tslib": "^2.4.1",
"tsx": "^4.19.2",
"type-fest": "^4.26.1",
"typescript": "~5.7.0",
"typescript-eslint": "^8.0.0",
"verdaccio": "^5.0.4",
"vite": "^5.0.0",
"typescript": "5.9.2",
"typescript-eslint": "8.44.0",
"verdaccio": "6.1.6",
"vite": "6.3.6",
"vitest": "^1.3.1",
"yargs": "^17.7.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
"@actions/github": "^6.0.0",
"@clack/prompts": "^0.11.0",
"@homebridge/node-pty-prebuilt-multiarch": "^0.13.0",
"@nx/devkit": "^20.0.0",
"@nx/plugin": "^20.0.0",
"@nx/devkit": "^21.0.0",
"@nx/plugin": "^21.0.0",
"@octokit/request-error": "^5.0.1",
"chalk": "^4.1.0",
"docker-cli-js": "^2.10.0",
"fast-glob": "^3.3.2",
"http-status-codes": "^2.3.0",
"kill-port": "^2.0.1",
"npm-whoami": "^1.1.4",
"nx": "^20.0.0",
"nx": "^21.0.0",
"simple-git": "^3.27.0",
"tcp-port-used": "^1.0.2",
"tiny-invariant": "^1.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/lib/release/changelogs.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import chalk from 'chalk';
import { releaseChangelog } from 'nx/release';
import type { VersionData } from 'nx/src/command-line/release/version';
import type { ChangelogOptions } from 'nx/src/command-line/release/command-object';

/**
* Generate changelogs
Expand All @@ -9,7 +9,7 @@ import type { VersionData } from 'nx/src/command-line/release/version';
* @returns `true` if changelog ran successfully, otherwise `false`
*/
export const changelogs = async (options: {
versionData: VersionData;
versionData: ChangelogOptions['versionData'];
dryRun?: boolean;
verbose?: boolean;
}): Promise<boolean> => {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/lib/release/revert-package-json.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { readJsonFile, writeJsonFile } from '@nx/devkit';
import chalk from 'chalk';
import type { VersionData } from 'nx/src/command-line/release/version';
import type { NxReleaseVersionResult } from 'nx/src/command-line/release/version';
import type { PackageJson } from 'nx/src/utils/package-json';

/**
Expand All @@ -18,7 +18,7 @@ import type { PackageJson } from 'nx/src/utils/package-json';
*/
export const revertPackageJson = (
originPackageFile: PackageJson,
projectsVersionData: VersionData
projectsVersionData: NxReleaseVersionResult['projectsVersionData']
) => {
if (!projectsVersionData['nx-payload'].newVersion) {
return;
Expand Down
2 changes: 1 addition & 1 deletion packages/create-nx-payload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"chalk": "^4.1.0",
"create-nx-workspace": "20.4.5",
"create-nx-workspace": "21.5.3",
"enquirer": "^2.4.1",
"tslib": "^2.4.1",
"yargs": "^17.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/nx-fly-deployment-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@actions/core": "^1.11.1",
"@actions/exec": "^1.1.1",
"@actions/github": "^6.0.0",
"@nx/devkit": "^20.0.0",
"@nx/devkit": "^21.0.0",
"@octokit/webhooks-types": "^7.6.1",
"zod": "^3.23.8"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/nx-migrate-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@actions/core": "^1.11.1",
"@actions/exec": "^1.1.1",
"@actions/github": "^6.0.0",
"@nx/devkit": "^20.0.0",
"@nx/devkit": "^21.0.0",
"@octokit/graphql-schema": "^15.25.0",
"replace-in-file": "^7.2.0",
"zod": "^3.23.8"
Expand Down
2 changes: 1 addition & 1 deletion packages/nx-payload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"access": "public"
},
"peerDependencies": {
"@nx/devkit": "^20.4.2",
"@nx/devkit": "^21.0.0",
"next": "^15.0.0",
"payload": "^3.0.0",
"react": "^19.0.0",
Expand Down
Loading
Loading