Skip to content

fix: optimize shouldTransformedToSlots judgement #518

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

Merged
merged 9 commits into from
Oct 15, 2021
Merged

fix: optimize shouldTransformedToSlots judgement #518

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c2973a4
fix: optimize Fragment judgement
Oct 11, 2021
7c55fe3
test: _Fragment already imported
Oct 13, 2021
59209a8
test: move _Fragment already imported to snapshot
Oct 13, 2021
4989087
test: upgrade vue and use compileTemplate
Oct 14, 2021
eaf3d79
Revert "test: upgrade vue and use compileTemplate"
Oct 14, 2021
0d02962
test: import Fragment as _Fragment
Oct 14, 2021
1172346
Update packages/babel-plugin-jsx/test/snapshot.test.ts
Oct 14, 2021
594e00b
Update snapshot.test.ts.snap
Oct 14, 2021
5fb333f
Update snapshot.test.ts
Amour1688 Oct 15, 2021
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
3 changes: 2 additions & 1 deletion packages/babel-plugin-jsx/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export const isDirective = (src: string): boolean => src.startsWith('v-')
* @param tag string
* @returns boolean
*/
export const shouldTransformedToSlots = (tag: string) => !(tag.endsWith(FRAGMENT) || tag === KEEP_ALIVE);
// if _Fragment is already imported, it will end with number
export const shouldTransformedToSlots = (tag: string) => !(tag.match(RegExp(`^_?${FRAGMENT}\\d*$`)) || tag === KEEP_ALIVE);

/**
* Check if a Node is a component
Expand Down
13 changes: 13 additions & 0 deletions packages/babel-plugin-jsx/test/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
Transition,
} from 'vue';
import { shallowMount, mount, VueWrapper } from '@vue/test-utils';
import { transformSync } from '@babel/core';
import pluginJsx from '../src/index';

const patchFlagExpect = (
wrapper: VueWrapper<ComponentPublicInstance>,
Expand Down Expand Up @@ -97,6 +99,17 @@ describe('Transform JSX', () => {
expect(wrapper.html()).toBe('<div>123</div><div>456</div>');
});

test('_Fragment already imported', () => {
Copy link
Member

@Amour1688 Amour1688 Oct 13, 2021

Choose a reason for hiding this comment

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

packages/babel-plugin-jsx/test/snapshot.test.ts 整到这个文件里面吧

Copy link
Author

@beicause beicause Oct 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

原来可以这样。

const code = `
import _Fragment from 'example'
const Root1=() => <>root1</>
const Root2=() => <Fragment>root2</Fragment>
`;
const result = transformSync(code, { plugins: [pluginJsx], babelrc: false, configFile: false });
expect(result?.code).toMatch('const Root1 = () => _createVNode(_Fragment2, null, [_createTextVNode("root1")]);');
expect(result?.code).toMatch('const Root2 = () => _createVNode(_Fragment2, null, [_createTextVNode("root2")]);');
});

test('nested component', () => {
const A = {
B: defineComponent({
Expand Down