Skip to content

Commit

Permalink
Merge pull request #775 from ag-grid/ag-10005/nx-upgrade-17.2.6
Browse files Browse the repository at this point in the history
AG-10005 - Nx upgrade 17.2.6
  • Loading branch information
alantreadway committed Dec 20, 2023
2 parents 70c404b + 28fb653 commit 5e3e4e5
Show file tree
Hide file tree
Showing 28 changed files with 912 additions and 639 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"no-unused-vars": 0, // Handled by TS strict flag.
"no-case-declarations": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/consistent-type-imports": "error"
"@typescript-eslint/consistent-type-imports": 0
}
},
{
Expand Down
14 changes: 2 additions & 12 deletions libraries/ag-charts-test/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,13 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libraries/ag-charts-test/**/*.ts", "libraries/ag-charts-test/package.json"]
}
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libraries/ag-charts-test/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "libraries/ag-charts-test/jest.config.ts"
}
}
},
Expand Down
25 changes: 20 additions & 5 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
"{projectRoot}/tsconfig.*.json",
"tsDeclarations",
"sharedGlobals",
{ "externalDependencies": ["typescript", "esbuild"] }
{
"externalDependencies": ["typescript", "esbuild"]
}
],
"sharedGlobals": ["{workspaceRoot}/esbuild.config*.cjs", "{workspaceRoot}/tsconfig.*.json"]
},
Expand Down Expand Up @@ -63,16 +65,29 @@
"inputs": ["default", "production", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true
},
"check": {
"inputs": ["production", "^production"],
"cache": true
},
"e2e": {
"inputs": ["default", "^production"],
"cache": true
},
"pack": {
"cache": true
},
"@nx/jest:jest": {
"inputs": ["default", "production", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true,
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
},
"@nx/vite:test": {
"cache": true,
"inputs": ["default", "^production"]
}
},
"workspaceLayout": {
Expand Down
44 changes: 23 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"private": true,
"dependencies": {
"@nicolo-ribaudo/semver-v6": "^6.3.3",
"@nx/devkit": "17.0.3",
"@nx/devkit": "17.2.6",
"@swc/helpers": "0.5.3",
"tslib": "^2.3.0"
},
Expand All @@ -21,18 +21,18 @@
"@carbon/icons-react": "^11.21.0",
"@nanostores/persistent": "^0.9.0",
"@nanostores/react": "^0.7.1",
"@nrwl/linter": "17.0.3",
"@nx/cypress": "17.0.3",
"@nx/esbuild": "17.0.3",
"@nx/eslint": "17.0.3",
"@nx/eslint-plugin": "17.0.3",
"@nx/jest": "17.0.3",
"@nx/js": "17.0.3",
"@nx/plugin": "17.0.3",
"@nx/react": "17.0.3",
"@nx/rollup": "17.0.3",
"@nx/vite": "17.0.3",
"@nx/workspace": "17.0.3",
"@nrwl/linter": "17.2.6",
"@nx/cypress": "17.2.6",
"@nx/esbuild": "17.2.6",
"@nx/eslint": "17.2.6",
"@nx/eslint-plugin": "17.2.6",
"@nx/jest": "17.2.6",
"@nx/js": "17.2.6",
"@nx/plugin": "17.2.6",
"@nx/react": "17.2.6",
"@nx/rollup": "17.2.6",
"@nx/vite": "17.2.6",
"@nx/workspace": "17.2.6",
"@swc-node/register": "1.6.8",
"@swc/cli": "0.1.62",
"@swc/core": "1.3.96",
Expand All @@ -41,16 +41,17 @@
"@types/jest": "^29.5.0",
"@types/jest-image-snapshot": "^5.1.0",
"@types/jscodeshift": "^0.11.6",
"@types/node": "18.7.1",
"@types/node": "18.16.9",
"@types/pixelmatch": "^5.2.4",
"@types/pngjs": "^6.0.1",
"@types/prismjs": "^1.26.0",
"@types/react": "18.2.24",
"@types/react-dom": "18.2.9",
"@types/ws": "8.5.3",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@vitest/ui": "~0.32.0",
"@typescript-eslint/eslint-plugin": "6.15.0",
"@typescript-eslint/parser": "6.15.0",
"@vitest/coverage-v8": "~0.34.6",
"@vitest/ui": "0.34.7",
"algoliasearch": "^4.18.0",
"canvas": "^2.10.2",
"cheerio": "^1.0.0-rc.12",
Expand All @@ -60,7 +61,7 @@
"dependency-cruiser": "^13.1.5",
"esbuild": "^0.19.2",
"esbuild-plugin-umd-wrapper": "^2.0.0",
"eslint": "8.46.0",
"eslint": "8.48.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-check-file": "^2.6.2",
"eslint-plugin-cypress": "2.14.0",
Expand All @@ -81,7 +82,7 @@
"nanostores": "^0.9.3",
"node-html-parser": "^6.1.5",
"npm-run-all": "^4.1.5",
"nx": "17.0.3",
"nx": "17.2.6",
"nx-cloud": "16.5.2",
"patch-package": "^8.0.0",
"pixelmatch": "^5.2.1",
Expand All @@ -100,9 +101,9 @@
"ts-jest": "^29.1.0",
"ts-node": "10.9.1",
"typescript": "^4.9.5",
"vite": "~4.3.9",
"vite": "5.0.10",
"vite-tsconfig-paths": "~4.2.0",
"vitest": "~0.32.0",
"vitest": "0.34.6",
"ws": "8.9.0"
},
"overrides": {
Expand All @@ -129,6 +130,7 @@
"libraries/ag-charts-test"
],
"nohoist": [
"**/tinypool",
"**/@vue/**",
"**/vue",
"**/vue-template-compiler",
Expand Down
13 changes: 1 addition & 12 deletions packages/ag-charts-community-examples/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"packages/ag-charts-community-examples/**/*.ts",
"packages/ag-charts-community-examples/package.json"
],
"eslintConfig": "packages/ag-charts-community-examples/.eslintrc.json"
},
"configurations": {
Expand All @@ -46,14 +42,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}", "{workspaceRoot}/reports/ag-charts-community-examples.xml"],
"options": {
"jestConfig": "packages/ag-charts-community-examples/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "packages/ag-charts-community-examples/jest.config.ts"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const ChartExample = () => {
const updateData = useCallback(() => {
const clone = { ...options }

var now = Date.now()
clone.data = getData()

setOptions(clone)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const ChartExample = () => {
const updateData = useCallback(() => {
const clone = { ...options };

var now = Date.now();
const now = Date.now();
clone.data = getData();

setOptions(clone);
Expand All @@ -66,11 +66,11 @@ const ChartExample = () => {
;
}

var systemLoad = 0
var userLoad = 0
var data: any[] = []
var refreshRateInMilliseconds = 50
var millisecondsOfData = 30 * 1000
let systemLoad = 0
let userLoad = 0
const data: any[] = []
const refreshRateInMilliseconds = 50
const millisecondsOfData = 30 * 1000
function calculateRandomDelta(maxChange: number) {
return maxChange / 2 - Math.floor(Math.random() * Math.floor(maxChange + 1));
}
Expand All @@ -88,10 +88,10 @@ function calculateCpuUsage() {
userLoad = ensureBounds(userLoad + calculateRandomDelta(4), 70);
}
function getData() {
var dataCount = millisecondsOfData / refreshRateInMilliseconds;
const dataCount = millisecondsOfData / refreshRateInMilliseconds;
data.shift();
var timeDelta = (dataCount - data.length - 1) * refreshRateInMilliseconds;
var now = Date.now();
let timeDelta = (dataCount - data.length - 1) * refreshRateInMilliseconds;
const now = Date.now();
while (data.length < dataCount) {
calculateCpuUsage();
data.push({ time: now - timeDelta, system: systemLoad, user: userLoad });
Expand Down
33 changes: 24 additions & 9 deletions packages/ag-charts-community/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
"build": {
"executor": "nx:noop",
"dependsOn": ["build:types", "build:package", "build:umd", "build-tsc"],
"inputs": [{ "externalDependencies": [] }],
"inputs": [
{
"externalDependencies": []
}
],
"configurations": {
"watch": {},
"production": {}
Expand Down Expand Up @@ -97,7 +101,12 @@
},
"docs-debug-interfaces": {
"executor": "ag-charts-generate-code-reference-files:generate",
"inputs": ["{projectRoot}/src/options", { "externalDependencies": [] }],
"inputs": [
"{projectRoot}/src/options",
{
"externalDependencies": []
}
],
"outputs": ["{options.output}"],
"cache": true,
"options": {
Expand All @@ -108,7 +117,12 @@
},
"docs-resolved-interfaces": {
"executor": "ag-charts-generate-code-reference-files:generate",
"inputs": ["{projectRoot}/src/options", { "externalDependencies": [] }],
"inputs": [
"{projectRoot}/src/options",
{
"externalDependencies": []
}
],
"outputs": ["{options.output}"],
"cache": true,
"options": {
Expand All @@ -121,7 +135,6 @@
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/ag-charts-community/**/*.ts", "packages/ag-charts-community/package.json"],
"eslintConfig": "packages/ag-charts-community/.eslintrc.json"
},
"configurations": {
Expand All @@ -146,7 +159,11 @@
"lint": {
"executor": "nx:noop",
"dependsOn": ["lint-eslint", "lint-circular", "lint-depcruise"],
"inputs": [{ "externalDependencies": [] }],
"inputs": [
{
"externalDependencies": []
}
],
"configurations": {
"fix": {}
}
Expand All @@ -155,12 +172,10 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}", "{workspaceRoot}/reports/ag-charts-community.xml"],
"options": {
"jestConfig": "packages/ag-charts-community/jest.config.ts"
"jestConfig": "packages/ag-charts-community/jest.config.ts",
"passWithNoTests": false
},
"configurations": {
"ci": {
"ci": true
},
"watch": {
"watch": true
},
Expand Down
19 changes: 11 additions & 8 deletions packages/ag-charts-enterprise/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
"build": {
"executor": "nx:noop",
"dependsOn": ["build:types", "build:package", "build:umd", "build-tsc"],
"inputs": [{ "externalDependencies": [] }],
"inputs": [
{
"externalDependencies": []
}
],
"configurations": {
"watch": {},
"production": {}
Expand Down Expand Up @@ -99,7 +103,6 @@
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/ag-charts-enterprise/**/*.ts", "packages/ag-charts-enterprise/package.json"],
"eslintConfig": "packages/ag-charts-enterprise/.eslintrc.json"
},
"configurations": {
Expand All @@ -117,7 +120,11 @@
"lint": {
"executor": "nx:noop",
"dependsOn": ["lint-eslint", "lint-circular"],
"inputs": [{ "externalDependencies": [] }],
"inputs": [
{
"externalDependencies": []
}
],
"configurations": {
"fix": {}
}
Expand All @@ -126,13 +133,9 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}", "{workspaceRoot}/reports/ag-charts-enterprise.xml"],
"options": {
"jestConfig": "packages/ag-charts-enterprise/jest.config.ts",
"passWithNoTests": true
"jestConfig": "packages/ag-charts-enterprise/jest.config.ts"
},
"configurations": {
"ci": {
"ci": true
},
"watch": {
"watch": true
},
Expand Down
Loading

0 comments on commit 5e3e4e5

Please sign in to comment.