From 7c461ff79598f574c63cc07c3691a5e9b3341ffa Mon Sep 17 00:00:00 2001 From: "ilya.kharchenko" <14272298+IlyaKhD@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:43:33 +0400 Subject: [PATCH] Update tools to v12 (#25565) --- package-lock.json | 41 +++--------------------- package.json | 13 +++++--- packages/devextreme-angular/gulpfile.js | 2 +- packages/devextreme-angular/package.json | 4 +-- packages/devextreme/package.json | 11 +++---- 5 files changed, 19 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef715b54f572..8fdbc83572d9 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": "10.0.0-beta.19", + "devextreme-internal-tools": "12.0.0-beta.1", "eslint": "8.47.0", "eslint-config-airbnb-base": "15.0.0", "eslint-config-airbnb-typescript": "17.0.0", @@ -13729,9 +13729,9 @@ "link": true }, "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==", + "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", @@ -47168,7 +47168,6 @@ "cssom": "0.5.0", "del": "2.2.2", "devextreme-cldr-data": "1.0.3", - "devextreme-internal-tools": "10.0.0-beta.19", "devextreme-screenshot-comparer": "2.0.15", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.7", @@ -47287,7 +47286,6 @@ "del": "^2.2.2", "devextreme": "~23.2.0", "devextreme-angular-generator": "https://gitpkg.now.sh/DevExpress/devextreme-angular/packages/devextreme-angular-generator?master", - "devextreme-internal-tools": "10.0.0-beta.18", "gulp": "^4.0.2", "gulp-header": "^1.8.12", "gulp-replace": "^0.6.1", @@ -47769,25 +47767,6 @@ "node": ">=0.10.0" } }, - "packages/devextreme-angular/node_modules/devextreme-internal-tools": { - "version": "10.0.0-beta.18", - "resolved": "https://registry.npmjs.org/devextreme-internal-tools/-/devextreme-internal-tools-10.0.0-beta.18.tgz", - "integrity": "sha512-Z2P3La50REd7XQSyD23HMxD6XfuQFZ4lxR0ZahB7ZCBxWjdCNrs5BteMFAFD8uKHoLuxocD+ay6X0fW6zI3Y6g==", - "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" - } - }, "packages/devextreme-angular/node_modules/duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -48412,18 +48391,6 @@ "node": ">=6" } }, - "packages/devextreme-angular/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" - } - }, "packages/devextreme-angular/node_modules/read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", diff --git a/package.json b/package.json index b5c88b41dc50..21781822b243 100644 --- a/package.json +++ b/package.json @@ -3,15 +3,20 @@ "version": "23.2.0", "license": "MIT", "scripts": { + "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:discover-declarations": "dx-tools discover --js-scripts ./packages/devextreme/js --exclude \"js/(renovation|__internal|.eslintrc.js)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\" --artifacts ./artifacts/internal-tools", - "tools:generate-imd": "dx-tools integration-data-generator --artifacts ./artifacts/internal-tools", - "tools:generate-ng-smd": "dx-tools generate-ng-smd --artifacts ./artifacts/internal-tools", + "tools": "dx-tools", + "tools:discover-declarations": "dx-tools discover-declarations --sources ./packages/devextreme/js --exclude \"js/(renovation|__internal|.eslintrc.js)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\" --artifacts ./artifacts/internal-tools", + "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/", @@ -26,7 +31,7 @@ "@types/node": "^18.15.3", "cheerio": "1.0.0-rc.10", "codelyzer": "^6.0.2", - "devextreme-internal-tools": "10.0.0-beta.19", + "devextreme-internal-tools": "12.0.0-beta.1", "eslint": "8.47.0", "eslint-config-airbnb-base": "15.0.0", "eslint-config-airbnb-typescript": "17.0.0", diff --git a/packages/devextreme-angular/gulpfile.js b/packages/devextreme-angular/gulpfile.js index aacaecbfe105..f086d7beab89 100644 --- a/packages/devextreme-angular/gulpfile.js +++ b/packages/devextreme-angular/gulpfile.js @@ -156,7 +156,7 @@ gulp.task('npm.content', gulp.series( gulp.task('npm.pack', gulp.series( 'npm.content', (cb) => { - argv.withDescriptions ? exec('npm run inject-descriptions', (err) => cb(err)) : cb(); + argv.withDescriptions ? exec('npm --prefix ../../ run angular:inject-descriptions', (err) => cb(err)) : cb(); }, (cb) => { exec('npm pack', { cwd: buildConfig.npm.distPath }, (err) => cb(err)) } )); diff --git a/packages/devextreme-angular/package.json b/packages/devextreme-angular/package.json index dd144048a67f..9576b0f7f70d 100644 --- a/packages/devextreme-angular/package.json +++ b/packages/devextreme-angular/package.json @@ -13,8 +13,7 @@ "lint": "eslint src", "test": "npm run gulp -- test", "test:dev": "npm run gulp -- run.tests", - "pack": "npm run gulp -- npm.pack", - "inject-descriptions": "dx-tools inject-descriptions-to-bundle --js-scripts ./npm/dist --artifacts ../../artifacts/internal-tools" + "pack": "npm run gulp -- npm.pack" }, "author": "Developer Express Inc.", "license": "MIT", @@ -41,7 +40,6 @@ "del": "^2.2.2", "devextreme": "~23.2.0", "devextreme-angular-generator": "https://gitpkg.now.sh/DevExpress/devextreme-angular/packages/devextreme-angular-generator?master", - "devextreme-internal-tools": "10.0.0-beta.18", "gulp": "^4.0.2", "gulp-header": "^1.8.12", "gulp-replace": "^0.6.1", diff --git a/packages/devextreme/package.json b/packages/devextreme/package.json index 572a9b5e07a8..69dd188deade 100644 --- a/packages/devextreme/package.json +++ b/packages/devextreme/package.json @@ -86,7 +86,6 @@ "cssom": "0.5.0", "del": "2.2.2", "devextreme-cldr-data": "1.0.3", - "devextreme-internal-tools": "10.0.0-beta.19", "devextreme-screenshot-comparer": "2.0.15", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.7", @@ -209,13 +208,11 @@ "dev-inprogress": "dotnet build build/build-dotnet.sln && cross-env DEVEXTREME_TEST_CI=true BUILD_INPROGRESS_RENOVATION=true gulp dev", "dev:watch": "cross-env DEVEXTREME_TEST_CI=true gulp dev-watch", "transpile-tests": "gulp transpile-tests", - "discover-declarations": "dx-tools discover --js-scripts ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"", - "update-ts-reexports": "dx-tools generate-reexports --js-scripts ./js --exclude \"((dialog|export|list_light|notify|overlay|pager|palette|set_template_engine|splitter|themes|themes_callback|track_bar|utils|validation_engine|validation_message)[.d.ts])|(js/renovation/)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"", - "update-ts-bundle": "dx-tools update-ts-bundle --js-scripts ./js --output-path ./ts/dx.all.d.ts --exclude js/renovation/", + "update-ts-reexports": "dx-tools generate-reexports --sources ./js --exclude \"((dialog|export|list_light|notify|overlay|pager|palette|set_template_engine|splitter|themes|themes_callback|track_bar|utils|validation_engine|validation_message)[.d.ts])|(js/renovation/)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"", + "update-ts-bundle": "dx-tools generate-ts-bundle --sources ./js --output-path ./ts/dx.all.d.ts --exclude js/renovation/", "regenerate": "npm run update-ts-bundle && npm run update-ts-reexports", "validate-ts": "gulp validate-ts", - "internal-tool": "dx-tools", - "validate-declarations": "dx-tools validate-declarations --js-scripts ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\"", + "validate-declarations": "dx-tools validate-declarations --sources ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\"", "testcafe-in-docker": "docker build -f ./testing/testcafe/docker/Dockerfile -t testcafe-testing . && docker run -it testcafe-testing", "test-testcafe": "node ./testing/testcafe/runner", "test-testcafe-inprogress": "node ./testing/testcafe/runner --meta=renovation", @@ -225,7 +222,7 @@ "qunit-in-docker": "gulp qunit-in-docker --constel", "test-typescript": "gulp test-ts", "tcd-update": "tcd-update", - "discover-ci": "npm run internal-tool -- discover-ts-declarations --js-scripts ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\" && npm run internal-tool -- discover --js-scripts ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\"" + "discover-ci": "npm run internal-tool -- discover-ts-declarations --sources ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\" && npm run internal-tool -- discover --sources ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\"" }, "jest": { "modulePathIgnorePatterns": [