@deot/dev-builder 2.3.3 → 2.5.0

package/dist/{index.cjs.js → index.cjs}

@@ -11,6 +11,8 @@ const chalk = require('chalk');
 const ora = require('ora');
 const node_url = require('node:url');
 const vite = require('vite');
+const sharedVueConfig = require('@deot/dev-vue');
+const sharedReactConfig = require('@deot/dev-react');
 const sass = require('sass');
 const postcss = require('postcss');
 const atImport = require('postcss-import');
@@ -45,11 +47,19 @@ const dirname$1 = path__namespace.dirname(node_url.fileURLToPath((typeof documen
 const run$3 = async (options) => {
   const locals = devShared.Locals.impl();
   const { cwd, workspace } = locals;
-  const { packageName, packageDir, packageOptions, commandOptions } = options || {};
-  const { scriptFormats, nodePackage } = commandOptions;
+  const {
+    packageSourceDir: srcDir,
+    packageOutDir: outDir,
+    packageName,
+    packageDir,
+    packageOptions,
+    commandOptions,
+    isNodePackage,
+    isVuePackage,
+    isReactPackage
+  } = options || {};
+  const { scriptFormats } = commandOptions;
   const stats = [];
-  const srcDir = path__namespace.resolve(packageDir, "./src");
-  const outDir = path__namespace.resolve(packageDir, "./dist");
   let files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
   if (!files.length)
     return stats;
@@ -60,6 +70,7 @@ const run$3 = async (options) => {
       workspace,
       packageName,
       packageDir,
+      packageSourceDir: srcDir,
       packageOptions
     }));
     let options$ = {
@@ -73,13 +84,13 @@ const run$3 = async (options) => {
       options$.configFile = path__namespace.relative(cwd, path__namespace.resolve(cwd, "./build.config.ts"));
     } else {
       options$.configFile = path__namespace.relative(cwd, path__namespace.resolve(dirname$1, "../shared.config.ts"));
+      options$ = isVuePackage ? vite.mergeConfig(sharedVueConfig, options$) : isReactPackage ? vite.mergeConfig(sharedReactConfig, options$) : options$;
     }
     let viteBuild = await vite.build(options$);
     return viteBuild;
   };
-  const needFilter = typeof nodePackage === "string" && (nodePackage === "*" || nodePackage.split(",").includes(packageName));
   const formats = scriptFormats.split(",").filter((i) => {
-    return !needFilter || ["es", "cjs"].includes(i);
+    return !isNodePackage || ["es", "cjs"].includes(i);
   });
   await formats.reduce(
     (preProcess, format) => {
@@ -91,7 +102,7 @@ const run$3 = async (options) => {
               return;
             }
             if (j.type === "chunk") {
-              fs.outputFileSync(`${outDir}/${j.name}.${format}.js`, j.code);
+              fs.outputFileSync(`${outDir}/${j.name}.${format}${format === "cjs" ? "" : ".js"}`, j.code);
               return;
             }
           });
@@ -101,12 +112,12 @@ const run$3 = async (options) => {
     },
     Promise.resolve()
   );
-  let outputs = fs.readdirSync(outDir).filter((i) => /^index(.*)(?!=\.d)\.js$/.test(i));
+  let outputs = fs.readdirSync(outDir).filter((i) => /^index(.*)(?!=\.d)\.c?js$/.test(i));
   outputs.forEach((file) => {
     let stat = fs.statSync(path__namespace.resolve(outDir, file));
     stats.push({
-      file: file.replace(/^(.*)(\..*\.js)/, "$1.ts"),
-      format: file.replace(/.*\.(.*)\.js/, "$1"),
+      file: file.replace(/^(.*)((\..*\.js)|\.cjs)/, "$1.ts"),
+      format: file.replace(/(.*\.(.*)\.js|.*\.(cjs))/, "$2$3"),
       size: stat.size
     });
   });
@@ -114,8 +125,7 @@ const run$3 = async (options) => {
 };
 
 const run$2 = async (options) => {
-  const { packageDir } = options || {};
-  const srcDir = path__namespace.resolve(packageDir, "./src");
+  const { packageSourceDir: srcDir, packageOutDir: outDir } = options || {};
   const styles = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?s?css$/.test(i)) : [];
   const stats = [];
   await styles.reduce(
@@ -125,7 +135,7 @@ const run$2 = async (options) => {
         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(packageDir, `./dist/${file.replace(/\.scss$/g, ".css")}`);
+        let output = path__namespace.resolve(outDir, `${file.replace(/\.scss$/g, ".css")}`);
         fs.outputFileSync(output, source.css);
         return fs.stat(output);
       }).then((stat) => {
@@ -143,11 +153,11 @@ const run$2 = async (options) => {
 
 const dirname = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
 const run$1 = async (options) => {
-  const { workspace } = devShared.Locals.impl();
-  const { packageDir, packageFolderName, packageOptions, commandOptions } = options;
+  const { workspace, packageDir: packageRootDir } = devShared.Locals.impl();
+  const { isVuePackage, packageDir, packageOutDir, packageSourceDir, packageOptions, commandOptions } = options;
   const done = () => {
     const stats = [];
-    let fullpath = `${packageDir}/dist/index.d.ts`;
+    let fullpath = `${packageOutDir}/index.d.ts`;
     if (fs.existsSync(fullpath)) {
       let stat = fs.statSync(fullpath);
       stats.push({
@@ -166,25 +176,26 @@ const run$1 = async (options) => {
     });
     return done();
   }
-  let tempDir = `${packageDir}/dist/temp`;
+  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(packageDir, `src/*`))
+      path__namespace.relative(tempDir, path__namespace.resolve(packageSourceDir, `*`))
     ]
   }, null, "	"));
-  await devShared.Shell.spawn("tsc", ["-p", `${tempDir}/tsconfig.json`]);
+  await devShared.Shell.spawn(isVuePackage ? "vue-tsc" : "tsc", ["-p", `${tempDir}/tsconfig.json`]);
   const configPath = `${tempDir}/api-extractor.json`;
   fs.outputFileSync(configPath, JSON.stringify({
     extends: path__namespace.relative(tempDir, path__namespace.resolve(dirname, "../api-extractor.shared.json")),
-    mainEntryPointFilePath: `.${workspace ? "/packages/" : ""}${packageFolderName}/src/index.d.ts`,
+    mainEntryPointFilePath: (workspace ? `./${workspace}/` : "./") + path__namespace.relative(packageRootDir, `${packageSourceDir}/index.d.ts`),
     // workspace、时以temp/packages/*/src结构，否则APIExtractor会报错
     dtsRollup: {
       publicTrimmedFilePath: "../index.d.ts"
@@ -220,7 +231,7 @@ const run$1 = async (options) => {
     );
     process.exitCode = 1;
   }
-  await fs.remove(`${packageDir}/dist/temp`);
+  await fs.remove(tempDir);
   return done();
 };
 
@@ -229,29 +240,38 @@ class Build {
   packageDir;
   packageFolderName;
   packageSourceDir;
+  packageOutDir;
   packageName;
   packageOptions;
   commandOptions;
+  isVuePackage;
+  isReactPackage;
+  isNodePackage;
   constructor(packageFolderName, commandOptions) {
-    const { workspace, packageDir, packageName, packageFolderName: packageFolderName$ } = devShared.Locals.impl();
+    const { workspace, packageDir, packageName, packageFolderName: packageFolderName$, subpackagesMap } = devShared.Locals.impl();
+    const subpackages = subpackagesMap[packageFolderName] || [];
     this.packageFolderName = packageFolderName || "";
     this.packageDir = path__namespace.resolve(packageDir, workspace ? `./${packageFolderName}` : "");
-    this.packageSourceDir = path__namespace.resolve(packageDir, "./src");
+    this.packageSourceDir = path__namespace.resolve(this.packageDir, subpackages.length ? "" : "./src");
+    this.packageOutDir = path__namespace.resolve(this.packageDir, "./dist");
     this.packageName = packageFolderName === packageFolderName$ ? packageName : `${packageName}-${packageFolderName}`;
     this.packageOptions = require$(`${this.packageDir}/package.json`);
     this.commandOptions = commandOptions;
+    const { reactPackage, vuePackage, nodePackage } = commandOptions;
+    this.isVuePackage = typeof vuePackage === "string" && (vuePackage === "*" || vuePackage.split(",").includes(this.packageName));
+    this.isReactPackage = typeof vuePackage === "string" && (vuePackage === "*" || reactPackage.split(",").includes(this.packageName));
+    this.isNodePackage = typeof nodePackage === "string" && (nodePackage === "*" || nodePackage.split(",").includes(this.packageName));
   }
   async process() {
     let start = Date.now();
     const { cwd, workspace } = devShared.Locals.impl();
-    const { packageOptions, packageName, packageDir } = this;
+    const { packageSourceDir: srcDir, packageOptions, packageName, packageDir } = this;
     if (workspace && packageOptions?.scripts?.build && packageDir !== cwd) {
       await devShared.Shell.spawn(`npm`, ["run", "build"], {
         cwd: packageDir
       });
       return;
     }
-    const srcDir = path__namespace.resolve(packageDir, "./src");
     let files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
     if (!files.length)
       return;
@@ -296,9 +316,6 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
     ...options
   };
   const locals = devShared.Locals.impl();
-  if (typeof options.dryRun === "undefined") {
-    options.dryRun = process.env.NODE_ENV === "UNIT";
-  }
   let packageFolderName = devShared.Locals.getPackageFolderName(options.packageName || "*");
   let inputs = [];
   if (locals.workspace && packageFolderName === "*") {

package/dist/index.es.js

@@ -6,7 +6,9 @@ import fs$1 from 'fs-extra';
 import chalk from 'chalk';
 import ora from 'ora';
 import { fileURLToPath } from 'node:url';
-import { build as build$1 } from 'vite';
+import { mergeConfig, build as build$1 } from 'vite';
+import sharedVueConfig from '@deot/dev-vue';
+import sharedReactConfig from '@deot/dev-react';
 import * as sass from 'sass';
 import postcss from 'postcss';
 import atImport from 'postcss-import';
@@ -20,11 +22,19 @@ const dirname$1 = path.dirname(fileURLToPath(import.meta.url));
 const run$3 = async (options) => {
   const locals = Locals.impl();
   const { cwd, workspace } = locals;
-  const { packageName, packageDir, packageOptions, commandOptions } = options || {};
-  const { scriptFormats, nodePackage } = commandOptions;
+  const {
+    packageSourceDir: srcDir,
+    packageOutDir: outDir,
+    packageName,
+    packageDir,
+    packageOptions,
+    commandOptions,
+    isNodePackage,
+    isVuePackage,
+    isReactPackage
+  } = options || {};
+  const { scriptFormats } = commandOptions;
   const stats = [];
-  const srcDir = path.resolve(packageDir, "./src");
-  const outDir = path.resolve(packageDir, "./dist");
   let files = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
   if (!files.length)
     return stats;
@@ -35,6 +45,7 @@ const run$3 = async (options) => {
       workspace,
       packageName,
       packageDir,
+      packageSourceDir: srcDir,
       packageOptions
     }));
     let options$ = {
@@ -48,13 +59,13 @@ const run$3 = async (options) => {
       options$.configFile = path.relative(cwd, path.resolve(cwd, "./build.config.ts"));
     } else {
       options$.configFile = path.relative(cwd, path.resolve(dirname$1, "../shared.config.ts"));
+      options$ = isVuePackage ? mergeConfig(sharedVueConfig, options$) : isReactPackage ? mergeConfig(sharedReactConfig, options$) : options$;
     }
     let viteBuild = await build$1(options$);
     return viteBuild;
   };
-  const needFilter = typeof nodePackage === "string" && (nodePackage === "*" || nodePackage.split(",").includes(packageName));
   const formats = scriptFormats.split(",").filter((i) => {
-    return !needFilter || ["es", "cjs"].includes(i);
+    return !isNodePackage || ["es", "cjs"].includes(i);
   });
   await formats.reduce(
     (preProcess, format) => {
@@ -66,7 +77,7 @@ const run$3 = async (options) => {
               return;
             }
             if (j.type === "chunk") {
-              fs$1.outputFileSync(`${outDir}/${j.name}.${format}.js`, j.code);
+              fs$1.outputFileSync(`${outDir}/${j.name}.${format}${format === "cjs" ? "" : ".js"}`, j.code);
               return;
             }
           });
@@ -76,12 +87,12 @@ const run$3 = async (options) => {
     },
     Promise.resolve()
   );
-  let outputs = fs$1.readdirSync(outDir).filter((i) => /^index(.*)(?!=\.d)\.js$/.test(i));
+  let outputs = fs$1.readdirSync(outDir).filter((i) => /^index(.*)(?!=\.d)\.c?js$/.test(i));
   outputs.forEach((file) => {
     let stat = fs$1.statSync(path.resolve(outDir, file));
     stats.push({
-      file: file.replace(/^(.*)(\..*\.js)/, "$1.ts"),
-      format: file.replace(/.*\.(.*)\.js/, "$1"),
+      file: file.replace(/^(.*)((\..*\.js)|\.cjs)/, "$1.ts"),
+      format: file.replace(/(.*\.(.*)\.js|.*\.(cjs))/, "$2$3"),
       size: stat.size
     });
   });
@@ -89,8 +100,7 @@ const run$3 = async (options) => {
 };
 
 const run$2 = async (options) => {
-  const { packageDir } = options || {};
-  const srcDir = path.resolve(packageDir, "./src");
+  const { packageSourceDir: srcDir, packageOutDir: outDir } = options || {};
   const styles = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?s?css$/.test(i)) : [];
   const stats = [];
   await styles.reduce(
@@ -100,7 +110,7 @@ const run$2 = async (options) => {
         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(packageDir, `./dist/${file.replace(/\.scss$/g, ".css")}`);
+        let output = path.resolve(outDir, `${file.replace(/\.scss$/g, ".css")}`);
         fs$1.outputFileSync(output, source.css);
         return fs$1.stat(output);
       }).then((stat) => {
@@ -118,11 +128,11 @@ const run$2 = async (options) => {
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 const run$1 = async (options) => {
-  const { workspace } = Locals.impl();
-  const { packageDir, packageFolderName, packageOptions, commandOptions } = options;
+  const { workspace, packageDir: packageRootDir } = Locals.impl();
+  const { isVuePackage, packageDir, packageOutDir, packageSourceDir, packageOptions, commandOptions } = options;
   const done = () => {
     const stats = [];
-    let fullpath = `${packageDir}/dist/index.d.ts`;
+    let fullpath = `${packageOutDir}/index.d.ts`;
     if (fs$1.existsSync(fullpath)) {
       let stat = fs$1.statSync(fullpath);
       stats.push({
@@ -141,25 +151,26 @@ const run$1 = async (options) => {
     });
     return done();
   }
-  let tempDir = `${packageDir}/dist/temp`;
+  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(packageDir, `src/*`))
+      path.relative(tempDir, path.resolve(packageSourceDir, `*`))
     ]
   }, null, "	"));
-  await Shell.spawn("tsc", ["-p", `${tempDir}/tsconfig.json`]);
+  await Shell.spawn(isVuePackage ? "vue-tsc" : "tsc", ["-p", `${tempDir}/tsconfig.json`]);
   const configPath = `${tempDir}/api-extractor.json`;
   fs$1.outputFileSync(configPath, JSON.stringify({
     extends: path.relative(tempDir, path.resolve(dirname, "../api-extractor.shared.json")),
-    mainEntryPointFilePath: `.${workspace ? "/packages/" : ""}${packageFolderName}/src/index.d.ts`,
+    mainEntryPointFilePath: (workspace ? `./${workspace}/` : "./") + path.relative(packageRootDir, `${packageSourceDir}/index.d.ts`),
     // workspace、时以temp/packages/*/src结构，否则APIExtractor会报错
     dtsRollup: {
       publicTrimmedFilePath: "../index.d.ts"
@@ -195,7 +206,7 @@ const run$1 = async (options) => {
     );
     process.exitCode = 1;
   }
-  await fs$1.remove(`${packageDir}/dist/temp`);
+  await fs$1.remove(tempDir);
   return done();
 };
 
@@ -204,29 +215,38 @@ class Build {
   packageDir;
   packageFolderName;
   packageSourceDir;
+  packageOutDir;
   packageName;
   packageOptions;
   commandOptions;
+  isVuePackage;
+  isReactPackage;
+  isNodePackage;
   constructor(packageFolderName, commandOptions) {
-    const { workspace, packageDir, packageName, packageFolderName: packageFolderName$ } = Locals.impl();
+    const { workspace, packageDir, packageName, packageFolderName: packageFolderName$, subpackagesMap } = Locals.impl();
+    const subpackages = subpackagesMap[packageFolderName] || [];
     this.packageFolderName = packageFolderName || "";
     this.packageDir = path.resolve(packageDir, workspace ? `./${packageFolderName}` : "");
-    this.packageSourceDir = path.resolve(packageDir, "./src");
+    this.packageSourceDir = path.resolve(this.packageDir, subpackages.length ? "" : "./src");
+    this.packageOutDir = path.resolve(this.packageDir, "./dist");
     this.packageName = packageFolderName === packageFolderName$ ? packageName : `${packageName}-${packageFolderName}`;
     this.packageOptions = require$(`${this.packageDir}/package.json`);
     this.commandOptions = commandOptions;
+    const { reactPackage, vuePackage, nodePackage } = commandOptions;
+    this.isVuePackage = typeof vuePackage === "string" && (vuePackage === "*" || vuePackage.split(",").includes(this.packageName));
+    this.isReactPackage = typeof vuePackage === "string" && (vuePackage === "*" || reactPackage.split(",").includes(this.packageName));
+    this.isNodePackage = typeof nodePackage === "string" && (nodePackage === "*" || nodePackage.split(",").includes(this.packageName));
   }
   async process() {
     let start = Date.now();
     const { cwd, workspace } = Locals.impl();
-    const { packageOptions, packageName, packageDir } = this;
+    const { packageSourceDir: srcDir, packageOptions, packageName, packageDir } = this;
     if (workspace && packageOptions?.scripts?.build && packageDir !== cwd) {
       await Shell.spawn(`npm`, ["run", "build"], {
         cwd: packageDir
       });
       return;
     }
-    const srcDir = path.resolve(packageDir, "./src");
     let files = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
     if (!files.length)
       return;
@@ -271,9 +291,6 @@ const run = (options) => Utils.autoCatch(async () => {
     ...options
   };
   const locals = Locals.impl();
-  if (typeof options.dryRun === "undefined") {
-    options.dryRun = process.env.NODE_ENV === "UNIT";
-  }
   let packageFolderName = Locals.getPackageFolderName(options.packageName || "*");
   let inputs = [];
   if (locals.workspace && packageFolderName === "*") {

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-builder",
-  "version": "2.3.3",
+  "version": "2.5.0",
+  "type": "module",
   "main": "dist/index.es.js",
-  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "dist",
     "api-extractor.shared.json",
@@ -23,18 +29,20 @@
     }
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.3.0",
+    "@deot/dev-react": "^2.5.0",
+    "@deot/dev-shared": "^2.5.0",
+    "@deot/dev-vue": "^2.5.0",
     "@microsoft/api-extractor": "^7.36.4",
     "autoprefixer": "^10.4.15",
     "chalk": "^5.3.0",
     "cssnano": "^6.0.1",
     "fs-extra": "^11.1.1",
     "ora": "^7.0.1",
-    "postcss": "^8.4.28",
+    "postcss": "^8.4.29",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-url": "^10.1.3",
-    "sass": "^1.65.1",
+    "sass": "^1.66.1",
     "vite": "^4.4.9"
   },
   "devDependencies": {

package/shared.config.ts

@@ -18,7 +18,7 @@ const {
 	workspace,
 	files = [], 
 	packageName, 
-	packageDir, 
+	packageSourceDir, 
 	packageOptions = {} 
 } = buildOptions;
 
@@ -73,7 +73,7 @@ export default defineConfig({
 		minify: false,
 		target: 'esnext',
 		lib: {
-			entry: files.map((file: string) => path.resolve(packageDir, './src', file)),
+			entry: files.map((file: string) => path.resolve(packageSourceDir, file)),
 			formats: [format],
 			name: packageName.replace(/(_|-|^|.*\/)([^-_\/@])/g, (_match: any, _$1: any, $2: string) => $2.toUpperCase())
 		},