fix tests

package.json

@@ -51,7 +51,7 @@
     "postcss": "^8.4.24",
     "shx": "0.3.4",
     "source-map": "0.7.4",
-    "typescript": "~4.7.4"
+    "typescript": "~4.2.4"
   },
   "pre-commit": [
     "lint-staged",

packages/devextreme-angular/src/core/component.ts

@@ -20,7 +20,7 @@ import { isPlatformServer } from '@angular/common';
 import { TransferState, makeStateKey } from '@angular/platform-browser';
 
 import domAdapter from 'devextreme/core/dom_adapter';
-import { triggerHandler } from 'devextreme/events/index.js';
+import { triggerHandler } from 'devextreme/events';
 import { DxTemplateDirective } from './template';
 import { IDxTemplateHost, DxTemplateHost } from './template-host';
 import { EmitterHelper, NgEventsStrategy } from './events-strategy';

packages/devextreme-dist/.npmignore

@@ -0,0 +1 @@
+project.json

packages/devextreme-dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-dist",
-  "version": "23.2.0",
+  "version": "23.2.99",
   "description": "HTML5 JavaScript Component Suite for Responsive Web Development",
   "keywords": [
     "html5",

packages/devextreme-vue/package.json

@@ -27,7 +27,7 @@
     "vue": "^3.0.0"
   },
   "devDependencies": {
-    "@types/jest": "^28.1.8",
+    "@types/jest": "^26.0.24",
     "@vue/compiler-sfc": "^3.0.0",
     "@vue/test-utils": "2.0.0-beta.7",
     "del": "^3.0.0",
@@ -36,9 +36,8 @@
     "gulp-header": "^2.0.9",
     "gulp-shell": "^0.6.5",
     "gulp-typescript": "^5.0.1",
-    "jest": "^28.1.3",
-    "jest-environment-jsdom": "28.1.3",
-    "ts-jest": "^28.0.8",
+    "jest": "^26.6.3",
+    "ts-jest": "^26.5.6",
     "typescript": "^4.7.4",
     "vue": "3.2.47",
     "vue-router": "^4.0.16"

packages/devextreme/.eslintignore

@@ -1,15 +1,43 @@
-artifacts/*
 js/viz/docs/*
 node_modules/*
 build/*
 *.j.tsx
 playground/*
-themebuilder/data/metadata/*
-themebuilder-scss/dist/*
-themebuilder-scss/coverage/*
-themebuilder-scss/src/data/metadata/*
 js/bundles/dx.custom.js
-testing/jest/utils/transformers/*
+testing/styles/opentype.js.d.ts
 ts/
 js/localization/cldr-data/*
 js/localization/default_messages.js
+
+/__internal
+/animation
+/artifacts
+/bin
+/aspnet
+/bundles
+/cjs
+/color
+/common
+/core
+/data
+/data_helper
+/dist
+/esm
+/events
+/excel_exporter
+/exporter
+/file_management
+/format_helper
+/integration
+/localization
+/mobile
+/pdf_exporter
+/renovation
+/scss/bundles
+/scss/widgets/base/icons
+/scss/widgets/material/typography/fonts
+/time_zone_utils
+/ui
+/utils
+/viz
+/*.d.ts

packages/devextreme/.npmignore

@@ -1,4 +1,14 @@
-dist/js
-dist/ts
-!dist/css
-project.json
+/build
+/dist/js
+/dist/ts
+!/dist/css
+/fonts
+/icons
+/images
+/js
+/playground
+/testing
+/ts
+
+/*.*
+!/*.d.ts

packages/devextreme/build/gulp/npm.js

@@ -11,7 +11,7 @@ const replace = require('gulp-replace');
 const compressionPipes = require('./compression-pipes.js');
 const ctx = require('./context.js');
 const headerPipes = require('./header-pipes.js');
-const { packageDir, packageDistDir, isEsmPackage, stringSrc } = require('./utils');
+const { packageDir, packageDistDir, isEsmPackage } = require('./utils');
 const { version } = require('../../package.json');
 
 const resultPath = ctx.RESULT_NPM_PATH;
@@ -109,21 +109,25 @@ const sources = (src, dist, distGlob) => (() => merge(
     gulp
         .src('README.md')
         .pipe(gulp.dest(dist)),
-
-    stringSrc('.npmignore', 'dist/js\ndist/ts\n!dist/css\nproject.json')
-        .pipe(gulp.dest(`${dist}/`))
 ));
 
 const packagePath = `${resultPath}/${packageDir}`;
 
 gulp.task('npm-sources', gulp.series('ts-sources', sources(srcGlobs, packagePath, distGlobs)));
 
-gulp.task('npm-dist', () => gulp
-    .src([
-        `${packagePath}/dist/**/*`
-    ])
-    .pipe(gulp.dest(`${resultPath}/${packageDistDir}`))
-);
+const distPath = `${resultPath}/${packageDistDir}`;
+
+gulp.task('npm-dist', gulp.parallel(
+    () => gulp
+        .src([
+            `${packagePath}/dist/**/*`
+        ])
+        .pipe(gulp.dest(distPath)),
+    () => gulp
+        .src(`${distPath}/package.json`)
+        .pipe(replace(version, ctx.version.package))
+        .pipe(gulp.dest(distPath)),
+));
 
 const scssDir = `${resultPath}/${packageDir}/scss`;
 

packages/devextreme/package.json

@@ -25,7 +25,7 @@
     "type": "git",
     "url": "https://github.com/DevExpress/DevExtreme.git"
   },
-  "types": "./dist/bundles/dx.all.d.ts",
+  "types": "./bundles/dx.all.d.ts",
   "license": "SEE LICENSE IN README.md",
   "dependencies": {
     "@babel/runtime": "^7.12.1",

packages/devextreme/project.json

@@ -24,7 +24,37 @@
       ],
       "outputs": [
         "{workspaceRoot}/artifacts/internal-tools",
-        "{projectRoot}/dist"
+        "{projectRoot}/__internal",
+        "{projectRoot}/animation",
+        "{projectRoot}/artifacts",
+        "{projectRoot}/aspnet",
+        "{projectRoot}/bundles",
+        "{projectRoot}/cjs",
+        "{projectRoot}/color",
+        "{projectRoot}/common",
+        "{projectRoot}/core",
+        "{projectRoot}/data",
+        "{projectRoot}/data_helper",
+        "{projectRoot}/dist",
+        "{projectRoot}/esm",
+        "{projectRoot}/events",
+        "{projectRoot}/excel_exporter",
+        "{projectRoot}/exporter",
+        "{projectRoot}/file_management",
+        "{projectRoot}/format_helper",
+        "{projectRoot}/integration",
+        "{projectRoot}/localization",
+        "{projectRoot}/mobile",
+        "{projectRoot}/pdf_exporter",
+        "{projectRoot}/renovation",
+        "{projectRoot}/scss/bundles",
+        "{projectRoot}/scss/widgets/base/icons",
+        "{projectRoot}/scss/widgets/material/typography/fonts",
+        "{projectRoot}/time_zone_utils",
+        "{projectRoot}/ui",
+        "{projectRoot}/utils",
+        "{projectRoot}/viz",
+        "{projectRoot}/*.d.ts"
       ]
     }
   },

tsconfig.json

@@ -2,6 +2,12 @@
   "compilerOptions": {
     "baseUrl": "./packages",
     "paths": {
+      "devextreme": [
+        "devextreme"
+      ],
+      "devextreme/*": [
+        "devextreme/*"
+      ],
       "devextreme-angular": [
         "devextreme-angular/src"
       ],