build: optimize rollup config

Author: John60676

build/rollup.config.js

@@ -1,7 +1,6 @@
 import babel from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
 import resolve from '@rollup/plugin-node-resolve';
-import dts from 'rollup-plugin-dts';
 import { terser } from 'rollup-plugin-terser';
 import typescript2 from 'rollup-plugin-typescript2';
 
@@ -40,9 +39,14 @@ const RollUpConfig = {
     commonjs(),
     typescript2({
       tsconfigOverride: {
-        exclude: ['node_modules', '**/__tests__/**/*', 'example', 'script'],
+        exclude: [
+          'node_modules',
+          '**/__tests__/**/*',
+          'examples',
+          'scripts',
+          'patches',
+        ],
       },
-      useTsconfigDeclarationDir: true,
     }),
     babel({
       extensions: ['js', 'ts', 'tsx'],
@@ -54,10 +58,4 @@ const RollUpConfig = {
   external: ['vue', 'vue-demi'],
 };
 
-const dtsConfig = {
-  input: RollUpConfig.input,
-  output: [{ file: pkg.types, format: 'es' }],
-  plugins: [dts()],
-};
-
-export default [RollUpConfig, dtsConfig];
+export default RollUpConfig;

build/rollup.config.types.js

@@ -0,0 +1,15 @@
+import dts from 'rollup-plugin-dts';
+
+import pkg from '../package.json';
+import RollUpConfig from './rollup.config';
+
+/**
+ * @type { import('rollup').RollupOptions }
+ */
+const TypesConfig = {
+  input: RollUpConfig.input,
+  output: [{ file: pkg.types, format: 'esm' }],
+  plugins: [dts()],
+};
+
+export default TypesConfig;

package.json

@@ -29,11 +29,15 @@
     "dist/**"
   ],
   "scripts": {
-    "build": "yarn clean && rollup --config ./build/rollup.config.js",
-    "dev": "vue-demi-switch 3 vue3 && vite --config ./build/vite.config.ts ./examples/vue3",
-    "dev:2": "vue-demi-switch 2 vue2 && vite --config ./build/vite-vue2.config.ts ./examples/vue2",
-    "test": "vue-demi-switch 3 vue3 && jest --coverage",
-    "test:2": "vue-demi-switch 2 vue2 && jest --coverage",
+    "build": "yarn switch:3 && yarn clean && yarn build:code && yarn build:types",
+    "build:code": "rollup --config ./build/rollup.config.js",
+    "build:types": "rollup --config ./build/rollup.config.types.js",
+    "dev": "yarn switch:3 && vite --config ./build/vite.config.ts ./examples/vue3",
+    "dev:2": "yarn switch:2 && vite --config ./build/vite-vue2.config.ts ./examples/vue2",
+    "test": "yarn switch:3 && jest --coverage",
+    "test:2": "yarn switch:2 && jest --coverage",
+    "switch:3": "vue-demi-switch 3 vue3",
+    "switch:2": "vue-demi-switch 2 vue2",
     "clean": "rimraf dist/*",
     "publishing": "np",
     "changelog": "standard-version && standard-version -i CHANGELOG.zh-CN.md -o CHANGELOG.zh-CN.md",

tsconfig.json

@@ -7,16 +7,15 @@
     "moduleResolution": "node",
     "noErrorTruncation": true,
     "esModuleInterop": true,
+    "useUnknownInCatchVariables": false,
     "suppressImplicitAnyIndexErrors": true,
     "sourceMap": true,
-    "declaration": true,
-    "declarationDir": "dist/types",
     "baseUrl": "./",
     "types": ["jest", "node"],
     "paths": {
       "vue-request": ["src/index.ts"]
     }
   },
   "include": ["src", "examples", "**/__tests__/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist", "patches"]
 }

yarn.lock

@@ -5811,6 +5811,13 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
+magic-string@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.1.tgz#ba9b651354fa9512474199acecf9c6dbe93f97fd"
+  integrity sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 make-dir@^3.0.0, make-dir@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -6985,6 +6992,15 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rollup-plugin-dts@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-4.2.0.tgz#f7ae4646f5b3aec07560bc341c0dc4a85f8a0dff"
+  integrity sha512-lx6irWVhz/x4//tIqRhzk4FOqGQ0n37ZM2wpPCn4uafl/EmiV92om7ZdAsq7Bzho6C+Xh5GfsyuP9H+Udv72Lg==
+  dependencies:
+    magic-string "^0.26.1"
+  optionalDependencies:
+    "@babel/code-frame" "^7.16.7"
+
 rollup-plugin-terser@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
@@ -7243,7 +7259,7 @@ source-map@^0.7.3, source-map@~0.7.2:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-sourcemap-codec@^1.4.4:
+sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -7776,9 +7792,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^4.0.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
 uglify-js@^3.1.4:
   version "3.14.2"