Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 1.8k
ref(sveltekit): Replace recast + @babel/parser with acorn#19533
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
Lms24
merged 5 commits into
getsentry:develop
from
roli-lpci:chore/sveltekit-replace-recast-with-acornMar 20, 2026
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
adf408c
chore(sveltekit): replace recast + @babel/parser with acorn
roli-lpci 844ac15
fix: sort imports and deduplicate lockfile
roli-lpci 87f80a4
chore: Dedupe yarn.lock
JPeer264 bf9d78d
Merge branch 'develop' into chore/sveltekit-replace-recast-with-acorn
Lms24 60cf1ea
Apply suggestions from code review
Lms24 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
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 |
|---|---|---|
| @@ -1,10 +1,11 @@ | ||
| import { tsPlugin } from '@sveltejs/acorn-typescript'; | ||
| import * as acorn from 'acorn'; | ||
| import * as fs from 'fs'; | ||
| import * as path from 'path'; | ||
| import * as recast from 'recast'; | ||
| import type { Plugin } from 'vite'; | ||
| import { WRAPPED_MODULE_SUFFIX } from '../common/utils'; | ||
| import { parser } from './recastTypescriptParser'; | ||
| import t = recast.types.namedTypes; | ||
| const AcornParser = acorn.Parser.extend(tsPlugin()); | ||
| export type AutoInstrumentSelection = { | ||
| /** | ||
| @@ -123,23 +124,21 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean> | ||
| const code = (await fs.promises.readFile(id, 'utf8')).toString(); | ||
| const ast = recast.parse(code, { | ||
| parser, | ||
| }); | ||
| const program = (ast as { program?: t.Program }).program; | ||
| if (!program) { | ||
| let program: acorn.Program; | ||
| try { | ||
| program = AcornParser.parse(code, { | ||
| sourceType: 'module', | ||
| ecmaVersion: 'latest', | ||
| locations: true, | ||
| }); | ||
sentry[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } catch { | ||
| // eslint-disable-next-line no-console | ||
| debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`); | ||
| return false; | ||
| } | ||
| const hasLoadDeclaration = program.body | ||
| .filter( | ||
| (statement): statement is recast.types.namedTypes.ExportNamedDeclaration => | ||
| statement.type === 'ExportNamedDeclaration', | ||
| ) | ||
| .filter((statement): statement is acorn.ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration') | ||
| .find(exportDecl => { | ||
| // find `export const load = ...` | ||
| if (exportDecl.declaration?.type === 'VariableDeclaration') { | ||
| @@ -160,11 +159,8 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean> | ||
| return exportDecl.specifiers.find(specifier => { | ||
| return ( | ||
| (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') || | ||
| // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types | ||
| // This plugin adds support for exporting something as a string literal (see comment above) | ||
| // Doing this to avoid adding another babel plugin dependency | ||
| ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' && | ||
| (specifier.exported as unknown as t.StringLiteral).value === 'load') | ||
| // ESTree/acorn represents `export { x as "load" }` with a Literal node (not Babel's StringLiteral) | ||
| (specifier.exported.type === 'Literal' && specifier.exported.value === 'load') | ||
| ); | ||
| }); | ||
| } | ||
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.