-
-
Notifications
You must be signed in to change notification settings - Fork 613
chore: switch build to tsdown #2760
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5c78ae6
Switch build to tsdown
Andarist 6deea73
chore: format `tsdown.config.ts`
kettanaito 96aff9c
chore: match against ecosystem regexp in browser `alwaysBundle`
kettanaito c61de16
Merge branch 'feat/3.0' into tsdown
kettanaito 7866d9a
Merge branch 'feat/3.0' into tsdown
kettanaito 85b7394
chore(forceFileExtensionsPlugin): add extra extension check
kettanaito File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 15 additions & 28 deletions
43
...ugins/esbuild/forceEsmExtensionsPlugin.ts → ...ins/rolldown/forceFileExtensionsPlugin.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import type { TsdownPlugin } from 'tsdown' | ||
|
|
||
| /** | ||
| * A plugin to replace `require('graphql')` statements with `await import('graphql')` | ||
| * only for ESM bundles. This makes the GraphQL module to be imported lazily | ||
| * while maintaining the CommonJS compatibility. | ||
| * @see https://github.com/mswjs/msw/issues/2254 | ||
| */ | ||
| export function graphqlImportPlugin(): TsdownPlugin { | ||
| return { | ||
| name: 'graphql-import-plugin', | ||
| transform(code, id) { | ||
| if (!id.endsWith('.ts') || !code.includes(`require('graphql')`)) { | ||
| return | ||
| } | ||
|
|
||
| return { | ||
| code: code.replace( | ||
| /require\(['"]graphql['"]\)/g, | ||
| `await import('graphql').catch((error) => {console.error('[MSW] Failed to parse a GraphQL query: cannot import the "graphql" module. Please make sure you install it if you wish to intercept GraphQL requests. See the original import error below.'); throw error})`, | ||
| ), | ||
| map: null, | ||
| } | ||
| }, | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import path from 'node:path' | ||
| import type { TsdownPlugin } from 'tsdown' | ||
| import { replaceCoreImports } from '../../replaceCoreImports.js' | ||
| import { ESM_EXTENSION } from './forceFileExtensionsPlugin.ts' | ||
|
|
||
| export function resolveCoreImportsPlugin(): TsdownPlugin { | ||
| return { | ||
| name: 'resolveCoreImportsPlugin', | ||
| renderChunk(code, chunk, outputOptions) { | ||
| const isEsm = chunk.fileName.endsWith(ESM_EXTENSION) | ||
| const moduleFilePath = path.resolve(outputOptions.dir!, chunk.fileName) | ||
|
|
||
| return { | ||
| code: replaceCoreImports(moduleFilePath, code, isEsm), | ||
| map: null, | ||
| } | ||
| }, | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Entry condition and transform value use different ESM signals.
Line 12 enters the branch if either
chunk.fileName.endsWith(ESM_EXTENSION)orisEsm(format-based) is true, but Line 17 only passes the format-basedisEsmintomodifyRelativeImports. If a chunk's file name ends in.mjswhileoutputOptions.formatisn't'es'(or vice versa, an edge case with customentryFileNames), the function processes the chunk but rewrites imports using the wrong assumption of module format.♻️ Proposed fix — compute effective ESM state once
renderChunk(code, chunk, outputOptions) { - const isEsm = outputOptions.format === 'es' + const isEsm = + outputOptions.format === 'es' || chunk.fileName.endsWith(ESM_EXTENSION) - if (!(chunk.fileName.endsWith(ESM_EXTENSION) || isEsm)) { + if (!isEsm) { return }📝 Committable suggestion
🤖 Prompt for AI Agents