fix: 修复 f2 和 react 同时使用时，shape 标签类型提示报错 (#1407)

jest.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   runner: 'jest-electron/runner',
   testEnvironment: 'jest-electron/environment',
-  preset: 'ts-jest',
+  preset: 'ts-jest/presets/js-with-ts',
   collectCoverage: false,
   collectCoverageFrom: ['packages/*/src/**/*.{ts,tsx,js}', '!**/node_modules/**'],
   modulePathIgnorePatterns: ['packages/*/dist'],

packages/f2/src/jsx/index.ts

@@ -1,4 +1,4 @@
-import jsx from './jsx-classic';
+import { jsx } from './jsx-classic';
 import Fragment from './fragment';
 import render from './render';
 import renderJSXElement from './renderJSXElement';

packages/f2/src/jsx/jsx-automatic.ts

@@ -1,8 +1,8 @@
-import JSX from './interface';
+import JSX from './types';
 import { ElementType } from '../types';
 
 // 实现jsx-automatic 入口
-export default function(type: ElementType, config, key?: string): JSX.Element {
+export function jsx(type: ElementType, config, key?: string): JSX.Element {
   const { ref, ...props } = config || {};
   return {
     key,

packages/f2/src/jsx/jsx-classic.d.ts

@@ -0,0 +1,15 @@
+/**
+ * ref: https://github.com/microsoft/TypeScript/pull/22207
+ */
+
+import GlobalJSX from './types';
+
+export namespace jsx {
+  export namespace JSX {
+    export type Element = GlobalJSX.Element;
+    export type ElementClass = GlobalJSX.ElementClass;
+    export type IntrinsicElements = GlobalJSX.IntrinsicElements;
+  }
+}
+
+export function jsx(): jsx.JSX.Element;

packages/f2/src/jsx/jsx-classic.ts → packages/f2/src/jsx/jsx-classic.js

@@ -1,8 +1,5 @@
-import JSX from './interface';
-import { ElementType } from '../types';
-
 // 实现jsx-classic 入口
-export default function(type: ElementType, config, ...children): JSX.Element {
+export function jsx(type, config, ...children) {
   const { key, ref, ...props } = config || {};
 
   // 保持和automatic模式一致

packages/f2/src/jsx/jsx-runtime.ts

@@ -1,4 +1,4 @@
-import jsx from './jsx-automatic';
+import { jsx } from './jsx-automatic';
 import Fragment from './fragment';
 
 export { Fragment, jsx, jsx as jsxs };

packages/f2/src/jsx/render.ts

@@ -1,4 +1,4 @@
-import JSX from './interface';
+import JSX from './types';
 import { extendMap, px2hd } from '../util';
 import { omit } from '@antv/util';
 import computeLayout from './css-layout';

packages/f2/src/jsx/renderJSXElement.ts

@@ -1,4 +1,4 @@
-import JSX from './interface';
+import JSX from './types';
 import Children from '../children';
 
 // 主要是把function节点，全部转换成string标签节点

packages/f2/src/types.ts

@@ -99,8 +99,6 @@ export type ElementType =
   | ((props: Props, context?: any) => any)
   | (new (props: Props, context?: any) => any);
 
-
-
 export interface ShapeAttrs extends Partial<SupportPx<Types.ShapeAttrs>>{
   [k: string]: any;
 }

packages/f2/typing.d.ts

@@ -1,2 +1,2 @@
 import '../../typings';
-import './src/jsx/interface';
+import './src/jsx/types';

tsconfig.json

@@ -9,7 +9,8 @@
     "moduleResolution": "node",
     "useDefineForClassFields": false,
     "resolveJsonModule": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "allowJs": true
   },
   "exclude": [
     "scripts",