Skip to content

Commit

Permalink
Update tools to v12 (#25565)
Browse files Browse the repository at this point in the history
  • Loading branch information
IlyaKhD authored Sep 13, 2023
1 parent 07b7438 commit 7c461ff
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 52 deletions.
41 changes: 4 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-angular/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)) }
));
Expand Down
4 changes: 1 addition & 3 deletions packages/devextreme-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
11 changes: 4 additions & 7 deletions packages/devextreme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": [
Expand Down

0 comments on commit 7c461ff

Please sign in to comment.