From f58dae0ab3ac97e75780a51095c934afa637978b Mon Sep 17 00:00:00 2001 From: "ilya.kharchenko" <14272298+IlyaKhD@users.noreply.github.com> Date: Thu, 14 Sep 2023 13:44:36 +0400 Subject: [PATCH] Use generators from the internal-tools package (#25566) --- package-lock.json | 383 ++++---------------- package.json | 5 +- packages/devextreme-angular/build.config.js | 6 - packages/devextreme-angular/gulpfile.js | 25 +- packages/devextreme-angular/package.json | 1 - packages/devextreme-angular/project.json | 2 +- packages/devextreme-react/gulpfile.js | 4 +- packages/devextreme-react/package.json | 1 - packages/devextreme-react/project.json | 2 +- packages/devextreme-vue/gulpfile.js | 4 +- packages/devextreme-vue/package.json | 1 - packages/devextreme-vue/project.json | 2 +- 12 files changed, 100 insertions(+), 336 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8553d7d40b75..75835323adbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@types/node": "^18.15.3", "cheerio": "1.0.0-rc.10", "codelyzer": "^6.0.2", - "devextreme-internal-tools": "12.0.0-beta.1", + "devextreme-internal-tools": "12.0.0-beta.2", "eslint": "8.47.0", "eslint-config-airbnb-base": "15.0.0", "eslint-config-airbnb-typescript": "17.0.0", @@ -12855,15 +12855,6 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, - "node_modules/deepmerge": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", - "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/default-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", @@ -13469,288 +13460,129 @@ "resolved": "packages/devextreme-angular", "link": true }, - "node_modules/devextreme-angular-generator": { - "version": "2.1.2", - "resolved": "https://gitpkg.now.sh/DevExpress/devextreme-angular/packages/devextreme-angular-generator?master", - "integrity": "sha512-FoXFedCtMuhIRyhTUeSbd54n6yxQ1KBt7ZLSmcYComGy8kb4unAVy7P/t4HzbRnaoRCSMHMBGiaSRYDtnOavzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "deepmerge": "^2.2.1", - "dot": "^1.1.3", - "inflector-js": "^1.0.1", - "mkdirp": "^0.5.6", - "yargs": "^6.6.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", - "dev": true, - "dependencies": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", - "dev": true, - "dependencies": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "dev": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } + "node_modules/devextreme-angular-sandbox": { + "resolved": "playgrounds/angular", + "link": true }, - "node_modules/devextreme-angular-generator/node_modules/load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } + "node_modules/devextreme-cldr-data": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/devextreme-cldr-data/-/devextreme-cldr-data-1.0.3.tgz", + "integrity": "sha512-xd+uWv1KzEhr+ZH/MOWfDei3GFz+NAYyKUR9HgjM9BBwPel7PpMElYp4whM+PtAjziBaTssQnA//ob5c3BovTA==", + "dev": true }, - "node_modules/devextreme-angular-generator/node_modules/parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", - "dev": true, - "dependencies": { - "error-ex": "^1.2.0" - }, - "engines": { - "node": ">=0.10.0" - } + "node_modules/devextreme-dist": { + "resolved": "packages/devextreme/artifacts/npm/devextreme-dist", + "link": true }, - "node_modules/devextreme-angular-generator/node_modules/path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", + "node_modules/devextreme-internal-tools": { + "version": "12.0.0-beta.2", + "resolved": "https://registry.npmjs.org/devextreme-internal-tools/-/devextreme-internal-tools-12.0.0-beta.2.tgz", + "integrity": "sha512-xY/l0TuF4d8V967GQJQdX01jeCy1lwqAWTe7FWZazs2/RiRvwJG3JLxSdvBSko59MHtx+bTixU17tL7izDLNBw==", "dev": true, "dependencies": { - "pinkie-promise": "^2.0.0" + "dasherize": "2.0.0", + "deepmerge": "4.3.1", + "dot": "1.1.3", + "inflector-js": "1.0.1", + "logform": "2.4.2", + "mkdirp": "3.0.1", + "prettier": "2.3.2", + "shelljs": "^0.8.3", + "typescript": "4.2", + "winston": "~3.4.0", + "yargs": "17.7.2" }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "bin": { + "dx-tools": "cli.js" }, "engines": { - "node": ">=0.10.0" + "node": ">=12.0.0" } }, - "node_modules/devextreme-angular-generator/node_modules/read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", + "node_modules/devextreme-internal-tools/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, "dependencies": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">=12" } }, - "node_modules/devextreme-angular-generator/node_modules/read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", + "node_modules/devextreme-internal-tools/node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, - "dependencies": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, "engines": { "node": ">=0.10.0" } }, - "node_modules/devextreme-angular-generator/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "node_modules/devextreme-internal-tools/node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, "engines": { - "node": ">=0.10.0" + "node": "6.* || 8.* || >= 10.*" } }, - "node_modules/devextreme-angular-generator/node_modules/strip-ansi": { + "node_modules/devextreme-internal-tools/node_modules/mkdirp": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" + "bin": { + "mkdirp": "dist/cjs/src/bin.js" }, "engines": { - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/devextreme-angular-generator/node_modules/strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", + "node_modules/devextreme-internal-tools/node_modules/prettier": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true, - "dependencies": { - "is-utf8": "^0.2.0" + "bin": { + "prettier": "bin-prettier.js" }, "engines": { - "node": ">=0.10.0" + "node": ">=10.13.0" } }, - "node_modules/devextreme-angular-generator/node_modules/wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", + "node_modules/devextreme-internal-tools/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "dependencies": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, "engines": { - "node": ">=0.10.0" + "node": ">=10" } }, - "node_modules/devextreme-angular-generator/node_modules/yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==", + "node_modules/devextreme-internal-tools/node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "dependencies": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^4.2.0" - } - }, - "node_modules/devextreme-angular-generator/node_modules/yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==", - "dev": true, - "dependencies": { - "camelcase": "^3.0.0" - } - }, - "node_modules/devextreme-angular-sandbox": { - "resolved": "playgrounds/angular", - "link": true - }, - "node_modules/devextreme-cldr-data": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/devextreme-cldr-data/-/devextreme-cldr-data-1.0.3.tgz", - "integrity": "sha512-xd+uWv1KzEhr+ZH/MOWfDei3GFz+NAYyKUR9HgjM9BBwPel7PpMElYp4whM+PtAjziBaTssQnA//ob5c3BovTA==", - "dev": true - }, - "node_modules/devextreme-dist": { - "resolved": "packages/devextreme/artifacts/npm/devextreme-dist", - "link": true - }, - "node_modules/devextreme-internal-tools": { - "version": "12.0.0-beta.1", - "resolved": "https://registry.npmjs.org/devextreme-internal-tools/-/devextreme-internal-tools-12.0.0-beta.1.tgz", - "integrity": "sha512-t71XYQCS4RZt/+Fpf1TB52WiFYlIAUfr4FGpegaGdMze6tbNJvkomp8aNG5nMEbidmqTzhkLEseFdSbKsFdQ7A==", - "dev": true, - "dependencies": { - "logform": "2.4.2", - "prettier": "2.3.2", - "shelljs": "^0.8.3", - "typescript": "4.2", - "winston": "~3.4.0" - }, - "bin": { - "dx-tools": "index.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/devextreme-internal-tools/node_modules/prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" }, "engines": { - "node": ">=10.13.0" + "node": ">=12" } }, "node_modules/devextreme-main": { @@ -13785,49 +13617,6 @@ "resolved": "packages/devextreme-react", "link": true }, - "node_modules/devextreme-react-generator": { - "version": "4.1.7", - "resolved": "https://gitpkg.now.sh/DevExpress/devextreme-react/packages/devextreme-react-generator?master", - "integrity": "sha512-UBI8TcBAhR+LpG2Kueqzf/8UtIgkr3QqdXvYr6QF8ZovNMybZXghzlMJJaJrZRI/i+qoqdhyjflxJZQapUmqBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "dasherize": "^2.0.0", - "devextreme-internal-tools": "10.0.0-beta.19", - "dot": "^1.1.3" - } - }, - "node_modules/devextreme-react-generator/node_modules/devextreme-internal-tools": { - "version": "10.0.0-beta.19", - "resolved": "https://registry.npmjs.org/devextreme-internal-tools/-/devextreme-internal-tools-10.0.0-beta.19.tgz", - "integrity": "sha512-RZ/r/AqXXFjoNXaP4x8g8ywY8HhRs88DDFEhnF8aPTOidQVcpzPUUQylRdZ5Ufw2jzvj+bf0dVBVLIZEjpIy+w==", - "dev": true, - "dependencies": { - "logform": "2.4.2", - "prettier": "2.3.2", - "shelljs": "^0.8.3", - "typescript": "4.2", - "winston": "~3.4.0" - }, - "bin": { - "dx-tools": "index.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/devextreme-react-generator/node_modules/prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/devextreme-react-sandbox": { "resolved": "playgrounds/react", "link": true @@ -13924,17 +13713,6 @@ "resolved": "packages/devextreme-vue", "link": true }, - "node_modules/devextreme-vue-generator": { - "version": "3.0.4", - "resolved": "https://gitpkg.now.sh/DevExpress/devextreme-vue/packages/devextreme-vue-generator?master", - "integrity": "sha512-e1Q+UmVoivb1vE+SzSGgPA+qvTc5O7nDym272FWlPHr/D2B9a2inZUwa2bZjVTBVfWNngd1KKvKj6mGFKVZrjA==", - "dev": true, - "license": "MIT", - "dependencies": { - "dasherize": "^2.0.0", - "dot": "^1.1.3" - } - }, "node_modules/devextreme-vue-sandbox": { "resolved": "playgrounds/vue", "link": true @@ -47279,7 +47057,6 @@ "core-js": "^2.6.12", "del": "^2.2.2", "devextreme": "~23.2.0", - "devextreme-angular-generator": "https://gitpkg.now.sh/DevExpress/devextreme-angular/packages/devextreme-angular-generator?master", "gulp": "^4.0.2", "gulp-header": "^1.8.12", "gulp-replace": "^0.6.1", @@ -48865,7 +48642,6 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "del": "^3.0.0", - "devextreme-react-generator": "https://gitpkg.now.sh/DevExpress/devextreme-react/packages/devextreme-react-generator?master", "gulp": "^4.0.2", "gulp-header": "^2.0.9", "gulp-shell": "^0.8.0", @@ -49437,7 +49213,6 @@ "@vue/compiler-sfc": "^3.0.0", "@vue/test-utils": "2.0.0-beta.7", "del": "^3.0.0", - "devextreme-vue-generator": "https://gitpkg.now.sh/DevExpress/devextreme-vue/packages/devextreme-vue-generator?master", "gulp": "^4.0.2", "gulp-header": "^2.0.9", "gulp-shell": "^0.6.5", diff --git a/package.json b/package.json index 21781822b243..423a07082800 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,9 @@ "devextreme:inject-descriptions-to-bundle": "dx-tools inject-descriptions --target-path ./packages/devextreme/ts/dx.all.d.ts --artifacts ./artifacts/internal-tools", "devextreme:inject-descriptions-to-modules": "dx-tools inject-descriptions --collapse-tags --sources ./packages/devextreme/js --artifacts ./artifacts/internal-tools", "devextreme:inject-descriptions": "npm run devextreme:inject-descriptions-to-bundle && npm run devextreme:inject-descriptions-to-modules", - "angular:build-generator": "cd node_modules/devextreme-angular-generator && npm i --no-audit --no-fund && npm run build:local", "angular:copy-metadata": "shx mkdir -p ./packages/devextreme-angular/metadata/ && shx cp ./artifacts/internal-tools/NGMetaData.json ./packages/devextreme-angular/metadata/", "angular:regenerate": "nx regenerate devextreme-angular", "angular:inject-descriptions": "dx-tools inject-descriptions --sources ./packages/devextreme-angular/npm/dist --artifacts ./artifacts/internal-tools", - "react:build-generator": "cd node_modules/devextreme-react-generator && npm i --no-audit --no-fund && npm run build:local", "react:copy-metadata": "shx mkdir -p ./packages/devextreme-react/metadata/ && shx cp ./artifacts/internal-tools/integration-data.json ./packages/devextreme-react/metadata/", "react:regenerate": "nx regenerate devextreme-react", "tools": "dx-tools", @@ -18,7 +16,6 @@ "tools:generate-imd": "dx-tools make-integration-metadata --artifacts ./artifacts/internal-tools", "tools:generate-ng-smd": "dx-tools make-angular-metadata --artifacts ./artifacts/internal-tools", "tools:discover-metadata": "npm run tools:discover-declarations && npm run tools:generate-imd && npm run tools:generate-ng-smd", - "vue:build-generator": "cd node_modules/devextreme-vue-generator && npm i --no-audit --no-fund && npm run build:local", "vue:copy-metadata": "shx mkdir -p ./packages/devextreme-vue/metadata/ && shx cp ./artifacts/internal-tools/integration-data.json ./packages/devextreme-vue/metadata/", "vue:regenerate": "nx regenerate devextreme-vue", "regenerate-all": "nx run-many -t regenerate", @@ -31,7 +28,7 @@ "@types/node": "^18.15.3", "cheerio": "1.0.0-rc.10", "codelyzer": "^6.0.2", - "devextreme-internal-tools": "12.0.0-beta.1", + "devextreme-internal-tools": "12.0.0-beta.2", "eslint": "8.47.0", "eslint-config-airbnb-base": "15.0.0", "eslint-config-airbnb-typescript": "17.0.0", diff --git a/packages/devextreme-angular/build.config.js b/packages/devextreme-angular/build.config.js index 5a17cf9ccef9..3c9b80b44c0c 100644 --- a/packages/devextreme-angular/build.config.js +++ b/packages/devextreme-angular/build.config.js @@ -1,7 +1,6 @@ module.exports = { tools: { metadataGenerator: { - importFrom: 'devextreme-angular-generator/dist/metadata-generator', sourceMetadataFilePath: './metadata/NGMetaData.json', deprecatedMetadataFilePath: './metadata/DeprecatedComponentsMetadata.json', outputFolderPath: './metadata/generated', @@ -12,14 +11,12 @@ module.exports = { generateReexports: true, }, componentGenerator: { - importFrom: 'devextreme-angular-generator/dist/dot-generator', metadataFolderPath: './metadata/generated/', outputFolderPath: './src/ui/', nestedPathPart: 'nested', basePathPart: 'base' }, facadeGenerator: { - importFrom: 'devextreme-angular-generator/dist/facade-generator', facades: { './src/index.ts': { sourceDirectories: [ @@ -34,7 +31,6 @@ module.exports = { ] }, moduleFacadeGenerator: { - importFrom: 'devextreme-angular-generator/dist/module.facade-generator', moduleFacades: { './src/ui/all.ts': { sourceComponentDirectories: [ @@ -47,7 +43,6 @@ module.exports = { } }, componentNamesGenerator: { - importFrom: 'devextreme-angular-generator/dist/component-names-generator', componentFilesPath: './src/ui/', excludedFileNames: [ 'nested', @@ -60,7 +55,6 @@ module.exports = { outputFileName: 'tests/src/server/component-names.ts' }, commonReexportsGenerator: { - importFrom: 'devextreme-angular-generator/dist/common-reexports-generator', metadataPath: './metadata/NGMetaData.json', outputPath: './src/' }, diff --git a/packages/devextreme-angular/gulpfile.js b/packages/devextreme-angular/gulpfile.js index f086d7beab89..b54c45573a45 100644 --- a/packages/devextreme-angular/gulpfile.js +++ b/packages/devextreme-angular/gulpfile.js @@ -11,6 +11,13 @@ var header = require('gulp-header'); var ngPackagr = require('ng-packagr'); var exec = require('child_process').exec; +var AngularMetadataGenerator = require('devextreme-internal-tools').AngularMetadataGenerator; +var AngularDotGenerator = require('devextreme-internal-tools').AngularDotGenerator; +var AngularFacadeGenerator = require('devextreme-internal-tools').AngularFacadeGenerator; +var AngularModuleFacadeGenerator = require('devextreme-internal-tools').AngularModuleFacadeGenerator; +var AngularCommonReexportsGenerator = require('devextreme-internal-tools').AngularCommonReexportsGenerator; +var AngularComponentNamesGenerator = require('devextreme-internal-tools').AngularComponentNamesGenerator; + const argv = require('yargs') .default('with-descriptions', false) .argv; @@ -24,8 +31,7 @@ gulp.task('clean.metadata', gulp.series(function() { })); gulp.task('generate.metadata', gulp.series('clean.metadata', function(done) { - var MetadataGenerator = require(buildConfig.tools.metadataGenerator.importFrom).default, - generator = new MetadataGenerator(); + var generator = new AngularMetadataGenerator(); generator.generate(buildConfig.tools.metadataGenerator); done(); @@ -38,32 +44,28 @@ gulp.task('clean.generatedComponents', function(done) { }); gulp.task('generate.components', gulp.series('generate.metadata', 'clean.generatedComponents', function(done) { - var DoTGenerator = require(buildConfig.tools.componentGenerator.importFrom).default, - generator = new DoTGenerator(); + var generator = new AngularDotGenerator(); generator.generate(buildConfig.tools.componentGenerator); done(); })); gulp.task('generate.moduleFacades', gulp.series('generate.components', function(done) { - var ModuleFacadeGenerator = require(buildConfig.tools.moduleFacadeGenerator.importFrom).default, - moduleFacadeGenerator = new ModuleFacadeGenerator(); + var moduleFacadeGenerator = new AngularModuleFacadeGenerator(); moduleFacadeGenerator.generate(buildConfig.tools.moduleFacadeGenerator); done(); })); gulp.task('generate.facades', gulp.series('generate.moduleFacades', function(done) { - var FacadeGenerator = require(buildConfig.tools.facadeGenerator.importFrom).default, - facadeGenerator = new FacadeGenerator(); + var facadeGenerator = new AngularFacadeGenerator(); facadeGenerator.generate(buildConfig.tools.facadeGenerator); done(); })); gulp.task('generate.common-reexports', function(done) { - var CommonReexportsGenerator = require(buildConfig.tools.commonReexportsGenerator.importFrom).default, - commonReexportsGenerator = new CommonReexportsGenerator(); + var commonReexportsGenerator = new AngularCommonReexportsGenerator(); commonReexportsGenerator.generate(buildConfig.tools.commonReexportsGenerator); done(); @@ -184,8 +186,7 @@ gulp.task('clean.tests', function() { }); gulp.task('generate-component-names', function(done) { - var ComponentNamesGenerator = require(buildConfig.tools.componentNamesGenerator.importFrom).default; - var generator = new ComponentNamesGenerator(buildConfig.tools.componentNamesGenerator); + var generator = new AngularComponentNamesGenerator(buildConfig.tools.componentNamesGenerator); generator.generate(); diff --git a/packages/devextreme-angular/package.json b/packages/devextreme-angular/package.json index 9576b0f7f70d..dcf71cbc4a1d 100644 --- a/packages/devextreme-angular/package.json +++ b/packages/devextreme-angular/package.json @@ -39,7 +39,6 @@ "core-js": "^2.6.12", "del": "^2.2.2", "devextreme": "~23.2.0", - "devextreme-angular-generator": "https://gitpkg.now.sh/DevExpress/devextreme-angular/packages/devextreme-angular-generator?master", "gulp": "^4.0.2", "gulp-header": "^1.8.12", "gulp-replace": "^0.6.1", diff --git a/packages/devextreme-angular/project.json b/packages/devextreme-angular/project.json index 756f1f2866c5..0df473f23411 100644 --- a/packages/devextreme-angular/project.json +++ b/packages/devextreme-angular/project.json @@ -9,7 +9,7 @@ "options": { "script": "regenerate" }, - "dependsOn": ["devextreme-monorepo:\"angular:copy-metadata\"", "devextreme-monorepo:\"angular:build-generator\""] + "dependsOn": ["devextreme-monorepo:\"angular:copy-metadata\""] } }, "tags": [] diff --git a/packages/devextreme-react/gulpfile.js b/packages/devextreme-react/gulpfile.js index 01c8abeacc76..063cda4d9b0e 100644 --- a/packages/devextreme-react/gulpfile.js +++ b/packages/devextreme-react/gulpfile.js @@ -5,6 +5,7 @@ const shell = require('gulp-shell'); const header = require('gulp-header'); const ts = require('gulp-typescript'); const config = require('./build.config'); +const generateReactComponents = require('devextreme-internal-tools').generateReactComponents; const GENERATE = 'generate'; const CLEAN = 'clean'; @@ -22,8 +23,7 @@ gulp.task(CLEAN, (c) => ); gulp.task(GEN_RUN, (done) => { - const generateSync = require('devextreme-react-generator').default; - generateSync({ + generateReactComponents({ metaData: JSON.parse(fs.readFileSync(config.metadataPath).toString()), components: { baseComponent: config.baseComponent, diff --git a/packages/devextreme-react/package.json b/packages/devextreme-react/package.json index a60a5d26c1ff..a2346f47dc17 100644 --- a/packages/devextreme-react/package.json +++ b/packages/devextreme-react/package.json @@ -37,7 +37,6 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "del": "^3.0.0", - "devextreme-react-generator": "https://gitpkg.now.sh/DevExpress/devextreme-react/packages/devextreme-react-generator?master", "gulp": "^4.0.2", "gulp-header": "^2.0.9", "gulp-shell": "^0.8.0", diff --git a/packages/devextreme-react/project.json b/packages/devextreme-react/project.json index 24b2bf491ab7..fae78ca42e8c 100644 --- a/packages/devextreme-react/project.json +++ b/packages/devextreme-react/project.json @@ -9,7 +9,7 @@ "options": { "script": "regenerate" }, - "dependsOn": ["devextreme-monorepo:\"react:copy-metadata\"", "devextreme-monorepo:\"react:build-generator\""] + "dependsOn": ["devextreme-monorepo:\"react:copy-metadata\""] } }, "tags": [] diff --git a/packages/devextreme-vue/gulpfile.js b/packages/devextreme-vue/gulpfile.js index 8c4664fb4916..66653047b468 100644 --- a/packages/devextreme-vue/gulpfile.js +++ b/packages/devextreme-vue/gulpfile.js @@ -5,6 +5,7 @@ const shell = require('gulp-shell'); const header = require('gulp-header'); const ts = require('gulp-typescript'); const config = require('./build.config'); +const generateVueComponents = require('devextreme-internal-tools').generateVueComponents; const GENERATE = 'generate'; const CLEAN = 'clean'; @@ -30,8 +31,7 @@ gulp.task(CLEAN, gulp.parallel(OUTPUTDIR_CLEAN, NPM_CLEAN)); gulp.task(GENERATE, (done) => { - const generateSync = require('devextreme-vue-generator').default; - generateSync( + generateVueComponents( JSON.parse(fs.readFileSync(config.metadataPath).toString()), config.baseComponent, config.configComponent, diff --git a/packages/devextreme-vue/package.json b/packages/devextreme-vue/package.json index 6d15f0f1609c..7eab9560977b 100644 --- a/packages/devextreme-vue/package.json +++ b/packages/devextreme-vue/package.json @@ -31,7 +31,6 @@ "@vue/compiler-sfc": "^3.0.0", "@vue/test-utils": "2.0.0-beta.7", "del": "^3.0.0", - "devextreme-vue-generator": "https://gitpkg.now.sh/DevExpress/devextreme-vue/packages/devextreme-vue-generator?master", "gulp": "^4.0.2", "gulp-header": "^2.0.9", "gulp-shell": "^0.6.5", diff --git a/packages/devextreme-vue/project.json b/packages/devextreme-vue/project.json index e45b6444bb06..1815ebf39983 100644 --- a/packages/devextreme-vue/project.json +++ b/packages/devextreme-vue/project.json @@ -9,7 +9,7 @@ "options": { "script": "regenerate" }, - "dependsOn": ["devextreme-monorepo:\"vue:copy-metadata\"", "devextreme-monorepo:\"vue:build-generator\""] + "dependsOn": ["devextreme-monorepo:\"vue:copy-metadata\""] } }, "tags": []