@deot/dev-builder 2.3.2 → 2.4.0

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

@@ -2,8 +2,9 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const devShared = require('@deot/dev-shared');
 const path = require('node:path');
+const fs$1 = require('node:fs');
+const devShared = require('@deot/dev-shared');
 const node_module = require('node:module');
 const fs = require('fs-extra');
 const chalk = require('chalk');
@@ -37,6 +38,7 @@ function _interopNamespaceDefault(e) {
 }
 
 const path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
+const fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs$1);
 const sass__namespace = /*#__PURE__*/_interopNamespaceDefault(sass);
 
 const dirname$1 = 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))));
@@ -89,7 +91,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;
             }
           });
@@ -99,12 +101,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
     });
   });
@@ -297,14 +299,33 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   if (typeof options.dryRun === "undefined") {
     options.dryRun = process.env.NODE_ENV === "UNIT";
   }
-  const { normalizePackageFolderNames } = devShared.Locals.impl();
   let packageFolderName = devShared.Locals.getPackageFolderName(options.packageName || "*");
   let inputs = [];
   if (locals.workspace && packageFolderName === "*") {
-    inputs = normalizePackageFolderNames;
+    inputs = locals.normalizePackageFolderNames;
   } else {
     inputs = [packageFolderName];
   }
+  if (options.packageName && options.packageName !== "*") {
+    let relations = [];
+    const walk = (packageNames) => {
+      relations = packageNames.concat(relations);
+      packageNames.forEach((i) => {
+        if (locals.packageRelation[i].length) {
+          walk(locals.packageRelation[i]);
+        }
+      });
+    };
+    walk(locals.packageRelation[options.packageName]);
+    relations = relations.filter((i, index, source) => source.indexOf(i) === index).map((i) => devShared.Locals.getPackageFolderName(i)).filter((i) => {
+      try {
+        return options.dryRun || !fs__namespace.existsSync(path__namespace.resolve(locals.packageDir, i, "dist"));
+      } catch (e) {
+        return false;
+      }
+    });
+    inputs = relations.concat(inputs);
+  }
   if (options.dryRun)
     return devShared.Shell.spawn(`echo ${inputs.join(" ")}`);
   await inputs.reduce(

package/dist/index.es.js

@@ -1,7 +1,8 @@
-import { Locals, Shell, Logger, Utils } from '@deot/dev-shared';
 import * as path from 'node:path';
+import * as fs from 'node:fs';
+import { Locals, Shell, Logger, Utils } from '@deot/dev-shared';
 import { createRequire } from 'node:module';
-import fs from 'fs-extra';
+import fs$1 from 'fs-extra';
 import chalk from 'chalk';
 import ora from 'ora';
 import { fileURLToPath } from 'node:url';
@@ -24,7 +25,7 @@ const run$3 = async (options) => {
   const stats = [];
   const srcDir = path.resolve(packageDir, "./src");
   const outDir = path.resolve(packageDir, "./dist");
-  let files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?(t|j)s$/.test(i)) : [];
+  let 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) => {
@@ -41,9 +42,9 @@ const run$3 = async (options) => {
         write: false
       }
     };
-    if (fs.existsSync(`${cwd}/z.build.config.ts`)) {
+    if (fs$1.existsSync(`${cwd}/z.build.config.ts`)) {
       options$.configFile = path.relative(cwd, path.resolve(cwd, "./z.build.config.ts"));
-    } else if (fs.existsSync(`${cwd}/build.config.ts`)) {
+    } else if (fs$1.existsSync(`${cwd}/build.config.ts`)) {
       options$.configFile = path.relative(cwd, path.resolve(cwd, "./build.config.ts"));
     } else {
       options$.configFile = path.relative(cwd, path.resolve(dirname$1, "../shared.config.ts"));
@@ -61,11 +62,11 @@ const run$3 = async (options) => {
         outputs2.forEach((i) => {
           i.output.forEach((j) => {
             if (j.type === "asset") {
-              fs.outputFileSync(`${outDir}/${j.fileName}`, j.source);
+              fs$1.outputFileSync(`${outDir}/${j.fileName}`, j.source);
               return;
             }
             if (j.type === "chunk") {
-              fs.outputFileSync(`${outDir}/${j.name}.${format}.js`, j.code);
+              fs$1.outputFileSync(`${outDir}/${j.name}.${format}${format === "cjs" ? "" : ".js"}`, j.code);
               return;
             }
           });
@@ -75,12 +76,12 @@ const run$3 = async (options) => {
     },
     Promise.resolve()
   );
-  let outputs = fs.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.statSync(path.resolve(outDir, 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
     });
   });
@@ -90,7 +91,7 @@ const run$3 = async (options) => {
 const run$2 = async (options) => {
   const { packageDir } = options || {};
   const srcDir = path.resolve(packageDir, "./src");
-  const styles = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?s?css$/.test(i)) : [];
+  const styles = fs$1.existsSync(srcDir) ? fs$1.readdirSync(srcDir).filter((i) => /^index\.(.*)\.?s?css$/.test(i)) : [];
   const stats = [];
   await styles.reduce(
     (preProcess, file) => {
@@ -100,8 +101,8 @@ const run$2 = async (options) => {
         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")}`);
-        fs.outputFileSync(output, source.css);
-        return fs.stat(output);
+        fs$1.outputFileSync(output, source.css);
+        return fs$1.stat(output);
       }).then((stat) => {
         stats.push({
           file,
@@ -122,8 +123,8 @@ const run$1 = async (options) => {
   const done = () => {
     const stats = [];
     let fullpath = `${packageDir}/dist/index.d.ts`;
-    if (fs.existsSync(fullpath)) {
-      let stat = fs.statSync(fullpath);
+    if (fs$1.existsSync(fullpath)) {
+      let stat = fs$1.statSync(fullpath);
       stats.push({
         file: "index.d.ts",
         size: stat.size
@@ -142,7 +143,7 @@ const run$1 = async (options) => {
   }
   let tempDir = `${packageDir}/dist/temp`;
   let rootDir = path.relative(tempDir, process.cwd());
-  fs.outputFileSync(`${tempDir}/tsconfig.json`, JSON.stringify({
+  fs$1.outputFileSync(`${tempDir}/tsconfig.json`, JSON.stringify({
     extends: `${rootDir}/tsconfig.json`,
     compilerOptions: {
       declaration: true,
@@ -156,7 +157,7 @@ const run$1 = async (options) => {
   }, null, "	"));
   await Shell.spawn("tsc", ["-p", `${tempDir}/tsconfig.json`]);
   const configPath = `${tempDir}/api-extractor.json`;
-  fs.outputFileSync(configPath, JSON.stringify({
+  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`,
     // workspace、时以temp/packages/*/src结构，否则APIExtractor会报错
@@ -194,7 +195,7 @@ const run$1 = async (options) => {
     );
     process.exitCode = 1;
   }
-  await fs.remove(`${packageDir}/dist/temp`);
+  await fs$1.remove(`${packageDir}/dist/temp`);
   return done();
 };
 
@@ -226,13 +227,13 @@ class Build {
       return;
     }
     const srcDir = path.resolve(packageDir, "./src");
-    let files = fs.existsSync(srcDir) ? fs.readdirSync(srcDir).filter((i) => /^index(.*)\.(ts|js|s?css)$/.test(i)) : [];
+    let 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 ...`);
     try {
       spinner.start();
-      await fs.emptyDir(`${packageDir}/dist`);
+      await fs$1.emptyDir(`${packageDir}/dist`);
       const scriptStats = await run$3(this);
       const scriptDuration = Date.now() - start;
       const styleStats = await run$2(this);
@@ -273,14 +274,33 @@ const run = (options) => Utils.autoCatch(async () => {
   if (typeof options.dryRun === "undefined") {
     options.dryRun = process.env.NODE_ENV === "UNIT";
   }
-  const { normalizePackageFolderNames } = Locals.impl();
   let packageFolderName = Locals.getPackageFolderName(options.packageName || "*");
   let inputs = [];
   if (locals.workspace && packageFolderName === "*") {
-    inputs = normalizePackageFolderNames;
+    inputs = locals.normalizePackageFolderNames;
   } else {
     inputs = [packageFolderName];
   }
+  if (options.packageName && options.packageName !== "*") {
+    let relations = [];
+    const walk = (packageNames) => {
+      relations = packageNames.concat(relations);
+      packageNames.forEach((i) => {
+        if (locals.packageRelation[i].length) {
+          walk(locals.packageRelation[i]);
+        }
+      });
+    };
+    walk(locals.packageRelation[options.packageName]);
+    relations = relations.filter((i, index, source) => source.indexOf(i) === index).map((i) => Locals.getPackageFolderName(i)).filter((i) => {
+      try {
+        return options.dryRun || !fs.existsSync(path.resolve(locals.packageDir, i, "dist"));
+      } catch (e) {
+        return false;
+      }
+    });
+    inputs = relations.concat(inputs);
+  }
   if (options.dryRun)
     return Shell.spawn(`echo ${inputs.join(" ")}`);
   await inputs.reduce(

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@deot/dev-builder",
-  "version": "2.3.2",
+  "version": "2.4.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,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.3.0",
+    "@deot/dev-shared": "^2.4.0",
     "@microsoft/api-extractor": "^7.36.4",
     "autoprefixer": "^10.4.15",
     "chalk": "^5.3.0",
@@ -34,7 +40,7 @@
     "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": {