[NoQA] change webpack config and rename .web files to .website files #32548

SzymczakJ · 2023-12-06T08:55:52Z

Details

Webpack doesn't include .desktop.tsx files in bundle when running desktop app and desktop app wouldn't work if we wanted to write some desktop specific code. This PR fixes it and unblocks this task , that has components that have such .desktop.tsx files. I've also noticed that some of our web specific files have .web suffix and renamed then to have .website suffix for better standarization.

Fixed Issues

$ #24990 related to
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console
Verify that creating a distance request flow works as expected
Test the app generally, sending messages, logging, requesting money

Offline tests

N/A

QA Steps

Verify that no errors appear in the JS console
Verify that creating a distance request flow works as expected
Test the app generally, sending messages, logging, requesting money

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

androidweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

iosmweb.mov

MacOS: Chrome / Safari

websitesmal.mov

MacOS: Desktop

desktop.mov

github-actions · 2023-12-06T08:56:07Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

SzymczakJ · 2023-12-06T13:08:31Z

I have read the CLA Document and I hereby sign the CLA

melvin-bot · 2023-12-06T13:10:54Z

@marcochavezf 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]

blazejkustra · 2023-12-06T13:39:02Z

recheck

OSBotify · 2023-12-06T13:52:49Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/32548/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/32548/NewExpensify.dmg	https://32548.pr-testing.expensify.com

blazejkustra · 2023-12-06T13:59:10Z

@mountiny iOS has failed 🤔

fabioh8010 · 2023-12-06T14:23:34Z

Looks like the iOS build was cancelled without specific reason. Maybe another build will solve it. cc @blazejkustra @mountiny

mountiny · 2023-12-06T14:24:14Z

that probs does not matter here

melvin-bot · 2023-12-06T14:29:53Z

Hey, I noticed you changed some webpack configuration files. This can break production builds. Did you remember to run a production build locally to verify they still work?

mountiny

The build seem to be working fine @marcochavezf all yours!

blazejkustra · 2023-12-06T16:25:41Z

@SzymczakJ Fill out Tests section please 🙏

marcochavezf

Also LGTM

blazejkustra · 2023-12-07T09:35:15Z

@marcochavezf @mountiny What's next, do we need a C+ for this one or proceed with a merge? 😅

mountiny · 2023-12-07T12:59:11Z

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 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

Confirmed web and desktop are building correctly, otherwise n/a

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

mountiny · 2023-12-07T12:59:34Z

Will merge this one then

OSBotify · 2023-12-07T13:03:29Z

✋ 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 · 2023-12-08T01:24:29Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.10-0 🚀

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

OSBotify · 2023-12-08T02:54:22Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.10-0 🚀

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

OSBotify · 2023-12-11T10:41:39Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.10-1 🚀

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

OSBotify · 2023-12-11T15:23:34Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.10-1 🚀

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

allgandalf · 2024-07-10T08:46:49Z

tsconfig.json

@@ -47,5 +47,5 @@
        }
    },
    "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"],
-    "include": ["src", "desktop", "web", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*"]
+    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*"]


This config change caused #40152.

I don't think so that we would had prevented this though.

blazejkustra approved these changes Dec 6, 2023

View reviewed changes

rename .web files to .website files

820fb32

SzymczakJ force-pushed the @szymczak/change-webpack-config branch from 4a73cfe to 820fb32 Compare December 6, 2023 12:58

make webpack take .website.tsx files

cd7ba79

SzymczakJ marked this pull request as ready for review December 6, 2023 13:10

SzymczakJ requested a review from a team as a code owner December 6, 2023 13:10

melvin-bot bot requested review from marcochavezf and removed request for a team December 6, 2023 13:10

BartoszGrajdek approved these changes Dec 6, 2023

View reviewed changes

mountiny added the Ready To Build label Dec 6, 2023

SzymczakJ mentioned this pull request Dec 6, 2023

[TS migration] Migrate 'HeaderGap' component to TypeScript software-mansion-labs/expensify-app-fork#7

Closed

47 tasks

fabioh8010 approved these changes Dec 6, 2023

View reviewed changes

SzymczakJ mentioned this pull request Dec 6, 2023

[TS migration] Migrate 'HeaderGap' component to TypeScript #32567

Merged

47 tasks

mountiny assigned SzymczakJ Dec 6, 2023

mountiny approved these changes Dec 6, 2023

View reviewed changes

marcochavezf approved these changes Dec 6, 2023

View reviewed changes

SzymczakJ changed the title ~~change webpack config and rename .web files to .website files~~ [NO QA] change webpack config and rename .web files to .website files Dec 7, 2023

mountiny changed the title ~~[NO QA] change webpack config and rename .web files to .website files~~ [NoQA] change webpack config and rename .web files to .website files Dec 7, 2023

mountiny merged commit 10727a7 into Expensify:main Dec 7, 2023
24 of 27 checks passed

github-actions bot mentioned this pull request Dec 8, 2023

Deploy Checklist: New Expensify 2023-12-08 #32704

Closed

27 tasks

melvin-bot bot mentioned this pull request Dec 11, 2023

[HOLD for payment 2023-12-26] [HOLD for payment 2023-12-18] [TS migration] Migrate 'HeaderGap' component to TypeScript #24990

Closed

gedu mentioned this pull request Jun 21, 2024

Marking as read when coming from notification #43919

Merged

50 tasks

allgandalf reviewed Jul 10, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NoQA] change webpack config and rename .web files to .website files #32548

[NoQA] change webpack config and rename .web files to .website files #32548

SzymczakJ commented Dec 6, 2023 •

edited

Loading

github-actions bot commented Dec 6, 2023 •

edited

Loading

SzymczakJ commented Dec 6, 2023

melvin-bot bot commented Dec 6, 2023

blazejkustra commented Dec 6, 2023

OSBotify commented Dec 6, 2023

blazejkustra commented Dec 6, 2023

fabioh8010 commented Dec 6, 2023

mountiny commented Dec 6, 2023

melvin-bot bot commented Dec 6, 2023

mountiny left a comment

blazejkustra commented Dec 6, 2023

marcochavezf left a comment

blazejkustra commented Dec 7, 2023

mountiny commented Dec 7, 2023

mountiny commented Dec 7, 2023

OSBotify commented Dec 7, 2023

OSBotify commented Dec 8, 2023

OSBotify commented Dec 8, 2023

OSBotify commented Dec 11, 2023

OSBotify commented Dec 11, 2023

allgandalf Jul 10, 2024

[NoQA] change webpack config and rename .web files to .website files #32548

[NoQA] change webpack config and rename .web files to .website files #32548

Conversation

SzymczakJ commented Dec 6, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Dec 6, 2023 • edited Loading

SzymczakJ commented Dec 6, 2023

melvin-bot bot commented Dec 6, 2023

blazejkustra commented Dec 6, 2023

OSBotify commented Dec 6, 2023

blazejkustra commented Dec 6, 2023

fabioh8010 commented Dec 6, 2023

mountiny commented Dec 6, 2023

melvin-bot bot commented Dec 6, 2023

mountiny left a comment

Choose a reason for hiding this comment

blazejkustra commented Dec 6, 2023

marcochavezf left a comment

Choose a reason for hiding this comment

blazejkustra commented Dec 7, 2023

mountiny commented Dec 7, 2023

Reviewer Checklist

Screenshots/Videos

mountiny commented Dec 7, 2023

OSBotify commented Dec 7, 2023

OSBotify commented Dec 8, 2023

OSBotify commented Dec 8, 2023

OSBotify commented Dec 11, 2023

OSBotify commented Dec 11, 2023

allgandalf Jul 10, 2024

Choose a reason for hiding this comment

SzymczakJ commented Dec 6, 2023 •

edited

Loading

github-actions bot commented Dec 6, 2023 •

edited

Loading