From a3f7709c90deee3e85ca8f936fe9a3b9d771abeb Mon Sep 17 00:00:00 2001
From: xiaohuoni <xiaohuoni@dingtalk.com>
Date: Tue, 30 Jan 2024 15:49:21 +0800
Subject: [PATCH] fix: build scripts error

---
 package.json                                         | 1 +
 packages/inula-intl/package.json                     | 2 +-
 packages/inula-request/src/request/fetchRequest.ts   | 4 +---
 packages/inula-request/src/request/ieFetchRequest.ts | 3 +--
 packages/inula-request/tsconfig.json                 | 5 ++++-
 packages/inula/src/renderer/vnode/VNodeCreator.ts    | 6 ++----
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 52d1cf70..9982cdf4 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "jest": "^25.5.4",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "lint-staged": "^15.2.0",
+    "openinula": "workspace:*",
     "prettier": "^3.1.1",
     "rollup": "^2.75.5",
     "rollup-plugin-execute": "^1.1.1",
diff --git a/packages/inula-intl/package.json b/packages/inula-intl/package.json
index f15665e3..71793344 100644
--- a/packages/inula-intl/package.json
+++ b/packages/inula-intl/package.json
@@ -7,7 +7,7 @@
   "types": "build/@types/index.d.ts",
   "scripts": {
     "demo-serve": "webpack serve --mode=development",
-    "rollup-build": "rollup --config rollup.config.js && npm run build-types",
+    "build": "rollup --config rollup.config.js && npm run build-types",
     "build-types": "tsc -p tsconfig.json && rollup -c build-type.js",
     "test": "jest --config jest.config.js",
     "test-c": "jest --coverage"
diff --git a/packages/inula-request/src/request/fetchRequest.ts b/packages/inula-request/src/request/fetchRequest.ts
index 51a318a2..fc83d93b 100644
--- a/packages/inula-request/src/request/fetchRequest.ts
+++ b/packages/inula-request/src/request/fetchRequest.ts
@@ -26,9 +26,7 @@ export const fetchRequest = (config: IrRequestConfig): Promise<IrResponse> => {
     const {
       method = 'GET',
       baseURL,
-      url,
       params = null,
-      data = null,
       headers = {},
       responseType,
       timeout = 0,
@@ -37,8 +35,8 @@ export const fetchRequest = (config: IrRequestConfig): Promise<IrResponse> => {
       withCredentials = false,
       onUploadProgress = null,
       onDownloadProgress = null,
-      signal,
     } = config;
+    let { data = null, url, signal } = config;
 
     const controller = new AbortController();
     if (!signal) {
diff --git a/packages/inula-request/src/request/ieFetchRequest.ts b/packages/inula-request/src/request/ieFetchRequest.ts
index a1d55c2f..6d772293 100644
--- a/packages/inula-request/src/request/ieFetchRequest.ts
+++ b/packages/inula-request/src/request/ieFetchRequest.ts
@@ -24,7 +24,6 @@ export const ieFetchRequest = (config: IrRequestConfig): Promise<IrResponse> =>
     const {
       method = 'get',
       baseURL,
-      url,
       params = null,
       data = null,
       headers = {},
@@ -34,7 +33,7 @@ export const ieFetchRequest = (config: IrRequestConfig): Promise<IrResponse> =>
       cancelToken = null,
       withCredentials = false,
     } = config;
-
+    let { url } = config;
     let controller: any;
     let signal;
 
diff --git a/packages/inula-request/tsconfig.json b/packages/inula-request/tsconfig.json
index eca55465..3a21872f 100644
--- a/packages/inula-request/tsconfig.json
+++ b/packages/inula-request/tsconfig.json
@@ -11,7 +11,10 @@
     "declaration": true,
     "moduleResolution": "node",
     "sourceMap": true,
-    "downlevelIteration": true
+    "downlevelIteration": true,
+    "paths": {
+      "openinula": ["../packages/inula"],
+    }
   },
   "include": [
     "./src/**/*",
diff --git a/packages/inula/src/renderer/vnode/VNodeCreator.ts b/packages/inula/src/renderer/vnode/VNodeCreator.ts
index 6c318cfc..7cff3478 100644
--- a/packages/inula/src/renderer/vnode/VNodeCreator.ts
+++ b/packages/inula/src/renderer/vnode/VNodeCreator.ts
@@ -60,9 +60,7 @@ function newVirtualNode(tag: VNodeTag, key?: null | string, vNodeProps?: any, re
   return new VNode(tag, vNodeProps, key as null | string, realNode);
 }
 
-type FunctionType =  typeof Function;
-
-function isClassComponent(comp: FunctionType) {
+function isClassComponent(comp: (...arg: any) => any) {
   // 如果使用 getPrototypeOf 方法获取构造函数，不能兼容业务组组件继承组件的使用方式，会误认为是函数组件
   // 如果使用静态属性，部分函数高阶组件会将类组件的静态属性复制到自身，导致误判为类组件
   // 既然已经兼容使用了该标识符，那么继续使用
@@ -77,7 +75,7 @@ export function getLazyVNodeTag(lazyComp: any): string {
   } else if (lazyComp !== undefined && lazyComp !== null && typeLazyMap[lazyComp.vtype]) {
     return typeLazyMap[lazyComp.vtype];
   }
-  throw Error('Inula can\'t resolve the content of lazy');
+  throw Error("Inula can't resolve the content of lazy");
 }
 
 // 创建processing