@es-pkg/publish 1.0.11 → 1.0.12

package/cjs/index.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="undertaker" />
-declare const _default: import("undertaker").TaskFunction;
-export default _default;
+import * as undertaker from 'undertaker';
+
+declare const _default: undertaker.TaskFunction;
+
+export { _default as default };

package/cjs/index.js

@@ -39,9 +39,11 @@ gulp__default.default.task("del-cjs-iife-es", async () => {
     await utils.remove(`${path__default.default.join(`${publishDir}`, config.config.iife)}`);
     utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.iife)} \u7ED3\u675F`);
   }
-  utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.cjs)} \u5F00\u59CB`);
-  await utils.remove(`${path__default.default.join(`${publishDir}`, config.config.cjs)}`);
-  utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.cjs)} \u7ED3\u675F`);
+  if (config.config.cjs) {
+    utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.cjs)} \u5F00\u59CB`);
+    await utils.remove(`${path__default.default.join(`${publishDir}`, config.config.cjs)}`);
+    utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.cjs)} \u7ED3\u675F`);
+  }
   utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.es)} \u5F00\u59CB`);
   await utils.remove(`${path__default.default.join(`${publishDir}`, config.config.es)}`);
   utils.log(`\u5220\u9664 ${path__default.default.join(`${publishDir}`, config.config.es)} \u7ED3\u675F`);
@@ -104,31 +106,56 @@ gulp__default.default.task("copy-info", gulp.series(async () => {
   }
   const publishDir2 = config.resolveApp(config.config.publishDir);
   const es = path__default.default.basename(config.config.es);
-  const cjs = path__default.default.basename(config.config.cjs);
+  const cjs = config.config.cjs ? path__default.default.basename(config.config.cjs) : "";
   const iife = config.config.iife ? path__default.default.basename(config.config.iife) : "";
   const has = {
     es: fs__default.default.existsSync(path__default.default.join(publishDir2, es)),
-    cjs: fs__default.default.existsSync(path__default.default.join(publishDir2, cjs)),
+    cjs: config.config.cjs && fs__default.default.existsSync(path__default.default.join(publishDir2, cjs)),
     iife: iife && fs__default.default.existsSync(path__default.default.join(publishDir2, iife))
   };
   const entry = (base, sub = config.config.entry) => config.getPublishedEntry(base, sub);
-  if (has.es || has.cjs) {
-    json.main = entry(config.config.cjs) || entry(config.config.es);
-  }
-  if (has.es) {
-    json.module = entry(config.config.es);
-  }
-  if (has.iife) {
-    json.browser = entry(config.config.iife, "es");
-  }
-  if (!json.types) {
-    const typeEntry = has.es ? entry(config.config.es) : has.cjs ? entry(config.config.cjs) : "";
-    if (typeEntry) {
-      const { dir, name, ext } = path__default.default.parse(typeEntry);
-      json.types = [".ts", ".tsx"].includes(ext) ? typeEntry : `${dir}/${name}.d.ts`;
+  const fillField = (field, call) => {
+    if (!json[field]) {
+      return call();
     }
-  }
-  json.files = Array.from(/* @__PURE__ */ new Set([has.es && es, has.cjs && cjs, has.iife && iife])).filter(Boolean);
+    const fields = Array.isArray(json[field]) ? json[field] : [json[field]];
+    const matched = fields.every((item) => {
+      const p = path__default.default.join(publishDir2, item.replaceAll(".ts", ".js"));
+      return fs__default.default.existsSync(config.resolveApp(item)) && fs__default.default.existsSync(config.resolveApp(p));
+    });
+    if (matched) {
+      json[field] = Array.isArray(json[field]) ? json[field].map((item) => item.replaceAll(".ts", ".js")) : json[field].replaceAll(".ts", field === "typings" ? ".d.ts" : ".js");
+    } else {
+      call();
+    }
+  };
+  fillField("main", () => {
+    if (has.es || has.cjs) {
+      json.main = (config.config.cjs ? entry(config.config.cjs) : "") || entry(config.config.es);
+    }
+  });
+  fillField("module", () => {
+    if (has.es) {
+      json.module = entry(config.config.es);
+    }
+  });
+  fillField("browser", () => {
+    if (has.iife) {
+      json.browser = entry(config.config.iife, "es");
+    }
+  });
+  fillField("types", () => {
+    if (!json.types) {
+      const typeEntry = has.es ? entry(config.config.es) : has.cjs ? config.config.cjs ? entry(config.config.cjs) : "" : "";
+      if (typeEntry) {
+        const { dir, name, ext } = path__default.default.parse(typeEntry);
+        json.types = [".ts", ".tsx"].includes(ext) ? typeEntry : `${dir}/${name}.d.ts`;
+      }
+    }
+  });
+  fillField("files", () => {
+    json.files = Array.from(/* @__PURE__ */ new Set([has.es && es, has.cjs && cjs, has.iife && iife])).filter(Boolean);
+  });
   if (json.dependencies) {
     json.dependencies = Object.fromEntries(Object.entries(json.dependencies).map(([key, value]) => {
       if (value.startsWith("file://") || value.startsWith("workspace:")) {
@@ -166,7 +193,10 @@ gulp__default.default.task("copy-iife", (c) => {
     showChange: false
   })).pipe(gulp__default.default.dest(path__default.default.join(`${publishDir}`, path__default.default.basename(config.config.iife))));
 });
-gulp__default.default.task("copy-cjs", () => {
+gulp__default.default.task("copy-cjs", (c) => {
+  if (!config.config.cjs) {
+    return c();
+  }
   return gulp__default.default.src([`${config.config.cjs}/.**`, `${config.config.cjs}/**`]).pipe(logger__default.default({
     before: "copy cjs...",
     after: "copy cjs complete!",
@@ -182,12 +212,11 @@ gulp__default.default.task("copy-es", () => {
 });
 gulp__default.default.task("remove-__npm__", gulp.series(() => {
   let promises = [];
-  const includes = [config.config.es, config.config.cjs, config.config.iife].flatMap((val) => {
+  const includes = [config.config.es, config.config.cjs, config.config.iife].filter(Boolean).flatMap((val) => {
     if (!val) {
       return [];
     }
-    const some = config.getIncludeFiles().some((item) => path__default.default.resolve(val).startsWith(path__default.default.resolve(item.path)));
-    return some ? [] : [val];
+    return [path__default.default.join(`${publishDir}`, path__default.default.basename(val))];
   });
   promises = includes.map((item) => utils.remove(item));
   return Promise.all(promises);

package/esm/index.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="undertaker" />
-declare const _default: import("undertaker").TaskFunction;
-export default _default;
+import * as undertaker from 'undertaker';
+
+declare const _default: undertaker.TaskFunction;
+
+export { _default as default };

package/esm/index.js

@@ -4,7 +4,7 @@ import logger from '@es-pkg/gulp-logger';
 import fs from 'fs';
 import path from 'path';
 import { log, remove, run, fetch, autoUpgrade, compare, success, error } from '@es-pkg/utils';
-import { config, pkg, resolveApp, getPublishedEntry, getIncludeFiles } from '@es-pkg/config';
+import { config, pkg, resolveApp, getPublishedEntry } from '@es-pkg/config';
 import prompts from 'prompts';
 
 const scoped = /^@[a-zA-Z0-9-]+\/.+$/;
@@ -26,9 +26,11 @@ gulp.task("del-cjs-iife-es", async () => {
     await remove(`${path.join(`${publishDir}`, config.iife)}`);
     log(`\u5220\u9664 ${path.join(`${publishDir}`, config.iife)} \u7ED3\u675F`);
   }
-  log(`\u5220\u9664 ${path.join(`${publishDir}`, config.cjs)} \u5F00\u59CB`);
-  await remove(`${path.join(`${publishDir}`, config.cjs)}`);
-  log(`\u5220\u9664 ${path.join(`${publishDir}`, config.cjs)} \u7ED3\u675F`);
+  if (config.cjs) {
+    log(`\u5220\u9664 ${path.join(`${publishDir}`, config.cjs)} \u5F00\u59CB`);
+    await remove(`${path.join(`${publishDir}`, config.cjs)}`);
+    log(`\u5220\u9664 ${path.join(`${publishDir}`, config.cjs)} \u7ED3\u675F`);
+  }
   log(`\u5220\u9664 ${path.join(`${publishDir}`, config.es)} \u5F00\u59CB`);
   await remove(`${path.join(`${publishDir}`, config.es)}`);
   log(`\u5220\u9664 ${path.join(`${publishDir}`, config.es)} \u7ED3\u675F`);
@@ -91,31 +93,56 @@ gulp.task("copy-info", series(async () => {
   }
   const publishDir2 = resolveApp(config.publishDir);
   const es = path.basename(config.es);
-  const cjs = path.basename(config.cjs);
+  const cjs = config.cjs ? path.basename(config.cjs) : "";
   const iife = config.iife ? path.basename(config.iife) : "";
   const has = {
     es: fs.existsSync(path.join(publishDir2, es)),
-    cjs: fs.existsSync(path.join(publishDir2, cjs)),
+    cjs: config.cjs && fs.existsSync(path.join(publishDir2, cjs)),
     iife: iife && fs.existsSync(path.join(publishDir2, iife))
   };
   const entry = (base, sub = config.entry) => getPublishedEntry(base, sub);
-  if (has.es || has.cjs) {
-    json.main = entry(config.cjs) || entry(config.es);
-  }
-  if (has.es) {
-    json.module = entry(config.es);
-  }
-  if (has.iife) {
-    json.browser = entry(config.iife, "es");
-  }
-  if (!json.types) {
-    const typeEntry = has.es ? entry(config.es) : has.cjs ? entry(config.cjs) : "";
-    if (typeEntry) {
-      const { dir, name, ext } = path.parse(typeEntry);
-      json.types = [".ts", ".tsx"].includes(ext) ? typeEntry : `${dir}/${name}.d.ts`;
+  const fillField = (field, call) => {
+    if (!json[field]) {
+      return call();
     }
-  }
-  json.files = Array.from(/* @__PURE__ */ new Set([has.es && es, has.cjs && cjs, has.iife && iife])).filter(Boolean);
+    const fields = Array.isArray(json[field]) ? json[field] : [json[field]];
+    const matched = fields.every((item) => {
+      const p = path.join(publishDir2, item.replaceAll(".ts", ".js"));
+      return fs.existsSync(resolveApp(item)) && fs.existsSync(resolveApp(p));
+    });
+    if (matched) {
+      json[field] = Array.isArray(json[field]) ? json[field].map((item) => item.replaceAll(".ts", ".js")) : json[field].replaceAll(".ts", field === "typings" ? ".d.ts" : ".js");
+    } else {
+      call();
+    }
+  };
+  fillField("main", () => {
+    if (has.es || has.cjs) {
+      json.main = (config.cjs ? entry(config.cjs) : "") || entry(config.es);
+    }
+  });
+  fillField("module", () => {
+    if (has.es) {
+      json.module = entry(config.es);
+    }
+  });
+  fillField("browser", () => {
+    if (has.iife) {
+      json.browser = entry(config.iife, "es");
+    }
+  });
+  fillField("types", () => {
+    if (!json.types) {
+      const typeEntry = has.es ? entry(config.es) : has.cjs ? config.cjs ? entry(config.cjs) : "" : "";
+      if (typeEntry) {
+        const { dir, name, ext } = path.parse(typeEntry);
+        json.types = [".ts", ".tsx"].includes(ext) ? typeEntry : `${dir}/${name}.d.ts`;
+      }
+    }
+  });
+  fillField("files", () => {
+    json.files = Array.from(/* @__PURE__ */ new Set([has.es && es, has.cjs && cjs, has.iife && iife])).filter(Boolean);
+  });
   if (json.dependencies) {
     json.dependencies = Object.fromEntries(Object.entries(json.dependencies).map(([key, value]) => {
       if (value.startsWith("file://") || value.startsWith("workspace:")) {
@@ -153,7 +180,10 @@ gulp.task("copy-iife", (c) => {
     showChange: false
   })).pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.iife))));
 });
-gulp.task("copy-cjs", () => {
+gulp.task("copy-cjs", (c) => {
+  if (!config.cjs) {
+    return c();
+  }
   return gulp.src([`${config.cjs}/.**`, `${config.cjs}/**`]).pipe(logger({
     before: "copy cjs...",
     after: "copy cjs complete!",
@@ -169,12 +199,11 @@ gulp.task("copy-es", () => {
 });
 gulp.task("remove-__npm__", series(() => {
   let promises = [];
-  const includes = [config.es, config.cjs, config.iife].flatMap((val) => {
+  const includes = [config.es, config.cjs, config.iife].filter(Boolean).flatMap((val) => {
     if (!val) {
       return [];
     }
-    const some = getIncludeFiles().some((item) => path.resolve(val).startsWith(path.resolve(item.path)));
-    return some ? [] : [val];
+    return [path.join(`${publishDir}`, path.basename(val))];
   });
   promises = includes.map((item) => remove(item));
   return Promise.all(promises);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@es-pkg/publish",
-	"version": "1.0.11",
+	"version": "1.0.12",
 	"description": "组件打包工具",
 	"main": "cjs/index.js",
 	"engines": {

package/cjs/type.d.ts

@@ -1,46 +0,0 @@
-/// <reference types="node" />
-
-declare module "rename" {
-    export = rename;
-
-    function rename(filepath: string | rename.FileObject, transformer: rename.Transformer): rename.FilePath;
-
-    namespace rename {
-        interface FileObject {
-            // using package's terminology
-            dirname?: string | undefined;
-            basename?: string | undefined;
-            extname?: string | undefined;
-            path?: string | undefined;
-            hash?: string | undefined; // not populated by package
-            origin?: string | undefined;
-        }
-
-        interface Specification {
-            dirname?: string | undefined;
-            prefix?: string | undefined;
-            basename?: string | undefined;
-            suffix?: string | undefined;
-            extname?: string | undefined;
-        }
-
-        type FilePath =
-            | string
-            | Specification;
-
-        type Transformer =
-            | ((spec: FileObject) => FilePath)
-            | FilePath;
-
-        interface ParsedFileObject {
-            dirname: string;
-            extname: string;
-            basename: string;
-            origin: string;
-        }
-
-        function parse(filename: string | Partial<ParsedFileObject>): ParsedFileObject;
-
-        function stringify(obj: FileObject): string;
-    }
-}

package/esm/type.d.ts

@@ -1,46 +0,0 @@
-/// <reference types="node" />
-
-declare module "rename" {
-    export = rename;
-
-    function rename(filepath: string | rename.FileObject, transformer: rename.Transformer): rename.FilePath;
-
-    namespace rename {
-        interface FileObject {
-            // using package's terminology
-            dirname?: string | undefined;
-            basename?: string | undefined;
-            extname?: string | undefined;
-            path?: string | undefined;
-            hash?: string | undefined; // not populated by package
-            origin?: string | undefined;
-        }
-
-        interface Specification {
-            dirname?: string | undefined;
-            prefix?: string | undefined;
-            basename?: string | undefined;
-            suffix?: string | undefined;
-            extname?: string | undefined;
-        }
-
-        type FilePath =
-            | string
-            | Specification;
-
-        type Transformer =
-            | ((spec: FileObject) => FilePath)
-            | FilePath;
-
-        interface ParsedFileObject {
-            dirname: string;
-            extname: string;
-            basename: string;
-            origin: string;
-        }
-
-        function parse(filename: string | Partial<ParsedFileObject>): ParsedFileObject;
-
-        function stringify(obj: FileObject): string;
-    }
-}