Skip to content
Draft
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ Thumbs.db
.nx/cache
.nx/workspace-data
nx-cloud.env
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md
2 changes: 1 addition & 1 deletion apps/demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@vue/shared": "^3.2.47",
"canvg": "4.0.3",
"cldr-core": "40.0.0",
"cldr-data": "36.0.1",
"cldr-data": "36.0.4",
"cldr-dates-full": "40.0.0",
"cldr-numbers-full": "40.0.0",
"cldrjs": "0.5.5",
Expand Down
2 changes: 1 addition & 1 deletion apps/react-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"prop-types": "15.8.1",
"react": "18.0.0",
"react-dom": "18.0.0",
"storybook": "7.6.19",
"storybook": "10.1.4",
"typescript": "4.9.5"
}
}
2 changes: 1 addition & 1 deletion e2e/bundlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"cldrjs": "0.5.5",
"jquery": "catalog:",
"minimist": "1.2.8",
"parcel": "2.12.0",
"parcel": "2.16.1",
"rimraf": "3.0.2",
"rollup": "4.22.4",
"vite": "5.4.19",
Expand Down
4 changes: 2 additions & 2 deletions e2e/bundlers/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"executor": "nx:run-commands",
"options": {
"cwd": "{projectRoot}",
"command": "rimraf entry && mkdir entry && node ./generate_entry_files.js"
"command": "rimraf entry dist && mkdir -p entry dist/dist_browserify dist/dist_parsel dist/dist_webpack && node ./generate_entry_files.js"
},
"outputs": [
"{projectRoot}/entry"
Expand Down Expand Up @@ -59,7 +59,7 @@
"executor": "nx:run-commands",
"options": {
"cwd": "{projectRoot}",
"command": "cross-env NODE_PATH=./node_modules:./node_modules/globalize/dist browserify ./entry/modules_cjs.js -o ./dist/dist_browserify/bundle_cjs.js"
"command": "cross-env NODE_PATH=./node_modules:./node_modules/globalize/dist browserify ./entry/modules_cjs.js -o /tmp/bundle_cjs.js && mkdir -p dist/dist_browserify && mv /tmp/bundle_cjs.js ./dist/dist_browserify/bundle_cjs.js"
},
"dependsOn": ["build"]
},
Expand Down
8 changes: 4 additions & 4 deletions e2e/wrappers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
"@angular-devkit/build-angular": "^19.2.5",
"@angular/cli": "^19.2.5",
"@angular/compiler-cli": "^19.2.0",
"@eslint/js": "^9.21.0",
"@eslint/js": "^9.39.1",
"@types/jasmine": "~5.1.0",
"@types/react": "^19.0.10",
"@types/react-dom": "^19.0.4",
"@vitejs/plugin-react": "^4.3.4",
"@vitejs/plugin-vue": "^5.2.1",
"eslint": "^9.21.0",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.19",
"eslint": "^9.39.1",
"eslint-plugin-react-hooks": "^7.0.1",
"eslint-plugin-react-refresh": "^0.4.24",
"globals": "^15.15.0",
"jasmine-core": "~5.6.0",
"karma": "~6.4.0",
Expand Down
12 changes: 10 additions & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@
"extends": "nx/presets/npm.json",
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"nxCloudAccessToken": "ZDFmMzkyZTYtZmU5MC00MDMyLWI3NDktYjhhYWUxZWM4YTg3fHJlYWQ=",
"plugins": ["./packages/nx-infra-plugin/dist"],
"plugins": [
"./packages/nx-infra-plugin/dist"
],
"namedInputs": {
"metadataToolsCommonInputs": [
"{projectRoot}/**/*.ts",
"{projectRoot}/tsconfig.json",
{ "externalDependencies": [ "devextreme-internal-tools", "ts-node", "typescript"] }
{
"externalDependencies": [
"devextreme-internal-tools",
"ts-node",
"typescript"
]
}
]
},
"targetDefaults": {
Expand Down
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"nx": {},
"private": true,
"devDependencies": {
"@nx/devkit": "18.3.4",
"@nx/jest": "19.4.2",
"@nx/js": "19.4.2",
"@nx/devkit": "22.1.3",
"@nx/jest": "22.1.3",
"@nx/js": "22.1.3",
"@types/jest": "29.5.12",
"@types/node": "20.12.8",
"@types/shelljs": "0.8.15",
Expand All @@ -45,8 +45,8 @@
"jest": "29.7.0",
"jspdf-autotable": "3.8.3",
"lint-staged": "14.0.1",
"nx": "19.4.2",
"nx-cloud": "19.0.0",
"nx": "22.1.3",
"nx-cloud": "19.1.0",
"postcss": "8.4.38",
"shelljs": "0.8.5",
"shx": "0.4.0",
Expand All @@ -66,7 +66,9 @@
"form-data@<2.5.4": "2.5.5",
"form-data@>=4.0.0 <4.0.4": "^4.0.5",
"pbkdf2@<=3.1.2": "^3.1.3",
"sha.js@<=2.4.11": "^2.4.12"
"sha.js@<=2.4.11": "^2.4.12",
"rollup@<2.79.2": "^4.53.3",
"json5@<1.0.2": "^2.2.3"
}
},
"packageManager": "pnpm@9.15.4"
Expand Down
20 changes: 14 additions & 6 deletions packages/devextreme-monorepo-tools/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,38 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "{projectRoot}/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"outputs": [
"{options.outputPath}"
],
"options": {
"outputPath": "{projectRoot}/npm",
"tsConfig": "{projectRoot}/tsconfig.build.json",
"packageJson": "{projectRoot}/package.json",
"main": "{projectRoot}/src/index.ts",
"assets": ["{projectRoot}/*.md"],
"assets": [
"{projectRoot}/*.md"
],
"srcRootForCompilationRoot": "src"
}
},
"pack-and-copy": {
"dependsOn": ["build"],
"dependsOn": [
"build"
],
"command": "ts-node tools/scripts/pack devextreme-monorepo-tools"
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "{projectRoot}/jest.config.ts"
}
}
},
"tags": []
}
}
8 changes: 6 additions & 2 deletions packages/nx-infra-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"targets": {
"build": {
"executor": "nx:run-script",
"outputs": ["{projectRoot}/dist"],
"outputs": [
"{projectRoot}/dist"
],
"options": {
"script": "build"
}
Expand All @@ -20,7 +22,9 @@
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "{projectRoot}/jest.config.ts"
}
Expand Down
22 changes: 21 additions & 1 deletion packages/nx-infra-plugin/src/utils/test-utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExecutorContext } from '@nx/devkit';
import { ExecutorContext, ProjectGraph } from '@nx/devkit';
import * as fs from 'fs';
import * as path from 'path';
import * as os from 'os';
Expand All @@ -18,6 +18,8 @@ export interface MockContextOptions {
projectName?: string;
projectRoot?: string;
isVerbose?: boolean;
nxJsonConfiguration?: Record<string, unknown>;
projectGraph?: Record<string, unknown>;
}

export function createMockContext(options: MockContextOptions = {}): ExecutorContext {
Expand All @@ -26,8 +28,24 @@ export function createMockContext(options: MockContextOptions = {}): ExecutorCon
projectName = 'test-lib',
projectRoot = 'packages/test-lib',
isVerbose = false,
nxJsonConfiguration = {},
} = options;

const projectGraph: ProjectGraph = {
nodes: {
[projectName]: {
name: projectName,
type: 'lib',
data: {
root: projectRoot,
targets: {},
},
},
},
externalNodes: {},
dependencies: {},
};

return {
root,
cwd: root,
Expand All @@ -39,5 +57,7 @@ export function createMockContext(options: MockContextOptions = {}): ExecutorCon
},
version: 2,
},
nxJsonConfiguration,
projectGraph,
};
}
Loading
Loading