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.

Sign up for GitHub

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

fix: Allow TypeScript in worklet classes #6667

Merged
merged 7 commits into from
Nov 19, 2024
Merged

fix: Allow TypeScript in worklet classes #6667

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
657b701
fix: Allow TypeScript in worklet classes
tjzel Nov 5, 2024
1352792
chore: Fix tests
tjzel Nov 5, 2024
96f9fbd
Merge branch 'main' into @tjzel/plugin/typescript-in-worklet-classes
tjzel Nov 7, 2024
dedb92b
chore: Review changes
tjzel Nov 7, 2024
f41699c
chore: Add runtime test and annotate inheritance is a big no-no
tjzel Nov 17, 2024
dbfdef4
chore: Add more TypeScript test cases
tjzel Nov 18, 2024
b0d56e4
Merge branch 'main' into @tjzel/plugin/typescript-in-worklet-classes
tjzel Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: Review changes
  • Loading branch information
@tjzel
tjzel committed Nov 7, 2024
commit dedb92b416c67badd6160208ce5c021185ac509c
10 changes: 6 additions & 4 deletions packages/react-native-reanimated/plugin/src/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ export function workletTransformSync(

return transformSync(code, {
...rest,
plugins: [...plugins, ...extraPlugins],
presets: [...presets, ...extraPresets],
plugins: [...defaultPlugins, ...extraPlugins],
presets: [...defaultPresets, ...extraPresets],
});
}

const presets: PluginItem[] = [require.resolve('@babel/preset-typescript')];
const defaultPresets: PluginItem[] = [
require.resolve('@babel/preset-typescript'),
];

const plugins: PluginItem[] = [];
const defaultPlugins: PluginItem[] = [];

interface WorkletTransformOptions
extends Omit<TransformOptions, 'plugins' | 'presets'> {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-reanimated/plugin/src/workletFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export function makeWorkletFactory(
'(' + (fun.isObjectMethod() ? 'function ' : '') + codeObject.code + '\n)';

const transformed = workletTransformSync(codeObject.code, {
extraPlugins: plugins,
extraPlugins,
filename: state.file.opts.filename,
ast: true,
babelrc: false,
Expand Down Expand Up @@ -455,7 +455,7 @@ function makeArrayFromCapturedBindings(
return Array.from(closure.values());
}

const plugins = [
const extraPlugins = [
require.resolve('@babel/plugin-transform-shorthand-properties'),
require.resolve('@babel/plugin-transform-arrow-functions'),
require.resolve('@babel/plugin-transform-optional-chaining'),
Expand Down