From 951703620c4b89eaab436722372b51422be14442 Mon Sep 17 00:00:00 2001 From: Andrey Morozov Date: Thu, 19 Jan 2023 18:29:14 +0300 Subject: [PATCH] build: fix issues (#487) --- gulpfile.js | 23 +++++-------------- .../Popover/__tests__/Popover.test.tsx | 2 +- src/components/PromoSheet/PromoSheet.tsx | 5 ++-- src/components/Sheet/SheetContent.tsx | 2 +- .../utils => test-utils}/setupTimersMock.ts | 0 5 files changed, 11 insertions(+), 21 deletions(-) rename {src/tests/utils => test-utils}/setupTimersMock.ts (100%) diff --git a/gulpfile.js b/gulpfile.js index 7cd255fafc..761e048d24 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -21,10 +21,11 @@ function compileTs(modules = false) { }); return src([ - 'src/**/*.{js,jsx,ts,tsx}', - '!src/demo/**/*.{js,jsx,ts,tsx}', - '!src/stories/**/*.{js,jsx,ts,tsx}', - '!src/**/__stories__/**/*.{js,jsx,ts,tsx}', + 'src/**/*.{ts,tsx}', + '!src/demo/**/*', + '!src/stories/**/*', + '!src/**/__stories__/**/*', + '!src/**/__tests__/**/*', ]) .pipe( replace(/import '.+\.scss';/g, (match) => @@ -43,17 +44,6 @@ task('compile-to-cjs', () => { return compileTs(); }); -task('copy-js-declarations', () => { - return src([ - 'src/**/*.d.ts', - '!src/demo/**/*.d.ts', - '!src/stories/**/*.d.ts', - '!src/**/__stories__/**/*.d.ts', - ]) - .pipe(dest(path.resolve(BUILD_DIR, 'esm'))) - .pipe(dest(path.resolve(BUILD_DIR, 'cjs'))); -}); - task('copy-i18n', () => { return src(['src/**/i18n/*.json']) .pipe(dest(path.resolve(BUILD_DIR, 'esm'))) @@ -65,7 +55,7 @@ task('styles-global', () => { }); task('styles-components', () => { - return src(['src/components/**/*.scss', '!src/components/**/__stories__/**/*.scss']) + return src(['src/components/**/*.scss', '!src/components/**/__stories__/**/*']) .pipe(sass().on('error', sass.logError)) .pipe(dest(path.resolve(BUILD_DIR, 'esm', 'components'))) .pipe(dest(path.resolve(BUILD_DIR, 'cjs', 'components'))); @@ -76,7 +66,6 @@ task( series([ 'clean', parallel(['compile-to-esm', 'compile-to-cjs']), - 'copy-js-declarations', 'copy-i18n', parallel(['styles-global', 'styles-components']), ]), diff --git a/src/components/Popover/__tests__/Popover.test.tsx b/src/components/Popover/__tests__/Popover.test.tsx index be6ea3b0f1..895c880131 100644 --- a/src/components/Popover/__tests__/Popover.test.tsx +++ b/src/components/Popover/__tests__/Popover.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {fireEvent, render, screen} from '@testing-library/react'; -import {setupTimersMock} from '../../../tests/utils/setupTimersMock'; +import {setupTimersMock} from '../../../../test-utils/setupTimersMock'; import {delayByBehavior, PopoverBehavior} from '../config'; import {Popover} from '../Popover'; import type {PopoverProps} from '../types'; diff --git a/src/components/PromoSheet/PromoSheet.tsx b/src/components/PromoSheet/PromoSheet.tsx index d0d4dd7349..b88959a83a 100644 --- a/src/components/PromoSheet/PromoSheet.tsx +++ b/src/components/PromoSheet/PromoSheet.tsx @@ -2,8 +2,9 @@ import type {FC} from 'react'; import React, {useState, useCallback, useEffect, useMemo} from 'react'; import {block} from '../utils/cn'; import {CrossIcon} from '../icons/CrossIcon'; -import type {ButtonProps, SheetProps} from '../'; -import {Button, Icon, Sheet} from '../'; +import {Button, ButtonProps} from '../Button'; +import {Sheet, SheetProps} from '../Sheet'; +import {Icon} from '../Icon'; import './PromoSheet.scss'; diff --git a/src/components/Sheet/SheetContent.tsx b/src/components/Sheet/SheetContent.tsx index 35090cbe91..649ab765b5 100644 --- a/src/components/Sheet/SheetContent.tsx +++ b/src/components/Sheet/SheetContent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {MobileContextProps, Platform, withMobile, History, Location} from '../'; +import {MobileContextProps, Platform, withMobile, History, Location} from '../mobile'; import {VelocityTracker} from './utils'; import {sheetBlock} from './constants'; diff --git a/src/tests/utils/setupTimersMock.ts b/test-utils/setupTimersMock.ts similarity index 100% rename from src/tests/utils/setupTimersMock.ts rename to test-utils/setupTimersMock.ts