Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[No QA] Standardize type-only imports #32475

Merged

Conversation

chrispader
Copy link
Contributor

@chrispader chrispader commented Dec 5, 2023

@roryabraham @hayata-suenaga @blazejkustra @fabioh8010

Details

Enable TS ESLint rules to ESLint rule to be standardize type-only imports in the codebase.

Enabled rules:

'@typescript-eslint/consistent-type-imports': [
    'error',
    {
        prefer: 'type-imports',
        fixStyle: 'separate-type-imports',
    },
],
'@typescript-eslint/no-import-type-side-effects': 'error',
'@typescript-eslint/consistent-type-exports': [
    'error',
    {
        fixMixedExportsWithInlineTypeSpecifier: false,
    },
],
'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],

Fixed Issues

$ #32368
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

This change only affects TypeScript, not JavaScript. Therefore, it has no effect on the app at runtime. The only tests that should be needed are to run npm run typecheck and npm run lint and verify that both pass.

Offline tests

Not needed.

QA Steps

  • Verify that no errors appear in the JS console

No QA.

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@chrispader
Copy link
Contributor Author

Lots of changes due to eslint --fix... The main change is just in .eslintrc.js

@chrispader chrispader marked this pull request as ready for review December 5, 2023 13:44
@chrispader chrispader requested a review from a team as a code owner December 5, 2023 13:44
@melvin-bot melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team December 5, 2023 13:44
Copy link

melvin-bot bot commented Dec 5, 2023

@Santhosh-Sellavel Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@chrispader
Copy link
Contributor Author

do we need screenshots & QA here? @roryabraham

@blazejkustra
Copy link
Contributor

blazejkustra commented Dec 5, 2023

Prettier is failing @chrispader

Copy link
Contributor

@blazejkustra blazejkustra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! One comment but not a blocker

src/ROUTES.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@fabioh8010 fabioh8010 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chrispader Could you add a section in our TS guidelines about these import rules?

@blazejkustra
Copy link
Contributor

@chrispader Could you add a section in our TS guidelines about these import rules?

I'm not sure it's needed as this is enforced with ESLint 🤔

@fabioh8010
Copy link
Contributor

Well we have a couple of rules that are enforced by ESLint but they are also detailed in the guidelines 🤷‍♂️

@hayata-suenaga
Copy link
Contributor

yep I agree. we should also write about this in the guideline 👍

contributingGuides/TS_STYLE.md Outdated Show resolved Hide resolved
src/ROUTES.ts Outdated Show resolved Hide resolved
@blazejkustra
Copy link
Contributor

@chrispader Please unresolve this thread 🙏

@Santhosh-Sellavel
Copy link
Collaborator

Conflicts & tests fails

@chrispader
Copy link
Contributor Author

Just for clarification: We decided to wait (for me) to create an upstream PR to fix a problem with this rule, where the type keyword is not placed consistently when auto-fixing

#32475 (comment)

@chrispader chrispader changed the title Standardize type-only imports [HOLD on upstream PR]Standardize type-only imports Dec 14, 2023
@chrispader chrispader changed the title [HOLD on upstream PR]Standardize type-only imports [HOLD on upstream PR] Standardize type-only imports Dec 14, 2023
@chrispader chrispader changed the title [HOLD on upstream PR] Standardize type-only imports Standardize type-only imports Dec 30, 2023
@chrispader chrispader force-pushed the @chrispader/standardize-type-only-imports branch from 4a93919 to c24c897 Compare December 30, 2023 14:55
@chrispader
Copy link
Contributor Author

Turns out, we don't need an upstream change 🎉 There's a rule for enforcing type specifier style:

https://github.com/import-js/eslint-plugin-import/blob/main/docs/rules/consistent-type-specifier-style.md

@roryabraham
Copy link
Contributor

Great, @blazejkustra @fabioh8010 @Santhosh-Sellavel back to you for review

Copy link
Contributor

@blazejkustra blazejkustra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still an issue. Both exports work:

export type {LocaleContextProps};
// or 
export {type LocaleContextProps};

For imports:

import type {WithCurrentUserPersonalDetailsProps} from './withCurrentUserPersonalDetails';
import withCurrentUserPersonalDetails from './withCurrentUserPersonalDetails';
// or
import withCurrentUserPersonalDetails, {type WithCurrentUserPersonalDetailsProps} from './withCurrentUserPersonalDetails';

That being said, I don't consider it as huge issue, I'm good with merging as it is now 👍

@chrispader
Copy link
Contributor Author

This is still an issue. Both exports work:

export type {LocaleContextProps};
// or 
export {type LocaleContextProps};

For imports:

import type {WithCurrentUserPersonalDetailsProps} from './withCurrentUserPersonalDetails';
import withCurrentUserPersonalDetails from './withCurrentUserPersonalDetails';
// or
import withCurrentUserPersonalDetails, {type WithCurrentUserPersonalDetailsProps} from './withCurrentUserPersonalDetails';

That being said, I don't consider it as huge issue, I'm good with merging as it is now 👍

Yes it is unfortunately. I can't find any rule that enforces this though.. So also in favor of merging anyway

@chrispader
Copy link
Contributor Author

Merged main and resolved conflicts. Ready for review and merge :)

cc @roryabraham

@roryabraham
Copy link
Contributor

@chrispader unfortunately we got a toooon of conflicts here. I think we need to sync up in slack and time the merge to happen as soon as conflicts are resolved next time.

@chrispader chrispader force-pushed the @chrispader/standardize-type-only-imports branch from 04821e3 to 19eb210 Compare January 3, 2024 18:06
roryabraham
roryabraham previously approved these changes Jan 3, 2024
Copy link
Contributor

@roryabraham roryabraham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thoroughly reviewed the whole diff, LGTM 👍🏼

@roryabraham
Copy link
Contributor

Though, lint is failing

@roryabraham
Copy link
Contributor

It looks like when you resolved conflicts you accidentally got rid of your changes in package.json and package-lock.json / forgot to reinstall the new eslint packages

@Santhosh-Sellavel
Copy link
Collaborator

@roryabraham
Not sure whether this additionally requires a C+ here as you did most of the work & it [No QA] as well only the checklist is left out. Let me know if a C+ review is needed, I'll continue once the lint error is resolved, otherwise, we are good to go here, thanks!

@chrispader
Copy link
Contributor Author

It looks like when you resolved conflicts you accidentally got rid of your changes in package.json and package-lock.json / forgot to reinstall the new eslint packages

yes i did. Just added it back

@roryabraham
Copy link
Contributor

roryabraham commented Jan 3, 2024

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@roryabraham
Copy link
Contributor

roryabraham commented Jan 3, 2024

Merging even though reassure tests aren't done because:

  • This is a compile-time change, shouldn't affect runtime performance
  • reassure tests are taking like an hour, and we're seeing conflicts more regularly than that
  • They had previously passed just fine before resolving conflicts

@roryabraham roryabraham merged commit e6616e3 into Expensify:main Jan 3, 2024
16 of 18 checks passed
@melvin-bot melvin-bot bot added the Emergency label Jan 3, 2024
Copy link

melvin-bot bot commented Jan 3, 2024

@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@roryabraham
Copy link
Contributor

Not an emergency – see last comment

@OSBotify
Copy link
Contributor

OSBotify commented Jan 3, 2024

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

OSBotify commented Jan 4, 2024

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.22-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 cancelled 🔪
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

OSBotify commented Jan 4, 2024

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.22-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2024

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.22-6 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants