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

Components: use full import paths with JS extensions #41524

Draft
wants to merge 13 commits into
base: trunk
Choose a base branch
from

Conversation

nateweller
Copy link
Contributor

@nateweller nateweller commented Feb 3, 2025

Proposed changes:

  • Updates the @automattic/jetpack-components package to specify .js extensions in import paths, and changes directory imports to specify /index.js.
  • Adds the .jsx extension to the supported aliases in storybook and webpack configs.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

peb6dq-3ta-p2

Does this pull request change what data or activity we track or use?

No

Testing instructions:

  • TBD
    • Review automated tests.
    • Smoke test plugins?

@nateweller nateweller requested a review from anomiex February 3, 2025 22:49
@nateweller nateweller self-assigned this Feb 3, 2025
Copy link
Contributor

github-actions bot commented Feb 3, 2025

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the add/components/js-imports branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack add/components/js-imports
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/components/js-imports
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

Copy link
Contributor

github-actions bot commented Feb 3, 2025

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • 🔴 Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Feb 3, 2025
@nateweller nateweller force-pushed the add/components/js-imports branch 7 times, most recently from 875446a to fb6bbff Compare February 3, 2025 23:18
Copy link
Contributor

github-actions bot commented Feb 3, 2025

Code Coverage Summary

Cannot generate coverage summary while tests are failing. 🤐

Please fix the tests, or re-run the Code coverage job if it was something being flaky.

Full summary · PHP report · JS report

@nateweller nateweller force-pushed the add/components/js-imports branch 2 times, most recently from dd4066c to cfb1624 Compare February 4, 2025 05:25
Copy link
Contributor

@anomiex anomiex left a comment

Choose a reason for hiding this comment

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

Looks good as far as it goes. Some comments inline.

I'm tempted to add a new tools/js-tools/tsconfig.nodenext.json that sets "module" and "moduleResoltion" to "nodenext" but leaves "noEmit" false, so future PRs will get checked with the right options to require the full paths. OTOH, if someone is going to immediately follow this up with updating it to create a build/ dir, there may not be much need for that. 🤷

import { STORE_ID as CONNECTION_STORE_ID } from '../../../../js-packages/connection/state/store';
import getSiteAdminUrl from '../../tools/get-site-admin-url';
import AutomatticBylineLogo from '../automattic-byline-logo';
import { STORE_ID as CONNECTION_STORE_ID } from '../../../../js-packages/connection/state/store.jsx';
Copy link
Contributor

Choose a reason for hiding this comment

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

At some point this may cause problems. Ideally we really shouldn't be trying to relative-include files from outside of the package, instead this should be something like import { STORE_ID as CONNECTION_STORE_ID } from '@automattic/jetpack-connection';.

Probably someone did it this way because js-packages/connection also depends on js-packages/components, and the bidirectional dependency makes our tooling unhappy. Maybe it needs to be changed so the necessary info gets passed into this component, or maybe the component should be moved to the connection js-package. Or maybe there's a better idea I don't know about. 😀

Anyway, fixing that can be a left for a different PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, the cyclical dependency is an issue. Updating that relative import that reaches outside of the package to use the .js extension appears to break the JS Tests on this PR as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

For now, let's just leave this one as jsx. We'll need to fix the circular dependency anyway before we can make this build properly.

As for the test, it looks like the ts-jest-resolver package we're using doesn't properly handle TypeScript's jsx option, so it doesn't check for the .jsx extension. At some point I'll probably need to work around that somehow too.

projects/js-packages/components/index.ts Outdated Show resolved Hide resolved
projects/js-packages/components/index.ts Outdated Show resolved Hide resolved
projects/js-packages/components/package.json Outdated Show resolved Hide resolved
@nateweller nateweller force-pushed the add/components/js-imports branch from 34030cc to 133e9f3 Compare February 6, 2025 01:38
@anomiex
Copy link
Contributor

anomiex commented Feb 6, 2025

Rather than 8e011ec, I think the correct fix would be to add .jsx into the relevant webpack configurations.

When tsc is used to build files it doesn't transform the extensions in imports, so the extensions used need to match what the output file is going to be. To support this, we have Webpack configured to do the same mappings. But in #35453 I apparently forgot to include .jsx.

'.js': [ '.js', '.ts', '.tsx' ],

'.js': [ '.js', '.ts', '.tsx' ],

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

Successfully merging this pull request may close these issues.

2 participants