From 1d01a21480ad159ce8762fdf8906b3f141261b52 Mon Sep 17 00:00:00 2001 From: Vyrtsev Mikhail Date: Sat, 27 Jul 2019 02:39:12 +0300 Subject: [PATCH] replace require with import --- .../__anonymous-login-form/index.ts | 4 +- .../auth-panel/__email-login-form/index.ts | 4 +- .../components/auth-panel/__user-id/index.ts | 4 +- frontend/app/components/auth-panel/index.ts | 42 ++++---- frontend/app/components/avatar-icon/index.ts | 6 +- frontend/app/components/button/index.ts | 14 +-- .../components/comment/connected-comment.ts | 2 + frontend/app/components/comment/styles.ts | 100 +++++++++--------- frontend/app/components/dropdown/index.ts | 22 ++-- frontend/app/components/input/styles.ts | 48 ++++----- .../app/components/list-comments/index.ts | 8 +- frontend/app/components/raw-content/index.ts | 6 +- frontend/app/components/root/index.ts | 28 ++--- frontend/app/components/settings/index.ts | 24 ++--- frontend/app/components/thread/index.ts | 6 +- frontend/app/components/user-info/index.ts | 14 +-- 16 files changed, 167 insertions(+), 165 deletions(-) diff --git a/frontend/app/components/auth-panel/__anonymous-login-form/index.ts b/frontend/app/components/auth-panel/__anonymous-login-form/index.ts index c3cc53f0..134b7c86 100644 --- a/frontend/app/components/auth-panel/__anonymous-login-form/index.ts +++ b/frontend/app/components/auth-panel/__anonymous-login-form/index.ts @@ -1,3 +1,3 @@ -export { AnonymousLoginForm } from './auth-panel__anonymous-login-form'; +import './auth-panel__anonymous-login-form.scss'; -require('./auth-panel__anonymous-login-form.scss'); +export { AnonymousLoginForm } from './auth-panel__anonymous-login-form'; diff --git a/frontend/app/components/auth-panel/__email-login-form/index.ts b/frontend/app/components/auth-panel/__email-login-form/index.ts index cc47afcf..eade0573 100644 --- a/frontend/app/components/auth-panel/__email-login-form/index.ts +++ b/frontend/app/components/auth-panel/__email-login-form/index.ts @@ -1,3 +1,3 @@ -export { EmailLoginForm, EmailLoginFormConnected } from './auth-panel__email-login-form'; +import './auth-panel__email-login-form.scss'; -require('./auth-panel__email-login-form.scss'); +export { EmailLoginForm, EmailLoginFormConnected } from './auth-panel__email-login-form'; diff --git a/frontend/app/components/auth-panel/__user-id/index.ts b/frontend/app/components/auth-panel/__user-id/index.ts index e11d552b..0a741abd 100644 --- a/frontend/app/components/auth-panel/__user-id/index.ts +++ b/frontend/app/components/auth-panel/__user-id/index.ts @@ -1,3 +1,3 @@ -export { UserID } from './auth-panel__user-id'; +import './auth-panel__user-id.scss'; -require('./auth-panel__user-id.scss'); +export { UserID } from './auth-panel__user-id'; diff --git a/frontend/app/components/auth-panel/index.ts b/frontend/app/components/auth-panel/index.ts index fab98270..7e03ca7f 100644 --- a/frontend/app/components/auth-panel/index.ts +++ b/frontend/app/components/auth-panel/index.ts @@ -1,22 +1,22 @@ +import './auth-panel.scss'; + +import './__readonly-label/auth-panel__readonly-label.scss'; + +import './__column/auth-panel__column.scss'; +import './__pseudo-link/auth-panel__pseudo-link.scss'; +import './__select/auth-panel__select.scss'; +import './__select-label/auth-panel__select-label.scss'; +import './__select-label-value/auth-panel__select-label-value.scss'; +import './__sort/auth-panel__sort.scss'; + +import './__user-id/auth-panel__user-id.scss'; +import './__sign-out/auth-panel__sign-out.scss'; + +import './_theme/_dark/auth-panel_theme_dark.scss'; +import './_theme/_light/auth-panel_theme_light.scss'; + +import './_logged-in/auth-panel_logged-in.scss'; + +import './__dropdown-provider/auth-panel__dropdown-provider.scss'; + export { AuthPanel } from './auth-panel'; - -require('./auth-panel.scss'); - -require('./__readonly-label/auth-panel__readonly-label.scss'); - -require('./__column/auth-panel__column.scss'); -require('./__pseudo-link/auth-panel__pseudo-link.scss'); -require('./__select/auth-panel__select.scss'); -require('./__select-label/auth-panel__select-label.scss'); -require('./__select-label-value/auth-panel__select-label-value.scss'); -require('./__sort/auth-panel__sort.scss'); - -require('./__user-id/auth-panel__user-id.scss'); -require('./__sign-out/auth-panel__sign-out.scss'); - -require('./_theme/_dark/auth-panel_theme_dark.scss'); -require('./_theme/_light/auth-panel_theme_light.scss'); - -require('./_logged-in/auth-panel_logged-in.scss'); - -require('./__dropdown-provider/auth-panel__dropdown-provider.scss'); diff --git a/frontend/app/components/avatar-icon/index.ts b/frontend/app/components/avatar-icon/index.ts index bf1046e9..dc67c600 100644 --- a/frontend/app/components/avatar-icon/index.ts +++ b/frontend/app/components/avatar-icon/index.ts @@ -1,4 +1,4 @@ -export { AvatarIcon } from './avatar-icon'; +import './avatar-icon.scss'; +import './_default/avatar-icon_default.scss'; -require('./avatar-icon.scss'); -require('./_default/avatar-icon_default.scss'); +export { AvatarIcon } from './avatar-icon'; diff --git a/frontend/app/components/button/index.ts b/frontend/app/components/button/index.ts index 056a4772..bbd5ea59 100644 --- a/frontend/app/components/button/index.ts +++ b/frontend/app/components/button/index.ts @@ -1,8 +1,8 @@ +import './button.scss'; + +import './_kind/_link/button_kind_link.scss'; +import './_kind/_text/button_kind_text.scss'; + +import './_focused/button_focused.scss'; + export { Button } from './button'; - -require('./button.scss'); - -require('./_kind/_link/button_kind_link.scss'); -require('./_kind/_text/button_kind_text.scss'); - -require('./_focused/button_focused.scss'); diff --git a/frontend/app/components/comment/connected-comment.ts b/frontend/app/components/comment/connected-comment.ts index 0fc6cae3..994288b3 100644 --- a/frontend/app/components/comment/connected-comment.ts +++ b/frontend/app/components/comment/connected-comment.ts @@ -3,6 +3,8 @@ * and should be importded explicitly */ +import './styles'; + import { Comment as CommentType } from '@app/common/types'; import { connect } from 'preact-redux'; diff --git a/frontend/app/components/comment/styles.ts b/frontend/app/components/comment/styles.ts index 4acbc281..2a9c9791 100644 --- a/frontend/app/components/comment/styles.ts +++ b/frontend/app/components/comment/styles.ts @@ -1,51 +1,51 @@ +import './comment.scss'; + +import './__action/comment__action.scss'; +import './__action/_type/_collapse/comment__action_type_collapse.scss'; +import './__action/_type/_edit/comment__action_type_edit.scss'; +import './__action/_type/_delete/comment__action_type_delete.scss'; + +import './__edit-timer/comment__edit-timer.scss'; + +import './__body/comment__body.scss'; + +import './__control/comment__control.scss'; +import './__control/_select/comment__control_select.scss'; +import './__control/_select-label/comment__control_select-label.scss'; +import './__control/_view/_inactive/comment__control_view_inactive.scss'; + +import './__controls/comment__controls.scss'; +import './__info/comment__info.scss'; +import './__input/comment__input.scss'; +import './__link-to-parent/comment__link-to-parent.scss'; +import './__score/comment__score.scss'; +import './__score-value/comment__score-value.scss'; +import './__status/comment__status.scss'; +import './__text/comment__text.scss'; +import './__time/comment__time.scss'; +import './__user-id/comment__user-id.scss'; +import './__username/comment__username.scss'; + +import './__verification/comment__verification.scss'; +import './__verification/_active/comment__verification_active.scss'; +import './__verification/_clickable/comment__verification_clickable.scss'; + +import './__vote/comment__vote.scss'; +import './__vote/_disabled/comment__vote_disabled.scss'; +import './__vote/_selected/comment__vote_selected.scss'; +import './__vote/_type/_down/comment__vote_type_down.scss'; +import './__vote/_type/_up/comment__vote_type_up.scss'; + +import './_collapsed/comment_collapsed.scss'; +import './_editing/comment_editing.scss'; +import './_replying/comment_replying.scss'; +import './_useless/comment_useless.scss'; + +import './_view/_admin/comment_view_admin.scss'; +import './_view/_preview/comment_view_preview.scss'; +import './_view/_user/comment_view_user.scss'; + +import './_theme/_dark/comment_theme_dark.scss'; +import './_theme/_light/comment_theme_light.scss'; + import '@app/components/raw-content'; - -require('./comment.scss'); - -require('./__action/comment__action.scss'); -require('./__action/_type/_collapse/comment__action_type_collapse.scss'); -require('./__action/_type/_edit/comment__action_type_edit.scss'); -require('./__action/_type/_delete/comment__action_type_delete.scss'); - -require('./__edit-timer/comment__edit-timer.scss'); - -require('./__body/comment__body.scss'); - -require('./__control/comment__control.scss'); -require('./__control/_select/comment__control_select.scss'); -require('./__control/_select-label/comment__control_select-label.scss'); -require('./__control/_view/_inactive/comment__control_view_inactive.scss'); - -require('./__controls/comment__controls.scss'); -require('./__info/comment__info.scss'); -require('./__input/comment__input.scss'); -require('./__link-to-parent/comment__link-to-parent.scss'); -require('./__score/comment__score.scss'); -require('./__score-value/comment__score-value.scss'); -require('./__status/comment__status.scss'); -require('./__text/comment__text.scss'); -require('./__time/comment__time.scss'); -require('./__user-id/comment__user-id.scss'); -require('./__username/comment__username.scss'); - -require('./__verification/comment__verification.scss'); -require('./__verification/_active/comment__verification_active.scss'); -require('./__verification/_clickable/comment__verification_clickable.scss'); - -require('./__vote/comment__vote.scss'); -require('./__vote/_disabled/comment__vote_disabled.scss'); -require('./__vote/_selected/comment__vote_selected.scss'); -require('./__vote/_type/_down/comment__vote_type_down.scss'); -require('./__vote/_type/_up/comment__vote_type_up.scss'); - -require('./_collapsed/comment_collapsed.scss'); -require('./_editing/comment_editing.scss'); -require('./_replying/comment_replying.scss'); -require('./_useless/comment_useless.scss'); - -require('./_view/_admin/comment_view_admin.scss'); -require('./_view/_preview/comment_view_preview.scss'); -require('./_view/_user/comment_view_user.scss'); - -require('./_theme/_dark/comment_theme_dark.scss'); -require('./_theme/_light/comment_theme_light.scss'); diff --git a/frontend/app/components/dropdown/index.ts b/frontend/app/components/dropdown/index.ts index ff172454..c079805c 100644 --- a/frontend/app/components/dropdown/index.ts +++ b/frontend/app/components/dropdown/index.ts @@ -1,16 +1,16 @@ +import './dropdown.scss'; +import './_active/dropdown_active.scss'; + +import './__item/dropdown__item.scss'; +import './__items/dropdown__items.scss'; +import './__title/dropdown__title.scss'; +import './__content/dropdown__content.scss'; + +import './_theme/_dark/dropdown_theme_dark.scss'; +import './_theme/_light/dropdown_theme_light.scss'; + import Dropdown from './dropdown'; export default Dropdown; export { default as DropdownItem } from './__item'; - -require('./dropdown.scss'); -require('./_active/dropdown_active.scss'); - -require('./__item/dropdown__item.scss'); -require('./__items/dropdown__items.scss'); -require('./__title/dropdown__title.scss'); -require('./__content/dropdown__content.scss'); - -require('./_theme/_dark/dropdown_theme_dark.scss'); -require('./_theme/_light/dropdown_theme_light.scss'); diff --git a/frontend/app/components/input/styles.ts b/frontend/app/components/input/styles.ts index 450bcf82..c75b61dc 100644 --- a/frontend/app/components/input/styles.ts +++ b/frontend/app/components/input/styles.ts @@ -1,25 +1,25 @@ +import './input.scss'; + +import './__actions/input__actions.scss'; + +import './__button/input__button.scss'; +import './__button/_type/_preview/input__button_type_preview.scss'; +import './__button/_type/_send/input__button_type_send.scss'; + +import './__control-panel/input__control-panel.scss'; +import './__counter/input__counter.scss'; +import './__error/input__error.scss'; +import './__field/input__field.scss'; +import './__field-wrapper/input__field-wrapper.scss'; +import './__preview/input__preview.scss'; +import './__preview-wrapper/input__preview-wrapper.scss'; +import './__rss/input__rss.scss'; +import './__rss-link/input__rss-link.scss'; +import './__markdown/input__markdown.scss'; +import './__markdown-link/input__markdown-link.scss'; +import './__markdown-toolbar/input__markdown-toolbar.scss'; + +import './_theme/_dark/input_theme_dark.scss'; +import './_theme/_light/input_theme_light.scss'; + import '@app/components/raw-content'; - -require('./input.scss'); - -require('./__actions/input__actions.scss'); - -require('./__button/input__button.scss'); -require('./__button/_type/_preview/input__button_type_preview.scss'); -require('./__button/_type/_send/input__button_type_send.scss'); - -require('./__control-panel/input__control-panel.scss'); -require('./__counter/input__counter.scss'); -require('./__error/input__error.scss'); -require('./__field/input__field.scss'); -require('./__field-wrapper/input__field-wrapper.scss'); -require('./__preview/input__preview.scss'); -require('./__preview-wrapper/input__preview-wrapper.scss'); -require('./__rss/input__rss.scss'); -require('./__rss-link/input__rss-link.scss'); -require('./__markdown/input__markdown.scss'); -require('./__markdown-link/input__markdown-link.scss'); -require('./__markdown-toolbar/input__markdown-toolbar.scss'); - -require('./_theme/_dark/input_theme_dark.scss'); -require('./_theme/_light/input_theme_light.scss'); diff --git a/frontend/app/components/list-comments/index.ts b/frontend/app/components/list-comments/index.ts index 7815fcc0..6a0df3e1 100644 --- a/frontend/app/components/list-comments/index.ts +++ b/frontend/app/components/list-comments/index.ts @@ -1,5 +1,5 @@ +import './list-comments.scss'; + +import './__item/list-comments__item.scss'; + export { ListComments } from './list-comments'; - -require('./list-comments.scss'); - -require('./__item/list-comments__item.scss'); diff --git a/frontend/app/components/raw-content/index.ts b/frontend/app/components/raw-content/index.ts index b66e8692..c5a58809 100644 --- a/frontend/app/components/raw-content/index.ts +++ b/frontend/app/components/raw-content/index.ts @@ -1,4 +1,4 @@ -require('./raw-content.scss'); +import './raw-content.scss'; -require('./_theme/_dark/raw-content_theme_dark.scss'); -require('./_theme/_light/raw-content_theme_light.scss'); +import './_theme/_dark/raw-content_theme_dark.scss'; +import './_theme/_light/raw-content_theme_light.scss'; diff --git a/frontend/app/components/root/index.ts b/frontend/app/components/root/index.ts index 2db6192e..17b01efa 100644 --- a/frontend/app/components/root/index.ts +++ b/frontend/app/components/root/index.ts @@ -1,15 +1,15 @@ +import './root.scss'; + +import './__copyright/root__copyright.scss'; +import './__input/root__input.scss'; +import './__preloader/root__preloader.scss'; +import './__pinned-comment/root__pinned-comment.scss'; +import './__pinned-comments/root__pinned-comments.scss'; +import './__show-more/root__show-more.scss'; +import './__thread/root__thread.scss'; +import './__threads/root__threads.scss'; + +import './_theme/_dark/root_theme_dark.scss'; +import './_theme/_light/root_theme_light.scss'; + export { Root, ConnectedRoot } from './root'; - -require('./root.scss'); - -require('./__copyright/root__copyright.scss'); -require('./__input/root__input.scss'); -require('./__preloader/root__preloader.scss'); -require('./__pinned-comment/root__pinned-comment.scss'); -require('./__pinned-comments/root__pinned-comments.scss'); -require('./__show-more/root__show-more.scss'); -require('./__thread/root__thread.scss'); -require('./__threads/root__threads.scss'); - -require('./_theme/_dark/root_theme_dark.scss'); -require('./_theme/_light/root_theme_light.scss'); diff --git a/frontend/app/components/settings/index.ts b/frontend/app/components/settings/index.ts index 085058aa..ba3d40d6 100644 --- a/frontend/app/components/settings/index.ts +++ b/frontend/app/components/settings/index.ts @@ -1,16 +1,16 @@ +import './settings.scss'; + +import './__action/settings__action.scss'; +import './__section/settings__section.scss'; +import './__list/settings__list.scss'; +import './__invisible/settings__invisible.scss'; +import './__dimmed/settings__dimmed.scss'; +import './__username/settings__username.scss'; +import './__user-id/settings__user-id.scss'; +import './_theme/_dark/settings_theme_dark.scss'; +import './_theme/_light/settings_theme_light.scss'; + import withTheme from '../../components/with-theme'; import Settings from './settings'; export default withTheme(Settings); - -require('./settings.scss'); - -require('./__action/settings__action.scss'); -require('./__section/settings__section.scss'); -require('./__list/settings__list.scss'); -require('./__invisible/settings__invisible.scss'); -require('./__dimmed/settings__dimmed.scss'); -require('./__username/settings__username.scss'); -require('./__user-id/settings__user-id.scss'); -require('./_theme/_dark/settings_theme_dark.scss'); -require('./_theme/_light/settings_theme_light.scss'); diff --git a/frontend/app/components/thread/index.ts b/frontend/app/components/thread/index.ts index e4069c8f..6fd13765 100644 --- a/frontend/app/components/thread/index.ts +++ b/frontend/app/components/thread/index.ts @@ -1,4 +1,4 @@ -export { ConnectedThread as Thread } from './thread'; +import './thread.scss'; +import './_theme_dark/thread_theme_dark.scss'; -require('./thread.scss'); -require('./_theme_dark/thread_theme_dark.scss'); +export { ConnectedThread as Thread } from './thread'; diff --git a/frontend/app/components/user-info/index.ts b/frontend/app/components/user-info/index.ts index 067cda79..2fe6e07f 100644 --- a/frontend/app/components/user-info/index.ts +++ b/frontend/app/components/user-info/index.ts @@ -1,8 +1,8 @@ +import './user-info.scss'; + +import './__avatar/user-info__avatar.scss'; +import './__id/user-info__id.scss'; +import './__preloader/user-info__preloader.scss'; +import './__title/user-info__title.scss'; + export { ConnectedUserInfo as UserInfo } from './user-info'; - -require('./user-info.scss'); - -require('./__avatar/user-info__avatar.scss'); -require('./__id/user-info__id.scss'); -require('./__preloader/user-info__preloader.scss'); -require('./__title/user-info__title.scss');