perf: 调整ui-*、extends的d.ts编译目录

fast-crud · Dec 14, 2022 · 4749dac · 4749dac
1 parent f385bb6
commit 4749dac
Show file tree

Hide file tree

Showing 25 changed files with 281 additions and 145 deletions.
diff --git a/packages/fast-admin/fs-admin-antdv b/packages/fast-admin/fs-admin-antdv
diff --git a/packages/fast-admin/fs-admin-element b/packages/fast-admin/fs-admin-element
diff --git a/packages/fast-crud/package.json b/packages/fast-crud/package.json
@@ -4,7 +4,7 @@
   "private": false,
   "main": "./dist/fast-crud.umd.js",
   "module": "./dist/fast-crud.mjs",
-  "types": "./dist/es/index.d.ts",
+  "types": "./dist/d/index.d.ts",
   "scripts": {
     "tsc": "vue-tsc --noEmit --skipLibCheck",
     "build": "npm run tsc && vite build && npm run copy-local",

diff --git a/packages/fast-crud/vite.config.js b/packages/fast-crud/vite.config.js
@@ -35,7 +35,7 @@ export default {
           target: "es2020",
           rootDir: "src",
           declaration: true,
-          declarationDir: "dist/es",
+          declarationDir: "dist/d",
           exclude: "./node_modules/**",
           allowSyntheticDefaultImports: true
         })

diff --git a/packages/fast-extends/package.json b/packages/fast-extends/package.json
@@ -3,8 +3,8 @@
   "version": "1.7.0",
   "private": false,
   "main": "./dist/fast-extends.umd.js",
-  "module": "./dist/fast-extends.es.js",
-  "types": "./dist/es/index.d.ts",
+  "module": "./dist/fast-extends.mjs",
+  "types": "./dist/d/index.d.ts",
   "scripts": {
     "build:all": "npm run build:type && npm run build && npm run copy:index",
     "build": " npm run build:umd && npm run build:es",

diff --git a/packages/fast-extends/src/index.js → packages/fast-extends/src/index.ts b/packages/fast-extends/src/index.js → packages/fast-extends/src/index.ts
diff --git a/packages/fast-extends/src/index.umd.js → packages/fast-extends/src/index.umd.ts b/packages/fast-extends/src/index.umd.js → packages/fast-extends/src/index.umd.ts
diff --git a/packages/fast-extends/vite.config.js b/packages/fast-extends/vite.config.js
@@ -5,7 +5,7 @@ import _ from "lodash";
 import visualizer from "rollup-plugin-visualizer";
 import strip from "@rollup/plugin-strip";
 const { resolve } = path;
-
+import typescript from "@rollup/plugin-typescript";
 // https://vitejs.dev/config/
 export default ({ command, mode }) => {
   let build = {};
@@ -14,22 +14,7 @@ export default ({ command, mode }) => {
       build: {
         emptyOutDir: true,
         lib: {
-          entry: resolve(__dirname, "src/index.umd.js"),
-          formats: ["umd"]
-        },
-        rollupOptions: {
-          output: {
-            manualChunks: null
-          }
-        }
-      }
-    };
-  } else if (mode === "umd") {
-    build = {
-      build: {
-        emptyOutDir: true,
-        lib: {
-          entry: resolve(__dirname, "src/index.umd.js"),
+          entry: resolve(__dirname, "src/index.umd.ts"),
           formats: ["umd"]
         },
         rollupOptions: {
@@ -50,7 +35,7 @@ export default ({ command, mode }) => {
     build: {
       emptyOutDir: false,
       lib: {
-        entry: resolve(__dirname, "src/index.js"),
+        entry: resolve(__dirname, "src/index.ts"),
         name: "extends-uploader",
         formats: ["es"]
       },
@@ -60,15 +45,15 @@ export default ({ command, mode }) => {
       rollupOptions: {
         plugins: [
           strip(),
-          visualizer()
-          // typescript({
-          //   target: "es2020",
-          //   rootDir: "src",
-          //   declaration: true,
-          //   declarationDir: "dist/es",
-          //   exclude: "./node_modules/**",
-          //   allowSyntheticDefaultImports: true
-          // })
+          visualizer(),
+          typescript({
+            target: "es2020",
+            rootDir: "src",
+            declaration: true,
+            declarationDir: "dist/d",
+            exclude: "./node_modules/**",
+            allowSyntheticDefaultImports: true
+          })
         ],
         // make sure to externalize deps that shouldn't be bundled
         // into your library

diff --git a/packages/ui/ui-antdv/package.json b/packages/ui/ui-antdv/package.json
@@ -3,10 +3,11 @@
   "version": "1.7.0",
   "description": "",
   "main": "./dist/ui-antdv.umd.js",
-  "module": "./dist/ui-antdv.es.js",
-  "types": "./dist/es/index.d.ts",
+  "module": "./dist/ui-antdv.mjs",
+  "types": "./dist/d/index.d.ts",
   "scripts": {
-    "build": "vite build",
+    "tsc": "vue-tsc --noEmit --skipLibCheck",
+    "build": "npm run tsc && vite build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Greper",
@@ -19,33 +20,34 @@
     "@fast-crud/fast-crud": "*"
   },
   "devDependencies": {
-    "@rollup/plugin-strip": "^2.0.0",
-    "@rollup/plugin-typescript": "^8.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "@vitejs/plugin-legacy": "^1.4.4",
-    "@vitejs/plugin-vue": "^1.2.5",
-    "@vitejs/plugin-vue-jsx": "^1.1.2",
-    "@vue/compiler-sfc": "^3.0.7",
-    "@vue/test-utils": "^2.0.0-rc.4",
-    "ant-design-vue": "^3.1.0",
-    "eslint": "^8.3.0",
+    "@rollup/plugin-strip": "^3.0.1",
+    "@rollup/plugin-typescript": "^10.0.1",
+    "@types/lodash-es": "^4.17.6",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "@vitejs/plugin-legacy": "^3.0.1",
+    "@vitejs/plugin-vue": "^4.0.0",
+    "@vitejs/plugin-vue-jsx": "^3.0.0",
+    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/test-utils": "^2.2.6",
+    "ant-design-vue": "^3.2.15",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-vue": "^8.1.1",
-    "lint-staged": "^12.1.2",
-    "postcss": "^8.2.6",
-    "rollup-plugin-visualizer": "^5.3.6",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-vue": "^9.8.0",
+    "lint-staged": "^13.1.0",
+    "postcss": "^8.4.20",
+    "rollup-plugin-visualizer": "^5.8.3",
     "ts-node": "^10.1.0",
-    "typescript": "4.5.2",
-    "vite": "^2.6.9",
-    "vite-plugin-compression": "^0.3.0",
-    "vue": ">=3.0.0",
-    "vue-eslint-parser": "^8.0.1",
-    "vue-tsc": "^0.38.9"
+    "typescript": "4.9.4",
+    "vite": "^4.0.1",
+    "vite-plugin-compression": "^0.5.1",
+    "vue": ">=3.2.45",
+    "vue-eslint-parser": "^9.1.0",
+    "vue-tsc": "^1.0.13"
   },
   "gitHead": "f9969ec5c9800c859e8fd3a4469da821c537ebe2"
 }
diff --git a/packages/ui/ui-antdv/src/antdv.ts b/packages/ui/ui-antdv/src/antdv.ts
@@ -42,9 +42,11 @@ import {
   CollapseCI,
   CollapseItemCI,
   ButtonCI,
-  PaginationCI
+  PaginationCI,
+  DividerCI,
+  PopoverCI,
+  TooltipCI
 } from "@fast-crud/ui-interface";
-import { DividerCI, PopoverCI, TooltipCI } from "../../ui-interface/src/ui-interface";
 import _ from "lodash-es";
 export class Antdv implements UiInterface {
   constructor(target) {

diff --git a/packages/ui/ui-antdv/src/icons.js → packages/ui/ui-antdv/src/icons.ts b/packages/ui/ui-antdv/src/icons.js → packages/ui/ui-antdv/src/icons.ts
diff --git a/packages/ui/ui-antdv/src/index.js → packages/ui/ui-antdv/src/index.ts b/packages/ui/ui-antdv/src/index.js → packages/ui/ui-antdv/src/index.ts
@@ -1,7 +1,10 @@
 import { message, notification, Modal } from "ant-design-vue";
+// @ts-ignore
 import { uiContext } from "@fast-crud/fast-crud";
 import setupIcons from "./icons";
 import { Antdv } from "./antdv";
+
+export * from "./antdv";
 export default {
   install(app) {
     const antdvUi = new Antdv({

diff --git a/packages/ui/ui-antdv/tsconfig.json b/packages/ui/ui-antdv/tsconfig.json
@@ -0,0 +1,42 @@
+{
+  "compilerOptions": {
+    "noImplicitAny": false,
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "outDir": "./dist/ts",
+    "allowJs": true,
+    "types": [
+      "vite/client",
+      "node"
+    ],
+    "paths": {
+      "/src/*": [ "src/*"]
+    },
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
+    ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/packages/ui/ui-antdv/vite.config.js b/packages/ui/ui-antdv/vite.config.js
@@ -3,6 +3,7 @@ import vueJsx from "@vitejs/plugin-vue-jsx";
 import path from "path";
 import visualizer from "rollup-plugin-visualizer";
 import strip from "@rollup/plugin-strip";
+import typescript from "@rollup/plugin-typescript";
 const { resolve } = path;
 // https://vitejs.dev/config/
 export default {
@@ -13,8 +14,8 @@ export default {
   },
   build: {
     lib: {
-      entry: resolve(__dirname, "src/index.js"),
-      name: "antdv"
+      entry: resolve(__dirname, "src/index.ts"),
+      name: "index"
     },
     // cssCodeSplit: true,
     sourcemap: "inline",
@@ -26,15 +27,15 @@ export default {
       // },
       plugins: [
         strip(),
-        visualizer()
-        //   typescript({
-        //   target: "es2020",
-        //   rootDir: "src",
-        //   declaration: true,
-        //   declarationDir: "dist/es",
-        //   exclude: "./node_modules/**",
-        //   allowSyntheticDefaultImports: true
-        // })
+        visualizer(),
+        typescript({
+          target: "es2020",
+          rootDir: "src",
+          declaration: true,
+          declarationDir: "dist/d",
+          exclude: "./node_modules/**",
+          allowSyntheticDefaultImports: true
+        })
       ],
       // make sure to externalize deps that shouldn't be bundled
       // into your library

diff --git a/packages/ui/ui-element/package.json b/packages/ui/ui-element/package.json
@@ -3,10 +3,11 @@
   "version": "1.7.0",
   "description": "",
   "main": "./dist/ui-element.umd.js",
-  "module": "./dist/ui-element.es.js",
-  "types": "./dist/es/index.d.ts",
+  "module": "./dist/ui-element.mjs",
+  "types": "./dist/d/index.d.ts",
   "scripts": {
-    "build": "vite build",
+    "tsc": "vue-tsc --noEmit --skipLibCheck",
+    "build": "npm run tsc && vite build",
     "test": "jest",
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
@@ -21,32 +22,33 @@
     "element-plus": "^2.2.12"
   },
   "devDependencies": {
-    "@rollup/plugin-strip": "^2.0.0",
-    "@rollup/plugin-typescript": "^8.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "@vitejs/plugin-legacy": "^1.4.4",
-    "@vitejs/plugin-vue": "^1.2.5",
-    "@vitejs/plugin-vue-jsx": "^1.1.2",
-    "@vue/compiler-sfc": "^3.0.7",
-    "@vue/test-utils": "^2.0.0-rc.4",
-    "eslint": "^8.3.0",
+    "@rollup/plugin-strip": "^3.0.1",
+    "@rollup/plugin-typescript": "^10.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "@vitejs/plugin-legacy": "^3.0.1",
+    "@vitejs/plugin-vue": "^4.0.0",
+    "@vitejs/plugin-vue-jsx": "^3.0.0",
+    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/test-utils": "^2.2.6",
+    "@types/lodash-es": "^4.17.6",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-vue": "^8.1.1",
-    "lint-staged": "^12.1.2",
-    "postcss": "^8.2.6",
-    "rollup-plugin-visualizer": "^5.3.6",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-vue": "^9.8.0",
+    "lint-staged": "^13.1.0",
+    "postcss": "^8.4.20",
+    "rollup-plugin-visualizer": "^5.8.3",
     "ts-node": "^10.1.0",
-    "typescript": "4.5.2",
-    "vite": "^2.6.9",
-    "vite-plugin-compression": "^0.3.0",
-    "vue": ">=3.0.0",
-    "vue-eslint-parser": "^8.0.1",
-    "vue-tsc": "^0.38.9"
+    "typescript": "4.9.4",
+    "vite": "^4.0.1",
+    "vite-plugin-compression": "^0.5.1",
+    "vue": ">=3.2.45",
+    "vue-eslint-parser": "^9.1.0",
+    "vue-tsc": "^1.0.13"
   },
   "gitHead": "f9969ec5c9800c859e8fd3a4469da821c537ebe2"
 }
diff --git a/packages/ui/ui-element/src/element.ts b/packages/ui/ui-element/src/element.ts
@@ -41,10 +41,14 @@ import {
   CollapseCI,
   CollapseItemCI,
   ButtonCI,
-  PaginationCI
+  PaginationCI,
+  DividerCI,
+  FormCI,
+  PopoverCI,
+  TooltipCI
 } from "@fast-crud/ui-interface";
+// @ts-ignore
 import _ from "lodash-es";
-import { DividerCI, FormCI, PopoverCI, TooltipCI } from "../../ui-interface/src/ui-interface";
 export class Element implements UiInterface {
   constructor(target) {
     if (target) {

diff --git a/packages/ui/ui-element/src/icons.js → packages/ui/ui-element/src/icons.ts b/packages/ui/ui-element/src/icons.js → packages/ui/ui-element/src/icons.ts
@@ -1,7 +1,8 @@
+// @ts-ignore
 import * as icons from "@element-plus/icons-vue";
 
-export default function (app) {
-  for (let key in icons) {
+export default function(app) {
+  for (const key in icons) {
     app.component(key, icons[key]);
   }
 }
diff --git a/packages/ui/ui-element/src/index.js → packages/ui/ui-element/src/index.ts b/packages/ui/ui-element/src/index.js → packages/ui/ui-element/src/index.ts
@@ -1,7 +1,12 @@
+// @ts-ignore
 import { ElMessage, ElNotification, ElMessageBox } from "element-plus";
+// @ts-ignore
 import { uiContext } from "@fast-crud/fast-crud";
+// @ts-ignore
 import { Element } from "./element.ts";
 import setupIcons from "./icons";
+
+export * from "./element";
 export default {
   install(app) {
     const elementUi = new Element({