@es-pkg/publish 1.0.6 → 1.0.7

package/README.md

@@ -29,4 +29,4 @@
 
 #### default
 
-*   default(done:`Undertaker.TaskCallback`): `void` | `EventEmitter`<`DefaultEventMap`\> | `internal.Stream` | `"child_process".ChildProcess` | `asyncDone.Observable`<`any`\> | `PromiseLike`<`any`\>
+*   default(done:`Undertaker.TaskCallback`): `void` | `EventEmitter`<`DefaultEventMap`\> | `internal.Stream` | `PromiseLike`<`any`\> | `"child_process".ChildProcess` | `asyncDone.Observable`<`any`\>

package/cjs/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="undertaker" />
+declare const _default: import("undertaker").TaskFunction;
+export default _default;

package/cjs/index.js

@@ -0,0 +1,242 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var gulp = require('@es-pkg/gulp');
+var chalk = require('chalk');
+var logger = require('@es-pkg/gulp-logger');
+var fs = require('fs');
+var path = require('path');
+var utils = require('@es-pkg/utils');
+var config = require('@es-pkg/config');
+var prompts = require('prompts');
+
+const scoped = /^@[a-zA-Z0-9-]+\/.+$/;
+const REGISTRY = config.config.publishRegistry;
+const json = config.pkg;
+const publishDir = path.join(config.config.publishDir, './__npm__');
+gulp.task('clean', async () => {
+    utils.log(`清除${publishDir}开始`);
+    try {
+        await utils.remove(publishDir);
+        utils.log(`清除${publishDir}完成`);
+    }
+    catch (e) {
+        utils.log(`清除${publishDir}失败：`, e);
+    }
+});
+gulp.task('del-cjs-iife-es', async () => {
+    if (config.config.iife) {
+        utils.log(`删除 ${path.join(`${publishDir}`, config.config.iife)} 开始`);
+        await utils.remove(`${path.join(`${publishDir}`, config.config.iife)}`);
+        utils.log(`删除 ${path.join(`${publishDir}`, config.config.iife)} 结束`);
+    }
+    utils.log(`删除 ${path.join(`${publishDir}`, config.config.cjs)} 开始`);
+    await utils.remove(`${path.join(`${publishDir}`, config.config.cjs)}`);
+    utils.log(`删除 ${path.join(`${publishDir}`, config.config.cjs)} 结束`);
+    utils.log(`删除 ${path.join(`${publishDir}`, config.config.es)} 开始`);
+    await utils.remove(`${path.join(`${publishDir}`, config.config.es)}`);
+    utils.log(`删除 ${path.join(`${publishDir}`, config.config.es)} 结束`);
+});
+gulp.task('copy-info', gulp.series(async () => {
+    utils.log(`生成 package 开始`);
+    let errored = false;
+    let version = "";
+    try {
+        const { stdout } = await utils.run(`npm`, ['view', config.pkg.name, 'version'], {
+            stdio: undefined,
+            cwd: path.join(process.cwd(), config.config.publishDir),
+        });
+        if (stdout) {
+            version = stdout;
+        }
+        if (!version) {
+            const controller = new AbortController();
+            const timer = setTimeout(() => {
+                controller.abort();
+            }, 3000);
+            const start = Date.now();
+            const url = `https://img.shields.io/npm/v/${config.pkg.name}`;
+            const response = await utils.fetch(url, {
+                signal: controller.signal
+            }).finally(async () => {
+                utils.log.warn(`远程获取版本花费时间:${Date.now() - start}`);
+            });
+            const htmlString = await response.text();
+            const regex = /<title>npm: v([\d.]+)<\/title>/;
+            version = htmlString.match(regex)?.[1];
+            clearTimeout(timer);
+        }
+        utils.log(`远程获取版本信息 tag:`, version);
+        if (version) {
+            json.version = utils.compare(config.pkg.version, version) <= 0 ? utils.autoUpgrade(version) : config.pkg.version;
+        }
+        else {
+            errored = true;
+        }
+    }
+    catch (e) {
+        errored = true;
+    }
+    if (errored) {
+        const { version } = await prompts({
+            type: 'text',
+            name: 'version',
+            message: '远程获取版本失败！请输入版本号',
+            initial: config.pkg.version
+        });
+        json.version = version;
+    }
+    delete json.devDependencies;
+    delete json.scripts;
+    if (!json.publishConfig) {
+        json.publishConfig = {
+            access: "public",
+            registry: REGISTRY
+        };
+    }
+    const es = path.basename(config.config.es);
+    const cjs = path.basename(config.config.cjs);
+    const iife = config.config.iife ? path.basename(config.config.iife) : "";
+    const CJSExists = fs.existsSync(path.join(`${config.config.publishDir}`, cjs));
+    const ESExists = fs.existsSync(path.join(`${config.config.publishDir}`, es));
+    const IIFEExists = iife ? fs.existsSync(path.join(`${config.config.publishDir}`, iife)) : false;
+    const mainExists = !!json.main && fs.existsSync(path.join(config.resolveApp(''), json.main));
+    const browserExists = !!json.browser && fs.existsSync(path.join(config.resolveApp(''), json.main));
+    const moduleExists = !!json.module && fs.existsSync(path.join(config.resolveApp(''), json.main));
+    const _es = config.getEntrypoint(config.config.es);
+    const _cjs = config.getEntrypoint(config.config.cjs);
+    if (!mainExists) {
+        if (ESExists) {
+            json.main = _es || _cjs;
+        }
+        if (CJSExists) {
+            json.main = _cjs || _es;
+        }
+    }
+    if (!moduleExists && CJSExists) {
+        json.module = _es || _cjs;
+    }
+    if (!browserExists && IIFEExists) {
+        json.browser = config.getEntrypoint(config.config.iife);
+    }
+    if (!json.types) {
+        const type = config.getEntrypoint(config.config.es, config.config.typings) || _es || _cjs;
+        const { dir, name, ext } = path.parse(type);
+        json.types = ['.ts', '.tsx'].includes(ext) ? type : `${dir}/${name}.d.ts`;
+    }
+    json.files = Array.from(new Set([ESExists && es, CJSExists && cjs, IIFEExists && iife])).filter(Boolean);
+    json.dependencies = Object.fromEntries(Object.entries(json.dependencies).map(([key, value]) => {
+        if (value.startsWith('file://') || value.startsWith('workspace:')) {
+            return [key, 'latest'];
+        }
+        return [key, value];
+    }));
+    let jsonStr = JSON.stringify(json, null, "\t");
+    const ex = fs.existsSync(`${config.config.publishDir}/`);
+    if (!ex) {
+        fs.mkdirSync(`${config.config.publishDir}/`, { recursive: true });
+    }
+    fs.writeFileSync(`${config.config.publishDir}/package.json`, jsonStr);
+    utils.log(`生成 package完成`, chalk.green(json.version));
+    utils.log(`生成 .npmrc 开始`);
+    fs.writeFileSync(`${config.config.publishDir}/.npmrc`, `registry=${REGISTRY}`);
+    utils.log(`生成 .npmrc 完成`);
+    utils.log(`拷贝 README 开始`);
+}, () => {
+    return gulp.src([`./README.md`])
+        .pipe(logger({
+        before: 'copy README...',
+        after: 'copy README complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(`${config.config.publishDir}/`));
+}));
+gulp.task('copy-iife', (c) => {
+    if (!config.config.iife) {
+        return c();
+    }
+    utils.log(`拷贝 '/iife/**' 开始`);
+    return gulp.src([`${config.config.iife}/.**`, `${config.config.iife}/**`])
+        .pipe(logger({
+        before: 'copy iife...',
+        after: 'copy iife complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.config.iife))));
+});
+gulp.task('copy-cjs', () => {
+    return gulp.src([`${config.config.cjs}/.**`, `${config.config.cjs}/**`])
+        .pipe(logger({
+        before: 'copy cjs...',
+        after: 'copy cjs complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.config.cjs))));
+});
+gulp.task('copy-es', () => {
+    return gulp.src([`${config.config.es}/.**`, `${config.config.es}/**`])
+        .pipe(logger({
+        before: 'copy es...',
+        after: 'copy es complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.config.es))));
+});
+gulp.task('remove-__npm__', gulp.series(() => {
+    let promises = [];
+    const includes = [config.config.es, config.config.cjs, config.config.iife].flatMap(val => {
+        if (!val) {
+            return [];
+        }
+        const some = config.getIncludeFiles().some(item => path.resolve(val).startsWith(path.resolve(item.path)));
+        return some ? [] : [val];
+    });
+    promises = includes.map(item => utils.remove(item));
+    return Promise.all(promises);
+}, () => {
+    return gulp.src([`${publishDir}/**`, `${publishDir}/.**`])
+        .pipe(logger({
+        before: 'copy __npm__...',
+        after: 'copy __npm__ complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(`${config.config.publishDir}/`));
+}, async () => {
+    await utils.remove(publishDir);
+}));
+gulp.task('npm-publish', async function () {
+    let publishAccess = [];
+    //公共包
+    if (scoped.test(config.pkg.name)) {
+        publishAccess = ["--access", "public"];
+    }
+    if (config.config.publishAccess) {
+        publishAccess = config.config.publishAccess;
+    }
+    try {
+        const { stdout } = await utils.run(`npm`, ["whoami", '--registry', REGISTRY], { stdio: undefined });
+        utils.log.warn(`===npm登录信息===>${stdout}`);
+    }
+    catch (e) {
+        utils.log.warn(`===npm${REGISTRY}未登录！！请登录`);
+        await utils.run(`npm`, ["login", '--registry', REGISTRY]);
+    }
+    const { confirm } = await prompts({
+        type: 'confirm',
+        name: 'confirm',
+        message: '是否发布？',
+    });
+    if (confirm) {
+        await utils.run(`npm`, ['publish', ...publishAccess, '--registry', REGISTRY], {
+            cwd: path.join(process.cwd(), config.config.publishDir),
+        });
+        utils.success(`${json.name}@${json.version}:发布成功！`);
+    }
+    else {
+        utils.error(`${json.name}@${json.version}:取消成功！`);
+    }
+});
+var index = gulp.series('clean', 'del-cjs-iife-es', 'copy-cjs', 'copy-es', 'copy-iife', 'remove-__npm__', 'copy-info', 'npm-publish');
+
+exports.default = index;

package/esm/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="undertaker" />
+declare const _default: import("undertaker").TaskFunction;
+export default _default;

package/{src/index.ts → esm/index.js}

@@ -1,242 +1,238 @@
-import gulp, {series} from '@es-pkg/gulp'
-import chalk from 'chalk';// 改变屏幕文字颜色
-import logger from '@es-pkg/gulp-logger'
-import fs from "fs"
-import path from "path";
-import {autoUpgrade, compare, remove, run, error, log, success, fetch} from "@es-pkg/utils";
-import {config, getEntrypoint, getIncludeFiles, pkg, resolveApp} from "@es-pkg/config";
-import prompts from "prompts"
-
-const scoped = /^@[a-zA-Z0-9-]+\/.+$/;
-const REGISTRY = config.publishRegistry
-
-const json: Record<string, string | object> = pkg;
-
-const publishDir = path.join(config.publishDir, './__npm__')
-
-gulp.task('clean', async () => {
-    log(`清除${publishDir}开始`)
-    try {
-        await remove(publishDir);
-        log(`清除${publishDir}完成`)
-    } catch (e) {
-        log(`清除${publishDir}失败：`, e)
-    }
-});
-gulp.task('del-cjs-iife-es', async () => {
-    log(`删除 ${path.join(`${publishDir}`, config.iife)} 开始`)
-    await remove(`${path.join(`${publishDir}`, config.iife)}`);
-    log(`删除 ${path.join(`${publishDir}`, config.iife)} 结束`)
-
-    log(`删除 ${path.join(`${publishDir}`, config.cjs)} 开始`)
-    await remove(`${path.join(`${publishDir}`, config.cjs)}`);
-    log(`删除 ${path.join(`${publishDir}`, config.cjs)} 结束`)
-
-    log(`删除 ${path.join(`${publishDir}`, config.es)} 开始`)
-    await remove(`${path.join(`${publishDir}`, config.es)}`);
-    log(`删除 ${path.join(`${publishDir}`, config.es)} 结束`)
-});
-gulp.task('copy-info', series(async () => {
-    log(`生成 package 开始`);
-    let errored = false;
-    let version: string | void = "";
-    try {
-        const { stdout } = await run(`npm`, ['view', pkg.name, 'version'], {
-            stdio: undefined,
-            cwd: path.join(process.cwd(), config.publishDir),
-        });
-        if (stdout) {
-            version = stdout
-        }
-        if (!version) {
-            const controller = new AbortController();
-            const timer = setTimeout(() => {
-                controller.abort()
-            }, 3000);
-            const start = Date.now();
-            const url = `https://img.shields.io/npm/v/${pkg.name}`
-
-            const response = await fetch(url, {
-                signal: controller.signal
-            }).finally(async () => {
-                log.warn(`远程获取版本花费时间:${Date.now() - start}`)
-            });
-            const htmlString = await response.text();
-            const regex = /<title>npm: v([\d.]+)<\/title>/;
-            version = htmlString.match(regex)?.[1];
-            clearTimeout(timer);
-        }
-        log(`远程获取版本信息 tag:`, version)
-        if (version) {
-            json.version = compare(pkg.version, version) <= 0 ? autoUpgrade(version) : pkg.version
-        } else {
-            errored = true;
-        }
-    } catch (e) {
-        errored = true;
-    }
-    if (errored) {
-        const {version} = await prompts({
-            type: 'text',
-            name: 'version',
-            message: '远程获取版本失败！请输入版本号',
-            initial: pkg.version
-        });
-        json.version = version;
-    }
-
-    delete json.devDependencies;
-    delete json.scripts;
-    if (!json.publishConfig) {
-        json.publishConfig = {
-            access: "public",
-            registry: REGISTRY
-        }
-    }
-    const es = path.basename(config.es);
-    const cjs = path.basename(config.cjs);
-    const iife = path.basename(config.iife);
-    const CJSExists = fs.existsSync(path.join(`${config.publishDir}`, cjs))
-    const ESExists = fs.existsSync(path.join(`${config.publishDir}`, es))
-    const IIFEExists = fs.existsSync(path.join(`${config.publishDir}`, iife))
-    const mainExists = !!json.main && fs.existsSync(path.join(resolveApp(''), json.main as string))
-    const browserExists = !!json.browser && fs.existsSync(path.join(resolveApp(''), json.main as string))
-    const moduleExists = !!json.module && fs.existsSync(path.join(resolveApp(''), json.main as string))
-
-    const _es = getEntrypoint(config.es);
-
-    const _cjs = getEntrypoint(config.cjs)
-    if (!mainExists) {
-        if (ESExists) {
-            json.main = _es || _cjs
-        }
-        if (CJSExists) {
-            json.main = _cjs || _es;
-        }
-    }
-    if (!moduleExists && CJSExists) {
-        json.module = _es || _cjs
-    }
-    if (!browserExists && IIFEExists) {
-        json.browser = getEntrypoint(config.iife)
-    }
-    if (!json.types) {
-        const type = getEntrypoint(config.es, config.typings) || _es || _cjs;
-        const {dir, name, ext} = path.parse(type);
-        json.types = ['.ts', '.tsx'].includes(ext) ? type : `${dir}/${name}.d.ts`
-    }
-    json.files = Array.from(new Set([ESExists && es, CJSExists && cjs, IIFEExists && iife])).filter(Boolean)
-
-    json.dependencies = Object.fromEntries(Object.entries(json.dependencies).map(([key, value]) => {
-        if (value.startsWith('file://') || value.startsWith('workspace:')) {
-            return [key, 'latest']
-        }
-        return [key, value]
-    }))
-
-    let jsonStr = JSON.stringify(json, null, "\t")
-    const ex = fs.existsSync(`${config.publishDir}/`)
-    if (!ex) {
-        fs.mkdirSync(`${config.publishDir}/`, {recursive: true})
-    }
-    fs.writeFileSync(`${config.publishDir}/package.json`, jsonStr)
-    log(`生成 package完成`, chalk.green(json.version))
-
-    log(`生成 .npmrc 开始`)
-    fs.writeFileSync(`${config.publishDir}/.npmrc`, `registry=${REGISTRY}`)
-    log(`生成 .npmrc 完成`)
-
-    log(`拷贝 README 开始`)
-}, () => {
-    return gulp.src([`./README.md`])
-        .pipe(logger({
-            before: 'copy README...',
-            after: 'copy README complete!',
-            showChange: false
-        }))
-        .pipe(gulp.dest(`${config.publishDir}/`))
-}));
-
-gulp.task('copy-iife', () => {
-    log(`拷贝 '/iife/**' 开始`)
-    return gulp.src([`${config.iife}/.**`, `${config.iife}/**`])
-        .pipe(logger({
-            before: 'copy iife...',
-            after: 'copy iife complete!',
-            showChange: false
-        }))
-        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.iife))));
-});
-gulp.task('copy-cjs', () => {
-    return gulp.src([`${config.cjs}/.**`, `${config.cjs}/**`])
-        .pipe(logger({
-            before: 'copy cjs...',
-            after: 'copy cjs complete!',
-            showChange: false
-        }))
-        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.cjs))));
-});
-gulp.task('copy-es', () => {
-    return gulp.src([`${config.es}/.**`, `${config.es}/**`])
-        .pipe(logger({
-            before: 'copy es...',
-            after: 'copy es complete!',
-            showChange: false
-        }))
-        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.es))));
-});
-
-gulp.task('remove-__npm__', series(() => {
-    let promises: Promise<void>[] = [];
-    const includes = [config.es, config.cjs, config.iife].flatMap(val => {
-        const some = getIncludeFiles().some(item => path.resolve(val).startsWith(path.resolve(item.path)))
-        return some ? [] : [val]
-    })
-    promises = includes.map(item => remove(item))
-    return Promise.all(promises)
-}, () => {
-    return gulp.src([`${publishDir}/**`, `${publishDir}/.**`])
-        .pipe(logger({
-            before: 'copy __npm__...',
-            after: 'copy __npm__ complete!',
-            showChange: false
-        }))
-        .pipe(gulp.dest(`${config.publishDir}/`))
-}, async () => {
-    await remove(publishDir)
-}));
-
-gulp.task('npm-publish', async function () {
-
-    let publishAccess: string[] = [];
-    //公共包
-    if (scoped.test(pkg.name)) {
-        publishAccess = ["--access", "public"]
-    }
-    if (config.publishAccess) {
-        publishAccess = config.publishAccess;
-    }
-    try {
-        const {stdout} = await run(`npm`, ["whoami", '--registry', REGISTRY], {stdio: undefined})
-        log.warn(`===npm登录信息===>${stdout}`)
-    } catch (e) {
-        log.warn(`===npm${REGISTRY}未登录！！请登录`)
-        await run(`npm`, ["login", '--registry', REGISTRY])
-    }
-    const {confirm} = await prompts({
-        type: 'confirm',
-        name: 'confirm',
-        message: '是否发布？',
-    });
-
-    if (confirm) {
-        await run(`npm`, ['publish', ...publishAccess, '--registry', REGISTRY], {
-            cwd: path.join(process.cwd(), config.publishDir),
-        });
-        success(`${json.name}@${json.version}:发布成功！`)
-    } else {
-        error(`${json.name}@${json.version}:取消成功！`)
-    }
-});
-
-export default gulp.series('clean', 'del-cjs-iife-es', 'copy-cjs', 'copy-es', 'copy-iife', 'remove-__npm__', 'copy-info', 'npm-publish')
+import gulp, { series } from '@es-pkg/gulp';
+import chalk from 'chalk';
+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, getEntrypoint, getIncludeFiles } from '@es-pkg/config';
+import prompts from 'prompts';
+
+const scoped = /^@[a-zA-Z0-9-]+\/.+$/;
+const REGISTRY = config.publishRegistry;
+const json = pkg;
+const publishDir = path.join(config.publishDir, './__npm__');
+gulp.task('clean', async () => {
+    log(`清除${publishDir}开始`);
+    try {
+        await remove(publishDir);
+        log(`清除${publishDir}完成`);
+    }
+    catch (e) {
+        log(`清除${publishDir}失败：`, e);
+    }
+});
+gulp.task('del-cjs-iife-es', async () => {
+    if (config.iife) {
+        log(`删除 ${path.join(`${publishDir}`, config.iife)} 开始`);
+        await remove(`${path.join(`${publishDir}`, config.iife)}`);
+        log(`删除 ${path.join(`${publishDir}`, config.iife)} 结束`);
+    }
+    log(`删除 ${path.join(`${publishDir}`, config.cjs)} 开始`);
+    await remove(`${path.join(`${publishDir}`, config.cjs)}`);
+    log(`删除 ${path.join(`${publishDir}`, config.cjs)} 结束`);
+    log(`删除 ${path.join(`${publishDir}`, config.es)} 开始`);
+    await remove(`${path.join(`${publishDir}`, config.es)}`);
+    log(`删除 ${path.join(`${publishDir}`, config.es)} 结束`);
+});
+gulp.task('copy-info', series(async () => {
+    log(`生成 package 开始`);
+    let errored = false;
+    let version = "";
+    try {
+        const { stdout } = await run(`npm`, ['view', pkg.name, 'version'], {
+            stdio: undefined,
+            cwd: path.join(process.cwd(), config.publishDir),
+        });
+        if (stdout) {
+            version = stdout;
+        }
+        if (!version) {
+            const controller = new AbortController();
+            const timer = setTimeout(() => {
+                controller.abort();
+            }, 3000);
+            const start = Date.now();
+            const url = `https://img.shields.io/npm/v/${pkg.name}`;
+            const response = await fetch(url, {
+                signal: controller.signal
+            }).finally(async () => {
+                log.warn(`远程获取版本花费时间:${Date.now() - start}`);
+            });
+            const htmlString = await response.text();
+            const regex = /<title>npm: v([\d.]+)<\/title>/;
+            version = htmlString.match(regex)?.[1];
+            clearTimeout(timer);
+        }
+        log(`远程获取版本信息 tag:`, version);
+        if (version) {
+            json.version = compare(pkg.version, version) <= 0 ? autoUpgrade(version) : pkg.version;
+        }
+        else {
+            errored = true;
+        }
+    }
+    catch (e) {
+        errored = true;
+    }
+    if (errored) {
+        const { version } = await prompts({
+            type: 'text',
+            name: 'version',
+            message: '远程获取版本失败！请输入版本号',
+            initial: pkg.version
+        });
+        json.version = version;
+    }
+    delete json.devDependencies;
+    delete json.scripts;
+    if (!json.publishConfig) {
+        json.publishConfig = {
+            access: "public",
+            registry: REGISTRY
+        };
+    }
+    const es = path.basename(config.es);
+    const cjs = path.basename(config.cjs);
+    const iife = config.iife ? path.basename(config.iife) : "";
+    const CJSExists = fs.existsSync(path.join(`${config.publishDir}`, cjs));
+    const ESExists = fs.existsSync(path.join(`${config.publishDir}`, es));
+    const IIFEExists = iife ? fs.existsSync(path.join(`${config.publishDir}`, iife)) : false;
+    const mainExists = !!json.main && fs.existsSync(path.join(resolveApp(''), json.main));
+    const browserExists = !!json.browser && fs.existsSync(path.join(resolveApp(''), json.main));
+    const moduleExists = !!json.module && fs.existsSync(path.join(resolveApp(''), json.main));
+    const _es = getEntrypoint(config.es);
+    const _cjs = getEntrypoint(config.cjs);
+    if (!mainExists) {
+        if (ESExists) {
+            json.main = _es || _cjs;
+        }
+        if (CJSExists) {
+            json.main = _cjs || _es;
+        }
+    }
+    if (!moduleExists && CJSExists) {
+        json.module = _es || _cjs;
+    }
+    if (!browserExists && IIFEExists) {
+        json.browser = getEntrypoint(config.iife);
+    }
+    if (!json.types) {
+        const type = getEntrypoint(config.es, config.typings) || _es || _cjs;
+        const { dir, name, ext } = path.parse(type);
+        json.types = ['.ts', '.tsx'].includes(ext) ? type : `${dir}/${name}.d.ts`;
+    }
+    json.files = Array.from(new Set([ESExists && es, CJSExists && cjs, IIFEExists && iife])).filter(Boolean);
+    json.dependencies = Object.fromEntries(Object.entries(json.dependencies).map(([key, value]) => {
+        if (value.startsWith('file://') || value.startsWith('workspace:')) {
+            return [key, 'latest'];
+        }
+        return [key, value];
+    }));
+    let jsonStr = JSON.stringify(json, null, "\t");
+    const ex = fs.existsSync(`${config.publishDir}/`);
+    if (!ex) {
+        fs.mkdirSync(`${config.publishDir}/`, { recursive: true });
+    }
+    fs.writeFileSync(`${config.publishDir}/package.json`, jsonStr);
+    log(`生成 package完成`, chalk.green(json.version));
+    log(`生成 .npmrc 开始`);
+    fs.writeFileSync(`${config.publishDir}/.npmrc`, `registry=${REGISTRY}`);
+    log(`生成 .npmrc 完成`);
+    log(`拷贝 README 开始`);
+}, () => {
+    return gulp.src([`./README.md`])
+        .pipe(logger({
+        before: 'copy README...',
+        after: 'copy README complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(`${config.publishDir}/`));
+}));
+gulp.task('copy-iife', (c) => {
+    if (!config.iife) {
+        return c();
+    }
+    log(`拷贝 '/iife/**' 开始`);
+    return gulp.src([`${config.iife}/.**`, `${config.iife}/**`])
+        .pipe(logger({
+        before: 'copy iife...',
+        after: 'copy iife complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.iife))));
+});
+gulp.task('copy-cjs', () => {
+    return gulp.src([`${config.cjs}/.**`, `${config.cjs}/**`])
+        .pipe(logger({
+        before: 'copy cjs...',
+        after: 'copy cjs complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.cjs))));
+});
+gulp.task('copy-es', () => {
+    return gulp.src([`${config.es}/.**`, `${config.es}/**`])
+        .pipe(logger({
+        before: 'copy es...',
+        after: 'copy es complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(path.join(`${publishDir}`, path.basename(config.es))));
+});
+gulp.task('remove-__npm__', series(() => {
+    let promises = [];
+    const includes = [config.es, config.cjs, config.iife].flatMap(val => {
+        if (!val) {
+            return [];
+        }
+        const some = getIncludeFiles().some(item => path.resolve(val).startsWith(path.resolve(item.path)));
+        return some ? [] : [val];
+    });
+    promises = includes.map(item => remove(item));
+    return Promise.all(promises);
+}, () => {
+    return gulp.src([`${publishDir}/**`, `${publishDir}/.**`])
+        .pipe(logger({
+        before: 'copy __npm__...',
+        after: 'copy __npm__ complete!',
+        showChange: false
+    }))
+        .pipe(gulp.dest(`${config.publishDir}/`));
+}, async () => {
+    await remove(publishDir);
+}));
+gulp.task('npm-publish', async function () {
+    let publishAccess = [];
+    //公共包
+    if (scoped.test(pkg.name)) {
+        publishAccess = ["--access", "public"];
+    }
+    if (config.publishAccess) {
+        publishAccess = config.publishAccess;
+    }
+    try {
+        const { stdout } = await run(`npm`, ["whoami", '--registry', REGISTRY], { stdio: undefined });
+        log.warn(`===npm登录信息===>${stdout}`);
+    }
+    catch (e) {
+        log.warn(`===npm${REGISTRY}未登录！！请登录`);
+        await run(`npm`, ["login", '--registry', REGISTRY]);
+    }
+    const { confirm } = await prompts({
+        type: 'confirm',
+        name: 'confirm',
+        message: '是否发布？',
+    });
+    if (confirm) {
+        await run(`npm`, ['publish', ...publishAccess, '--registry', REGISTRY], {
+            cwd: path.join(process.cwd(), config.publishDir),
+        });
+        success(`${json.name}@${json.version}:发布成功！`);
+    }
+    else {
+        error(`${json.name}@${json.version}:取消成功！`);
+    }
+});
+var index = gulp.series('clean', 'del-cjs-iife-es', 'copy-cjs', 'copy-es', 'copy-iife', 'remove-__npm__', 'copy-info', 'npm-publish');
+
+export { index as default };

package/esm/type.d.ts

@@ -0,0 +1,46 @@
+/// <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/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@es-pkg/publish",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"description": "组件打包工具",
-	"main": "src/index.ts",
+	"main": "cjs/index.js",
 	"engines": {
 		"node": ">=14.6.0"
 	},
@@ -28,8 +28,10 @@
 		"access": "public",
 		"registry": "https://registry.npmjs.org"
 	},
-	"types": "src/index.ts",
+	"module": "esm/index.js",
+	"types": "esm/index.d.ts",
 	"files": [
-		"src"
+		"esm",
+		"cjs"
 	]
 }