Scheduler: Fix build

DevExpress · Sep 8, 2023 · a9a5dbf · a9a5dbf
1 parent a15d443
commit a9a5dbf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/packages/devextreme/build/gulp/generator/gulpfile.js b/packages/devextreme/build/gulp/generator/gulpfile.js
@@ -47,6 +47,10 @@ const knownErrors = [
     // #endregion
 ];
 
+const GENERATE_COMPONENTS_OPTIONS = {
+    excludePathPatterns: ['__internal'],
+};
+
 function deleteJQueryComponents(cb) {
     del.sync(jQueryComponentsGlob);
     cb();
@@ -66,7 +70,7 @@ function generateJQueryComponents(isWatch) {
         )) : gulp.src(SRC);
 
     return pipe
-        .pipe(generateComponents(generator))
+        .pipe(generateComponents(generator, GENERATE_COMPONENTS_OPTIONS))
         .pipe(plumber(()=>null))
         .pipe(gulp.dest('js/renovation/'));
 }
@@ -93,7 +97,7 @@ function generateInfernoComponents(distPath = './', babelConfig = transpileConfi
 
         return gulp.src(SRC, { base: 'js' })
             .pipe(gulpIf(dev, cached('generate-inferno-component')))
-            .pipe(generateComponents(generator))
+            .pipe(generateComponents(generator, GENERATE_COMPONENTS_OPTIONS))
             .pipe(plumber(() => null))
             .pipe(tsProject({
                 error: processErrors(knownErrors, errors),

diff --git a/packages/devextreme/build/gulp/transpile.js b/packages/devextreme/build/gulp/transpile.js
@@ -45,6 +45,9 @@ const esmTranspileSrc = src.concat([
 ]);
 
 const srcTsPattern = 'js/__internal/**/*.ts';
+const srcTsIgnorePatterns = [
+    '**/__tests__/**/*'
+];
 
 const srcDir = path.join(process.cwd(), './js');
 const generatedTs = [
@@ -84,7 +87,7 @@ const createModuleConfig = (name, dir, filePath, dist) => {
     const relative = path.join('./', dir.replace(srcDir, ''), name);
     const currentPath = isIndex ? path.join(relative, '../') : relative;
     const esmFile = path.relative(currentPath, path.join('./esm', relative));
-    const esmFilePath = path.join(dist, './esm',dir.replace(srcDir, ''), name);
+    const esmFilePath = path.join(dist, './esm', dir.replace(srcDir, ''), name);
     const cjsFile = path.relative(currentPath, path.join('./cjs', relative));
     const hasRealDTS = fs.existsSync(filePath.replace(/\.js$/, '.d.ts'));
     const hasGeneratedDTS = generatedTs.indexOf(relative.replace(/\.js$/, '.d.ts')) !== -1;
@@ -110,7 +113,7 @@ const createModuleConfig = (name, dir, filePath, dist) => {
 
 const transpileTs = (compiler, src) => {
     const task = () => compiler
-        .compileTs(src)
+        .compileTs(src, srcTsIgnorePatterns)
         .pipe(gulp.dest(TS_OUTPUT_BASE_DIR));
 
     task.displayName = 'transpile TS';

diff --git a/packages/devextreme/build/gulp/typescript/compiler.js b/packages/devextreme/build/gulp/typescript/compiler.js
@@ -95,8 +95,8 @@ const createTsCompiler = async(compilerConfig) => {
     );
 
     // --- public ---
-    const compileTs = (fileNamePattern) => {
-        const fileNames = glob.sync(fileNamePattern);
+    const compileTs = (fileNamePattern, ignorePatterns) => {
+        const fileNames = glob.sync(fileNamePattern, { ignore: ignorePatterns });
         const configFilePath = getTsConfigPath(absolutePaths.tsConfigDir);
         const { config } = tsCompiler.readConfigFile(configFilePath, tsCompiler.sys.readFile);
         const { options } = tsCompiler.parseJsonConfigFileContent(config, tsCompiler.sys, absolutePaths.tsBaseDir);

diff --git a/packages/devextreme/js/__internal/tsconfig.json b/packages/devextreme/js/__internal/tsconfig.json
@@ -4,6 +4,7 @@
     "module": "es6",
     "target": "es6",
     "baseUrl": "../",
+    "skipLibCheck": true,
     "allowJs": true,
     "noEmitOnError": true,
     "resolveJsonModule": false,