@deot/dev-builder 2.7.0 → 2.8.0

package/dist/index.cjs

@@ -61,7 +61,7 @@ const run$3 = async (options) => {
   } = options || {};
   const { scriptFormats, external, globals } = commandOptions;
   const stats = [];
-  let files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
+  const files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
   if (!files.length)
     return stats;
   const build = async (format, filepath) => {
@@ -97,11 +97,11 @@ const run$3 = async (options) => {
       options$ = isVuePackage ? vite.mergeConfig(sharedVueConfig, options$) : isReactPackage ? vite.mergeConfig(sharedReactConfig, options$) : options$;
     }
     process.env.BUILD_OPTIONS = encodeURIComponent(JSON.stringify(buildOptions));
-    let outputs2 = await vite.build(options$);
+    const outputs2 = await vite.build(options$);
     outputs2.forEach((i) => {
       i.output.forEach((j) => {
         if (j.type === "asset") {
-          let fileName = filepath.replace(/^(.*)((\..*\.js)|\.cjs|\.ts)/, `$1.${j.fileName}`);
+          const fileName = filepath.replace(/^(.*)((\..*\.js)|\.cjs|\.ts)/, `$1.${j.fileName}`);
           fs.outputFileSync(`${outDir}/${fileName}`, j.source);
           return;
         }
@@ -123,9 +123,9 @@ const run$3 = async (options) => {
     });
   });
   await serial;
-  let outputs = fs.readdirSync(outDir).filter((i) => /^index(.*)(?!=(\.d))\.(cjs|js|style\.css)$/.test(i));
+  const outputs = fs.readdirSync(outDir).filter((i) => /^index(.*)(?!=(\.d))\.(cjs|js|style\.css)$/.test(i));
   outputs.forEach((file) => {
-    let stat = fs.statSync(path__namespace.resolve(outDir, file));
+    const stat = fs.statSync(path__namespace.resolve(outDir, file));
     stats.push({
       file: file.replace(/^(.*)(\.umd\.cjs|\.iife\.js)/, "$1.ts").replace(/^(.*)(\.js|\.cjs)/, "$1.ts"),
       format: /\.style\.css$/.test(file) ? "css" : /\.umd\.cjs$/.test(file) ? "umd" : /\.cjs$/.test(file) ? "cjs" : /\.iife\.js$/.test(file) ? "iife" : "es",
@@ -142,11 +142,11 @@ const run$2 = async (options) => {
   await styles.reduce(
     (preProcess, file) => {
       preProcess = preProcess.then(() => {
-        let filepath = path__namespace.resolve(srcDir, file);
+        const filepath = path__namespace.resolve(srcDir, file);
         const data = sass__namespace.compile(filepath, { style: "compressed" });
         return postcss().use(atImport()).use(atUrl()).use(flexBugs()).use(cssnano()).use(autoprefixer({ remove: false })).process(data.css, { from: filepath });
       }).then((source) => {
-        let output = path__namespace.resolve(outDir, `${file.replace(/\.scss$/g, ".css")}`);
+        const output = path__namespace.resolve(outDir, `${file.replace(/\.scss$/g, ".css")}`);
         fs.outputFileSync(output, source.css);
         return fs.stat(output);
       }).then((stat) => {
@@ -168,9 +168,9 @@ const run$1 = async (options) => {
   const { isVuePackage, packageDir, packageOutDir, packageSourceDir, packageOptions, commandOptions } = options;
   const done = () => {
     const stats = [];
-    let fullpath = `${packageOutDir}/index.d.ts`;
+    const fullpath = `${packageOutDir}/index.d.ts`;
     if (fs.existsSync(fullpath)) {
-      let stat = fs.statSync(fullpath);
+      const stat = fs.statSync(fullpath);
       stats.push({
         file: "index.d.ts",
         size: stat.size
@@ -187,22 +187,30 @@ const run$1 = async (options) => {
     });
     return done();
   }
-  let tempDir = `${packageOutDir}/temp`;
-  let rootDir = path__namespace.relative(tempDir, process.cwd());
-  fs.outputFileSync(`${tempDir}/tsconfig.json`, JSON.stringify({
-    extends: `${rootDir}/tsconfig.json`,
-    compilerOptions: {
-      declaration: true,
-      emitDeclarationOnly: true,
-      allowJs: true,
-      rootDir,
-      outDir: "."
-    },
-    include: [
-      path__namespace.relative(tempDir, path__namespace.resolve(packageSourceDir, `*`))
-    ]
-  }, null, "	"));
-  await devShared.Shell.spawn(isVuePackage ? "vue-tsc" : "tsc", ["-p", `${tempDir}/tsconfig.json`]);
+  const tempDir = `${packageOutDir}/temp`;
+  const rootDir = path__namespace.relative(tempDir, process.cwd());
+  const tsc = async (skipLibCheck) => {
+    fs.outputFileSync(`${tempDir}/tsconfig.json`, JSON.stringify({
+      extends: `${rootDir}/tsconfig.json`,
+      compilerOptions: {
+        declaration: true,
+        emitDeclarationOnly: true,
+        allowJs: true,
+        outDir: ".",
+        skipLibCheck,
+        rootDir
+      },
+      include: [
+        path__namespace.relative(tempDir, path__namespace.resolve(packageSourceDir, `*`))
+      ]
+    }, null, "	"));
+    await devShared.Shell.spawn(isVuePackage ? "vue-tsc" : "tsc", ["-p", `${tempDir}/tsconfig.json`]);
+  };
+  try {
+    await tsc(false);
+  } catch (e) {
+    await tsc(true);
+  }
   const configPath = `${tempDir}/api-extractor.json`;
   fs.outputFileSync(configPath, JSON.stringify({
     extends: path__namespace.relative(tempDir, path__namespace.resolve(dirname, "../api-extractor.shared.json")),
@@ -224,13 +232,21 @@ const run$1 = async (options) => {
        *
        * 版本提示：
        * 2. console-compiler-version-notice
-       * 	*** The target project appears to use TypeScript 5.1.6 which is newer 
+       * 	*** The target project appears to use TypeScript 5.1.6 which is newer
        * 		than the bundled compiler engine; consider upgrading API Extractor.
        * 3. console-preamble
        * 	Analysis will use the bundled TypeScript version 5.0.4
+       *
+       *
+       * 4. TS2590, TS2320, TS2344, TS2430
+       *  打包vue项目时，出现的warning
+       *   (TS2344) Type 'C' does not satisfy the constraint 'ElementType<any>'.
+       *   (TS2320) Interface 'Element' cannot simultaneously extend types 'VNode<RendererNode,
+       *   (TS2430) Interface 'IntrinsicElements' incorrectly extends interface 'NativeElements'
+       *   (TS2590) Expression produces a union type that is too complex to represent
        */
       messageCallback: (message) => {
-        if (message.messageId === "console-compiler-version-notice" || message.messageId === "console-preamble" || message.messageId === "TS18028") {
+        if (message.messageId === "console-compiler-version-notice" || message.messageId === "console-preamble" || ["TS18028", "TS2590", "TS2320", "TS2344", "TS2430"].includes(message.messageId)) {
           message.handled = true;
         }
       }
@@ -274,7 +290,7 @@ class Build {
     this.isNodePackage = typeof nodePackage === "string" && (nodePackage === "*" || nodePackage.split(",").includes(this.packageName));
   }
   async process() {
-    let start = Date.now();
+    const start = Date.now();
     const { cwd, workspace } = devShared.Locals.impl();
     const { packageSourceDir: srcDir, packageOptions, packageName, packageDir } = this;
     if (workspace && packageOptions?.scripts?.build && packageDir !== cwd) {
@@ -283,7 +299,7 @@ class Build {
       });
       return;
     }
-    let files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
+    const files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
     if (!files.length)
       return;
     const spinner = ora(`${packageName} Build ...`);
@@ -331,7 +347,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   options.vuePackage = devShared.Locals.getRealPackageName(options.vuePackage);
   options.reactPackage = devShared.Locals.getRealPackageName(options.reactPackage);
   options.nodePackage = devShared.Locals.getRealPackageName(options.nodePackage);
-  let packageFolderName = devShared.Locals.getPackageFolderName(options.packageName || "*");
+  const packageFolderName = devShared.Locals.getPackageFolderName(options.packageName || "*");
   let inputs = [];
   if (locals.workspace && packageFolderName === "*") {
     inputs = locals.normalizePackageFolderNames;

package/dist/index.js

@@ -35,7 +35,7 @@ const run$3 = async (options) => {
   } = options || {};
   const { scriptFormats, external, globals } = commandOptions;
   const stats = [];
-  let files = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
+  const files = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
   if (!files.length)
     return stats;
   const build = async (format, filepath) => {
@@ -71,11 +71,11 @@ const run$3 = async (options) => {
       options$ = isVuePackage ? mergeConfig(sharedVueConfig, options$) : isReactPackage ? mergeConfig(sharedReactConfig, options$) : options$;
     }
     process.env.BUILD_OPTIONS = encodeURIComponent(JSON.stringify(buildOptions));
-    let outputs2 = await build$1(options$);
+    const outputs2 = await build$1(options$);
     outputs2.forEach((i) => {
       i.output.forEach((j) => {
         if (j.type === "asset") {
-          let fileName = filepath.replace(/^(.*)((\..*\.js)|\.cjs|\.ts)/, `$1.${j.fileName}`);
+          const fileName = filepath.replace(/^(.*)((\..*\.js)|\.cjs|\.ts)/, `$1.${j.fileName}`);
           fs$1.outputFileSync(`${outDir}/${fileName}`, j.source);
           return;
         }
@@ -97,9 +97,9 @@ const run$3 = async (options) => {
     });
   });
   await serial;
-  let outputs = fs$1.readdirSync(outDir).filter((i) => /^index(.*)(?!=(\.d))\.(cjs|js|style\.css)$/.test(i));
+  const outputs = fs$1.readdirSync(outDir).filter((i) => /^index(.*)(?!=(\.d))\.(cjs|js|style\.css)$/.test(i));
   outputs.forEach((file) => {
-    let stat = fs$1.statSync(path.resolve(outDir, file));
+    const stat = fs$1.statSync(path.resolve(outDir, file));
     stats.push({
       file: file.replace(/^(.*)(\.umd\.cjs|\.iife\.js)/, "$1.ts").replace(/^(.*)(\.js|\.cjs)/, "$1.ts"),
       format: /\.style\.css$/.test(file) ? "css" : /\.umd\.cjs$/.test(file) ? "umd" : /\.cjs$/.test(file) ? "cjs" : /\.iife\.js$/.test(file) ? "iife" : "es",
@@ -116,11 +116,11 @@ const run$2 = async (options) => {
   await styles.reduce(
     (preProcess, file) => {
       preProcess = preProcess.then(() => {
-        let filepath = path.resolve(srcDir, file);
+        const filepath = path.resolve(srcDir, file);
         const data = sass.compile(filepath, { style: "compressed" });
         return postcss().use(atImport()).use(atUrl()).use(flexBugs()).use(cssnano()).use(autoprefixer({ remove: false })).process(data.css, { from: filepath });
       }).then((source) => {
-        let output = path.resolve(outDir, `${file.replace(/\.scss$/g, ".css")}`);
+        const output = path.resolve(outDir, `${file.replace(/\.scss$/g, ".css")}`);
         fs$1.outputFileSync(output, source.css);
         return fs$1.stat(output);
       }).then((stat) => {
@@ -142,9 +142,9 @@ const run$1 = async (options) => {
   const { isVuePackage, packageDir, packageOutDir, packageSourceDir, packageOptions, commandOptions } = options;
   const done = () => {
     const stats = [];
-    let fullpath = `${packageOutDir}/index.d.ts`;
+    const fullpath = `${packageOutDir}/index.d.ts`;
     if (fs$1.existsSync(fullpath)) {
-      let stat = fs$1.statSync(fullpath);
+      const stat = fs$1.statSync(fullpath);
       stats.push({
         file: "index.d.ts",
         size: stat.size
@@ -161,22 +161,30 @@ const run$1 = async (options) => {
     });
     return done();
   }
-  let tempDir = `${packageOutDir}/temp`;
-  let rootDir = path.relative(tempDir, process.cwd());
-  fs$1.outputFileSync(`${tempDir}/tsconfig.json`, JSON.stringify({
-    extends: `${rootDir}/tsconfig.json`,
-    compilerOptions: {
-      declaration: true,
-      emitDeclarationOnly: true,
-      allowJs: true,
-      rootDir,
-      outDir: "."
-    },
-    include: [
-      path.relative(tempDir, path.resolve(packageSourceDir, `*`))
-    ]
-  }, null, "	"));
-  await Shell.spawn(isVuePackage ? "vue-tsc" : "tsc", ["-p", `${tempDir}/tsconfig.json`]);
+  const tempDir = `${packageOutDir}/temp`;
+  const rootDir = path.relative(tempDir, process.cwd());
+  const tsc = async (skipLibCheck) => {
+    fs$1.outputFileSync(`${tempDir}/tsconfig.json`, JSON.stringify({
+      extends: `${rootDir}/tsconfig.json`,
+      compilerOptions: {
+        declaration: true,
+        emitDeclarationOnly: true,
+        allowJs: true,
+        outDir: ".",
+        skipLibCheck,
+        rootDir
+      },
+      include: [
+        path.relative(tempDir, path.resolve(packageSourceDir, `*`))
+      ]
+    }, null, "	"));
+    await Shell.spawn(isVuePackage ? "vue-tsc" : "tsc", ["-p", `${tempDir}/tsconfig.json`]);
+  };
+  try {
+    await tsc(false);
+  } catch (e) {
+    await tsc(true);
+  }
   const configPath = `${tempDir}/api-extractor.json`;
   fs$1.outputFileSync(configPath, JSON.stringify({
     extends: path.relative(tempDir, path.resolve(dirname, "../api-extractor.shared.json")),
@@ -198,13 +206,21 @@ const run$1 = async (options) => {
        *
        * 版本提示：
        * 2. console-compiler-version-notice
-       * 	*** The target project appears to use TypeScript 5.1.6 which is newer 
+       * 	*** The target project appears to use TypeScript 5.1.6 which is newer
        * 		than the bundled compiler engine; consider upgrading API Extractor.
        * 3. console-preamble
        * 	Analysis will use the bundled TypeScript version 5.0.4
+       *
+       *
+       * 4. TS2590, TS2320, TS2344, TS2430
+       *  打包vue项目时，出现的warning
+       *   (TS2344) Type 'C' does not satisfy the constraint 'ElementType<any>'.
+       *   (TS2320) Interface 'Element' cannot simultaneously extend types 'VNode<RendererNode,
+       *   (TS2430) Interface 'IntrinsicElements' incorrectly extends interface 'NativeElements'
+       *   (TS2590) Expression produces a union type that is too complex to represent
        */
       messageCallback: (message) => {
-        if (message.messageId === "console-compiler-version-notice" || message.messageId === "console-preamble" || message.messageId === "TS18028") {
+        if (message.messageId === "console-compiler-version-notice" || message.messageId === "console-preamble" || ["TS18028", "TS2590", "TS2320", "TS2344", "TS2430"].includes(message.messageId)) {
           message.handled = true;
         }
       }
@@ -248,7 +264,7 @@ class Build {
     this.isNodePackage = typeof nodePackage === "string" && (nodePackage === "*" || nodePackage.split(",").includes(this.packageName));
   }
   async process() {
-    let start = Date.now();
+    const start = Date.now();
     const { cwd, workspace } = Locals.impl();
     const { packageSourceDir: srcDir, packageOptions, packageName, packageDir } = this;
     if (workspace && packageOptions?.scripts?.build && packageDir !== cwd) {
@@ -257,7 +273,7 @@ class Build {
       });
       return;
     }
-    let files = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
+    const files = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
     if (!files.length)
       return;
     const spinner = ora(`${packageName} Build ...`);
@@ -305,7 +321,7 @@ const run = (options) => Utils.autoCatch(async () => {
   options.vuePackage = Locals.getRealPackageName(options.vuePackage);
   options.reactPackage = Locals.getRealPackageName(options.reactPackage);
   options.nodePackage = Locals.getRealPackageName(options.nodePackage);
-  let packageFolderName = Locals.getPackageFolderName(options.packageName || "*");
+  const packageFolderName = Locals.getPackageFolderName(options.packageName || "*");
   let inputs = [];
   if (locals.workspace && packageFolderName === "*") {
     inputs = locals.normalizePackageFolderNames;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-builder",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,10 +29,10 @@
     }
   },
   "dependencies": {
-    "@deot/dev-react": "^2.7.0",
-    "@deot/dev-shared": "^2.7.0",
-    "@deot/dev-vue": "^2.7.0",
-    "@microsoft/api-extractor": "^7.38.4",
+    "@deot/dev-react": "^2.8.0",
+    "@deot/dev-shared": "^2.8.0",
+    "@deot/dev-vue": "^2.8.0",
+    "@microsoft/api-extractor": "^7.38.5",
     "autoprefixer": "^10.4.16",
     "chalk": "^5.3.0",
     "cssnano": "^6.0.1",
@@ -43,9 +43,9 @@
     "postcss-import": "^15.1.0",
     "postcss-url": "^10.1.3",
     "sass": "^1.69.5",
-    "vite": "^5.0.5"
+    "vite": "^5.0.8"
   },
   "devDependencies": {
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.3"
   }
 }

package/shared.config.ts

@@ -1,41 +1,41 @@
-import { createRequire } from "node:module";
+import { createRequire } from 'node:module';
 import * as path from 'node:path';
 import { defineConfig } from 'vite';
-import atImport from "postcss-import";
-import atUrl from "postcss-url";
-import flexBugs from "postcss-flexbugs-fixes";
-import cssnano from "cssnano";
-import autoprefixer from "autoprefixer";
-import type { UserConfig } from "vite";
+import atImport from 'postcss-import';
+import atUrl from 'postcss-url';
+import flexBugs from 'postcss-flexbugs-fixes';
+import cssnano from 'cssnano';
+import autoprefixer from 'autoprefixer';
+import type { UserConfig } from 'vite';
 
 const cwd = process.cwd();
 
 // options
 const buildOptions = JSON.parse(decodeURIComponent(process.env.BUILD_OPTIONS || '{}'));
 
-const { 
-	format, 
+const {
+	format,
 	external = '',
 	globals = '',
 	workspace,
-	files = [], 
-	packageName, 
-	packageSourceDir, 
-	packageOptions = {} 
+	files = [],
+	packageName,
+	packageSourceDir,
+	packageOptions = {}
 } = buildOptions;
 
 const usedForBrowser = /(iife|umd)/.test(format);
 const external$ = !usedForBrowser
 	? [
-		/^node:/,
-		/^[a-zA-Z@]/,
-		...Object
-			.keys({ 
-				...packageOptions.dependencies, 
-				...packageOptions.peerDependencies 
-			})
-			.map(i => new RegExp(`^${i}$`))
-	]
+			/^node:/,
+			/^[a-zA-Z@]/,
+			...Object
+				.keys({
+					...packageOptions.dependencies,
+					...packageOptions.peerDependencies
+				})
+				.map(i => new RegExp(`^${i}$`))
+		]
 	: external.split(',')
 		.filter((i: string) => !!i)
 		.map((i: string) => new RegExp(`^${i}$`));
@@ -46,25 +46,25 @@ const { name } = createRequire(cwd)(path.resolve(cwd, workspace ? `${workspace}/
 
 const alias = workspace && usedForBrowser
 	? [
-		{
-			find: new RegExp(`^${name}$`),
-			replacement: replacement('index')
-		},
-		{
+			{
+				find: new RegExp(`^${name}$`),
+				replacement: replacement('index')
+			},
+			{
 
-			find: new RegExp(`^${name}-(.*?)$`),
-			replacement: replacement('$1')
-		}
-	]
+				find: new RegExp(`^${name}-(.*?)$`),
+				replacement: replacement('$1')
+			}
+		]
 	: [];
 
 const getGlobalName = (name$: string) => name$.replace(/(_|-|^|.*\/)([^-_\/@])/g, (_match: any, _$1: any, $2: string) => $2.toUpperCase());
 
 export default defineConfig({
-	define: usedForBrowser 
+	define: usedForBrowser
 		? {
-			"process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
-		}
+				'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+			}
 		: {},
 	logLevel: 'silent',
 	plugins: [],
@@ -88,19 +88,19 @@ export default defineConfig({
 			formats: [format],
 			name: getGlobalName(packageName)
 		},
-		rollupOptions: { 
+		rollupOptions: {
 			external: external$,
 			output: {
-				globals: usedForBrowser 
+				globals: usedForBrowser
 					? (globals || external).split(',')
-						.filter((i: string) => !!i)
-						.reduce((pre: any, cur: string) => {
-							const [key, value] = cur.split(':');
-							if (key) {
-								pre[key] = value || getGlobalName(key);
-							}
-							return pre;
-						}, {})
+							.filter((i: string) => !!i)
+							.reduce((pre: any, cur: string) => {
+								const [key, value] = cur.split(':');
+								if (key) {
+									pre[key] = value || getGlobalName(key);
+								}
+								return pre;
+							}, {})
 					: {}
 
 			}