TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

Switched Portal components to use explicit path imports

Browse Source 
- `compilerOptions.baseUrl` is nice but it means we end up with two
  different styles of import paths for project files - relative and from
  `src/`
- to fix this, we're going to standardize on relative imports and remove
  the ability to import relative to the top-level project folder
- this removes the jsconfig line and fixes all existing imports
This commit is contained in:
Daniel Lockyer 2023-03-16 12:06:47 +01:00
parent d04b43aeee
commit e280925a8b
No known key found for this signature in database
16 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghost/portal/jsconfig.json
View File

@ -1,6 +1,3 @@
{ {
"compilerOptions": {
"baseUrl": "src"
},
"include": ["src"] "include": ["src"]
} }

4
ghost/portal/src/components/pages/AccountHomePage/AccountHomePage.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import AppContext from 'AppContext'; import AppContext from '../../../AppContext';
import {getSupportAddress} from 'utils/helpers'; import {getSupportAddress} from '../../../utils/helpers';
import AccountFooter from './components/AccountFooter'; import AccountFooter from './components/AccountFooter';
import AccountMain from './components/AccountMain'; import AccountMain from './components/AccountMain';

4
ghost/portal/src/components/pages/AccountHomePage/AccountHomePage.test.js
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import {render, fireEvent} from 'utils/test-utils'; import {render, fireEvent} from '../../../utils/test-utils';
import AccountHomePage from './AccountHomePage'; import AccountHomePage from './AccountHomePage';
import {site} from 'utils/fixtures'; import {site} from '../../../utils/fixtures';
const setup = (overrides) => { const setup = (overrides) => {
const {mockOnActionFn, ...utils} = render( const {mockOnActionFn, ...utils} = render(

4
ghost/portal/src/components/pages/AccountHomePage/components/AccountActions.js
View File

@ -1,6 +1,6 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import {useContext} from 'react'; import {useContext} from 'react';
import {hasCommentsEnabled, hasMultipleNewsletters, isEmailSuppressed} from 'utils/helpers'; import {hasCommentsEnabled, hasMultipleNewsletters, isEmailSuppressed} from '../../../../utils/helpers';
import PaidAccountActions from './PaidAccountActions'; import PaidAccountActions from './PaidAccountActions';
import EmailNewsletterAction from './EmailNewsletterAction'; import EmailNewsletterAction from './EmailNewsletterAction';

2
ghost/portal/src/components/pages/AccountHomePage/components/AccountMain.js
View File

@ -1,4 +1,4 @@
import CloseButton from 'components/common/CloseButton'; import CloseButton from '../../../../components/common/CloseButton';
import UserHeader from './UserHeader'; import UserHeader from './UserHeader';
import AccountWelcome from './AccountWelcome'; import AccountWelcome from './AccountWelcome';

6
ghost/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
View File

@ -1,6 +1,6 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import {getCompExpiry, getMemberSubscription, hasOnlyFreePlan, isComplimentaryMember, subscriptionHasFreeTrial} from 'utils/helpers'; import {getCompExpiry, getMemberSubscription, hasOnlyFreePlan, isComplimentaryMember, subscriptionHasFreeTrial} from '../../../../utils/helpers';
import {getDateString} from 'utils/date-time'; import {getDateString} from '../../../../utils/date-time';
import {useContext} from 'react'; import {useContext} from 'react';
import SubscribeButton from './SubscribeButton'; import SubscribeButton from './SubscribeButton';

8
ghost/portal/src/components/pages/AccountHomePage/components/ContinueSubscriptionButton.js
View File

@ -1,7 +1,7 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import ActionButton from 'components/common/ActionButton'; import ActionButton from '../../../common/ActionButton';
import {getMemberSubscription} from 'utils/helpers'; import {getMemberSubscription} from '../../../../utils/helpers';
import {getDateString} from 'utils/date-time'; import {getDateString} from '../../../../utils/date-time';
import {useContext} from 'react'; import {useContext} from 'react';
const ContinueSubscriptionButton = () => { const ContinueSubscriptionButton = () => {

6
ghost/portal/src/components/pages/AccountHomePage/components/EmailNewsletterAction.js
View File

@ -1,6 +1,6 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import Switch from 'components/common/Switch'; import Switch from '../../../common/Switch';
import {getSiteNewsletters, hasMemberGotEmailSuppression} from 'utils/helpers'; import {getSiteNewsletters, hasMemberGotEmailSuppression} from '../../../../utils/helpers';
import {useContext} from 'react'; import {useContext} from 'react';
function EmailNewsletterAction() { function EmailNewsletterAction() {

6
ghost/portal/src/components/pages/AccountHomePage/components/EmailPreferencesAction.js
View File

@ -1,7 +1,7 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import {useContext} from 'react'; import {useContext} from 'react';
import {isEmailSuppressed} from 'utils/helpers'; import {isEmailSuppressed} from '../../../../utils/helpers';
import {ReactComponent as EmailDeliveryFailedIcon} from 'images/icons/email-delivery-failed.svg'; import {ReactComponent as EmailDeliveryFailedIcon} from '../../../../images/icons/email-delivery-failed.svg';
function EmailPreferencesAction() { function EmailPreferencesAction() {
const {onAction, member, t} = useContext(AppContext); const {onAction, member, t} = useContext(AppContext);

10
ghost/portal/src/components/pages/AccountHomePage/components/PaidAccountActions.js
View File

@ -1,8 +1,8 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import {allowCompMemberUpgrade, getCompExpiry, getMemberSubscription, getMemberTierName, getUpdatedOfferPrice, hasMultipleProductsFeature, hasOnlyFreePlan, isComplimentaryMember, isInThePast, subscriptionHasFreeTrial} from 'utils/helpers'; import {allowCompMemberUpgrade, getCompExpiry, getMemberSubscription, getMemberTierName, getUpdatedOfferPrice, hasMultipleProductsFeature, hasOnlyFreePlan, isComplimentaryMember, isInThePast, subscriptionHasFreeTrial} from '../../../../utils/helpers';
import {getDateString} from 'utils/date-time'; import {getDateString} from '../../../../utils/date-time';
import {ReactComponent as LoaderIcon} from 'images/icons/loader.svg'; import {ReactComponent as LoaderIcon} from '../../../../images/icons/loader.svg';
import {ReactComponent as OfferTagIcon} from 'images/icons/offer-tag.svg'; import {ReactComponent as OfferTagIcon} from '../../../../images/icons/offer-tag.svg';
import {useContext} from 'react'; import {useContext} from 'react';
const PaidAccountActions = () => { const PaidAccountActions = () => {

6
ghost/portal/src/components/pages/AccountHomePage/components/SubscribeButton.js
View File

@ -1,6 +1,6 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import ActionButton from 'components/common/ActionButton'; import ActionButton from '../../../common/ActionButton';
import {hasOnlyFreePlan} from 'utils/helpers'; import {hasOnlyFreePlan} from '../../../../utils/helpers';
import {useContext} from 'react'; import {useContext} from 'react';
const SubscribeButton = () => { const SubscribeButton = () => {

4
ghost/portal/src/components/pages/AccountHomePage/components/UserHeader.js
View File

@ -1,5 +1,5 @@
import AppContext from 'AppContext'; import AppContext from '../../../../AppContext';
import MemberAvatar from 'components/common/MemberGravatar'; import MemberAvatar from '../../../common/MemberGravatar';
import React, {useContext} from 'react'; import React, {useContext} from 'react';
const UserHeader = () => { const UserHeader = () => {

8
ghost/portal/src/components/pages/EmailReceivingFAQ.js
View File

@ -1,8 +1,8 @@
import AppContext from 'AppContext'; import AppContext from '../../AppContext';
import {useContext} from 'react'; import {useContext} from 'react';
import BackButton from 'components/common/BackButton'; import BackButton from '../../components/common/BackButton';
import CloseButton from 'components/common/CloseButton'; import CloseButton from '../../components/common/CloseButton';
import {getDefaultNewsletterSender, getSupportAddress} from 'utils/helpers'; import {getDefaultNewsletterSender, getSupportAddress} from '../../utils/helpers';
export default function EmailReceivingPage() { export default function EmailReceivingPage() {
const {brandColor, onAction, site, lastPage, member} = useContext(AppContext); const {brandColor, onAction, site, lastPage, member} = useContext(AppContext);

12
ghost/portal/src/components/pages/EmailSuppressedPage.js
View File

@ -1,10 +1,10 @@
import AppContext from 'AppContext'; import AppContext from '../../AppContext';
import {useContext, useEffect} from 'react'; import {useContext, useEffect} from 'react';
import {hasCommentsEnabled, hasMultipleNewsletters} from 'utils/helpers'; import {hasCommentsEnabled, hasMultipleNewsletters} from '../../utils/helpers';
import CloseButton from 'components/common/CloseButton'; import CloseButton from '../../components/common/CloseButton';
import BackButton from 'components/common/BackButton'; import BackButton from '../../components/common/BackButton';
import ActionButton from 'components/common/ActionButton'; import ActionButton from '../../components/common/ActionButton';
import {ReactComponent as EmailDeliveryFailedIcon} from 'images/icons/email-delivery-failed.svg'; import {ReactComponent as EmailDeliveryFailedIcon} from '../../images/icons/email-delivery-failed.svg';
export default function EmailSuppressedPage() { export default function EmailSuppressedPage() {
const {brandColor, lastPage, onAction, action, site, t} = useContext(AppContext); const {brandColor, lastPage, onAction, action, site, t} = useContext(AppContext);

2
ghost/portal/src/components/pages/EmailSuppressedPage.test.js
View File

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import {render, fireEvent} from 'utils/test-utils'; import {render, fireEvent} from '../../utils/test-utils';
import EmailSuppressedPage from './EmailSuppressedPage'; import EmailSuppressedPage from './EmailSuppressedPage';
const setup = (overrides) => { const setup = (overrides) => {

8
ghost/portal/src/components/pages/EmailSuppressionFAQ.js
View File

@ -1,8 +1,8 @@
import AppContext from 'AppContext'; import AppContext from '../../AppContext';
import {useContext} from 'react'; import {useContext} from 'react';
import BackButton from 'components/common/BackButton'; import BackButton from '../../components/common/BackButton';
import CloseButton from 'components/common/CloseButton'; import CloseButton from '../../components/common/CloseButton';
import {getSupportAddress} from 'utils/helpers'; import {getSupportAddress} from '../../utils/helpers';
export default function EmailSuppressedPage() { export default function EmailSuppressedPage() {
const {brandColor, onAction, site} = useContext(AppContext); const {brandColor, onAction, site} = useContext(AppContext);