@es-pkg/compile 1.0.12 → 1.0.13

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

@@ -9,6 +9,7 @@ var rollup = require('rollup');
 var resolve = require('@rollup/plugin-node-resolve');
 var commonjs = require('@rollup/plugin-commonjs');
 var json = require('@rollup/plugin-json');
+var dts = require('rollup-plugin-dts');
 var postcss = require('rollup-plugin-postcss');
 var autoprefixer = require('autoprefixer');
 var cssnano = require('cssnano');
@@ -38,12 +39,12 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
-var gulp__default = /*#__PURE__*/_interopDefault(gulp);
 var utils__namespace = /*#__PURE__*/_interopNamespace(utils);
 var esConfig__namespace = /*#__PURE__*/_interopNamespace(esConfig);
 var resolve__default = /*#__PURE__*/_interopDefault(resolve);
 var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 var json__default = /*#__PURE__*/_interopDefault(json);
+var dts__default = /*#__PURE__*/_interopDefault(dts);
 var postcss__default = /*#__PURE__*/_interopDefault(postcss);
 var autoprefixer__default = /*#__PURE__*/_interopDefault(autoprefixer);
 var cssnano__default = /*#__PURE__*/_interopDefault(cssnano);
@@ -53,7 +54,7 @@ var esbuild__default = /*#__PURE__*/_interopDefault(esbuild);
 var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 const { remove, log, getValidPkgName, toPascalCase } = utils__namespace;
-const { config, collectInputs, shallowInputs, pkg, relativeToApp, resolveApp } = esConfig__namespace;
+const { config, shallowInputs, pkg, relativeToApp, resolveApp } = esConfig__namespace;
 const name = getValidPkgName(pkg.name);
 const clean = async () => {
   log(`\u6E05\u9664 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} \u76EE\u5F55---\u5F00\u59CB`);
@@ -90,29 +91,39 @@ function isNodeModule(id) {
     return false;
   }
 }
-function getInputOptions(format) {
+function getInputOptions(emit) {
+  var _a, _b, _c;
+  const defaultPlugins = [
+    json__default.default(),
+    resolve__default.default(),
+    commonjs__default.default({
+      defaultIsModuleExports: true,
+      esmExternals: true,
+      transformMixedEsModules: true
+      // 混合模块也转换
+    }),
+    emit ? dts__default.default({ compilerOptions: getCompilerOptions() }) : esbuild__default.default({ target: "es2018", format: "esm" }),
+    getPostcss(config.css.extract)
+  ];
+  const plugins = ((_a = config.rollupOptions) == null ? void 0 : _a.plugins) ? (_c = (_b = config.rollupOptions) == null ? void 0 : _b.plugins) == null ? void 0 : _c.call(_b, defaultPlugins) : defaultPlugins;
   return {
     input: shallowInputs.filter((item) => !item.endsWith(".d.ts")),
     external: (id) => {
-      if (node_module.builtinModules.includes(id)) return true;
-      if (!id.startsWith(".") && !path__default.default.isAbsolute(id) && isNodeModule(id)) return true;
-      return false;
+      var _a2;
+      const defaultExternal = (id2) => {
+        if (node_module.builtinModules.includes(id2)) return true;
+        return !!(!id2.startsWith(".") && !path__default.default.isAbsolute(id2) && isNodeModule(id2));
+      };
+      if ((_a2 = config.rollupOptions) == null ? void 0 : _a2.external) {
+        return config.rollupOptions.external(id, defaultExternal);
+      } else {
+        return defaultExternal(id);
+      }
     },
-    plugins: [
-      json__default.default(),
-      resolve__default.default(),
-      commonjs__default.default({
-        defaultIsModuleExports: true,
-        esmExternals: true,
-        transformMixedEsModules: true
-        // 混合模块也转换
-      }),
-      esbuild__default.default({ target: "es2018", format: "esm" }),
-      getPostcss(config.css.extract)
-    ]
+    plugins
   };
 }
-async function buildDeclarations() {
+function getCompilerOptions() {
   const tsConfig = ts__default.default.readConfigFile(resolveApp("tsconfig.json"), ts__default.default.sys.readFile);
   if (tsConfig.error) {
     console.log(tsConfig.error.messageText);
@@ -122,7 +133,6 @@ async function buildDeclarations() {
     ts__default.default.sys,
     resolveApp("./")
   );
-  const entryFiles = collectInputs.filter((item) => [".ts", ".tsx"].some((suf) => item.endsWith(suf)));
   const compilerOptions = {
     ...parsedConfig.options,
     declaration: true,
@@ -136,27 +146,7 @@ async function buildDeclarations() {
     target: ts__default.default.ScriptTarget.ESNext,
     module: ts__default.default.ModuleKind.ESNext
   };
-  const host = ts__default.default.createCompilerHost(compilerOptions);
-  host.writeFile = (fileName, contents) => {
-    const dir = path__default.default.dirname(fileName);
-    fs__default.default.mkdirSync(dir, { recursive: true });
-    fs__default.default.writeFileSync(fileName, contents, "utf8");
-  };
-  const program = ts__default.default.createProgram(entryFiles, compilerOptions, host);
-  const emitResult = program.emit();
-  const diagnostics = ts__default.default.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-  if (diagnostics.length > 0) {
-    console.error(
-      ts__default.default.formatDiagnosticsWithColorAndContext(diagnostics, {
-        getCanonicalFileName: (f) => f,
-        getCurrentDirectory: ts__default.default.sys.getCurrentDirectory,
-        getNewLine: () => ts__default.default.sys.newLine
-      })
-    );
-  } else {
-    console.log(`\u2705 Declarations generated in: ${path__default.default.resolve(config.es)}`);
-  }
-  log.success("\u2705 Declarations build complete!");
+  return compilerOptions;
 }
 async function buildExtraCss() {
   const extras = config.css.extra;
@@ -195,7 +185,13 @@ async function buildExtraCss() {
   await Promise.all(tasks);
   log.success("\u2705 \u6240\u6709\u989D\u5916 CSS \u7F16\u8BD1\u5B8C\u6210");
 }
+async function buildDts() {
+  return build(true);
+}
 async function buildJS() {
+  return build(false);
+}
+async function build(emit) {
   const outputOptions = [
     {
       dir: config.es,
@@ -221,14 +217,12 @@ async function buildJS() {
     ] : []
   ];
   for (const output of outputOptions) {
-    const bundle = await rollup.rollup(getInputOptions(output.format));
+    const bundle = await rollup.rollup(getInputOptions(emit));
     await bundle.write(output);
   }
-  await buildExtraCss();
-  log.success("\u2705 JS Build complete!");
+  !emit && await buildExtraCss();
+  log.success(`\u2705 ${emit ? "DTS " : "JS "}Build complete!`);
 }
-const copySrcTds = () => gulp__default.default.src(config.include.map((t) => `${t}/**/*.d.ts`)).pipe(gulp__default.default.dest(config.es));
-const copyTds = () => gulp__default.default.src([`${config.es}/**/*.d.ts`]).pipe(gulp__default.default.dest(config.cjs));
-var src_default = gulp.series(clean, buildJS, buildDeclarations, copySrcTds, copyTds);
+var src_default = gulp.series(clean, buildJS, buildDts);
 
 exports.default = src_default;

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

@@ -1,10 +1,11 @@
-import gulp, { series } from '@es-pkg/gulp';
+import { series } from '@es-pkg/gulp';
 import * as utils from '@es-pkg/utils';
 import * as esConfig from '@es-pkg/config';
 import { rollup } from 'rollup';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
+import dts from 'rollup-plugin-dts';
 import postcss from 'rollup-plugin-postcss';
 import autoprefixer from 'autoprefixer';
 import cssnano from 'cssnano';
@@ -15,7 +16,7 @@ import { builtinModules } from 'node:module';
 import ts from 'typescript';
 
 const { remove, log, getValidPkgName, toPascalCase } = utils;
-const { config, collectInputs, shallowInputs, pkg, relativeToApp, resolveApp } = esConfig;
+const { config, shallowInputs, pkg, relativeToApp, resolveApp } = esConfig;
 const name = getValidPkgName(pkg.name);
 const clean = async () => {
   log(`\u6E05\u9664 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} \u76EE\u5F55---\u5F00\u59CB`);
@@ -52,29 +53,39 @@ function isNodeModule(id) {
     return false;
   }
 }
-function getInputOptions(format) {
+function getInputOptions(emit) {
+  var _a, _b, _c;
+  const defaultPlugins = [
+    json(),
+    resolve(),
+    commonjs({
+      defaultIsModuleExports: true,
+      esmExternals: true,
+      transformMixedEsModules: true
+      // 混合模块也转换
+    }),
+    emit ? dts({ compilerOptions: getCompilerOptions() }) : esbuild({ target: "es2018", format: "esm" }),
+    getPostcss(config.css.extract)
+  ];
+  const plugins = ((_a = config.rollupOptions) == null ? void 0 : _a.plugins) ? (_c = (_b = config.rollupOptions) == null ? void 0 : _b.plugins) == null ? void 0 : _c.call(_b, defaultPlugins) : defaultPlugins;
   return {
     input: shallowInputs.filter((item) => !item.endsWith(".d.ts")),
     external: (id) => {
-      if (builtinModules.includes(id)) return true;
-      if (!id.startsWith(".") && !path.isAbsolute(id) && isNodeModule(id)) return true;
-      return false;
+      var _a2;
+      const defaultExternal = (id2) => {
+        if (builtinModules.includes(id2)) return true;
+        return !!(!id2.startsWith(".") && !path.isAbsolute(id2) && isNodeModule(id2));
+      };
+      if ((_a2 = config.rollupOptions) == null ? void 0 : _a2.external) {
+        return config.rollupOptions.external(id, defaultExternal);
+      } else {
+        return defaultExternal(id);
+      }
     },
-    plugins: [
-      json(),
-      resolve(),
-      commonjs({
-        defaultIsModuleExports: true,
-        esmExternals: true,
-        transformMixedEsModules: true
-        // 混合模块也转换
-      }),
-      esbuild({ target: "es2018", format: "esm" }),
-      getPostcss(config.css.extract)
-    ]
+    plugins
   };
 }
-async function buildDeclarations() {
+function getCompilerOptions() {
   const tsConfig = ts.readConfigFile(resolveApp("tsconfig.json"), ts.sys.readFile);
   if (tsConfig.error) {
     console.log(tsConfig.error.messageText);
@@ -84,7 +95,6 @@ async function buildDeclarations() {
     ts.sys,
     resolveApp("./")
   );
-  const entryFiles = collectInputs.filter((item) => [".ts", ".tsx"].some((suf) => item.endsWith(suf)));
   const compilerOptions = {
     ...parsedConfig.options,
     declaration: true,
@@ -98,27 +108,7 @@ async function buildDeclarations() {
     target: ts.ScriptTarget.ESNext,
     module: ts.ModuleKind.ESNext
   };
-  const host = ts.createCompilerHost(compilerOptions);
-  host.writeFile = (fileName, contents) => {
-    const dir = path.dirname(fileName);
-    fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(fileName, contents, "utf8");
-  };
-  const program = ts.createProgram(entryFiles, compilerOptions, host);
-  const emitResult = program.emit();
-  const diagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-  if (diagnostics.length > 0) {
-    console.error(
-      ts.formatDiagnosticsWithColorAndContext(diagnostics, {
-        getCanonicalFileName: (f) => f,
-        getCurrentDirectory: ts.sys.getCurrentDirectory,
-        getNewLine: () => ts.sys.newLine
-      })
-    );
-  } else {
-    console.log(`\u2705 Declarations generated in: ${path.resolve(config.es)}`);
-  }
-  log.success("\u2705 Declarations build complete!");
+  return compilerOptions;
 }
 async function buildExtraCss() {
   const extras = config.css.extra;
@@ -157,7 +147,13 @@ async function buildExtraCss() {
   await Promise.all(tasks);
   log.success("\u2705 \u6240\u6709\u989D\u5916 CSS \u7F16\u8BD1\u5B8C\u6210");
 }
+async function buildDts() {
+  return build(true);
+}
 async function buildJS() {
+  return build(false);
+}
+async function build(emit) {
   const outputOptions = [
     {
       dir: config.es,
@@ -183,14 +179,12 @@ async function buildJS() {
     ] : []
   ];
   for (const output of outputOptions) {
-    const bundle = await rollup(getInputOptions(output.format));
+    const bundle = await rollup(getInputOptions(emit));
     await bundle.write(output);
   }
-  await buildExtraCss();
-  log.success("\u2705 JS Build complete!");
+  !emit && await buildExtraCss();
+  log.success(`\u2705 ${emit ? "DTS " : "JS "}Build complete!`);
 }
-const copySrcTds = () => gulp.src(config.include.map((t) => `${t}/**/*.d.ts`)).pipe(gulp.dest(config.es));
-const copyTds = () => gulp.src([`${config.es}/**/*.d.ts`]).pipe(gulp.dest(config.cjs));
-var src_default = series(clean, buildJS, buildDeclarations, copySrcTds, copyTds);
+var src_default = series(clean, buildJS, buildDts);
 
 export { src_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@es-pkg/compile",
-	"version": "1.0.12",
+	"version": "1.0.13",
 	"description": "组件打包工具",
 	"main": "cjs/index.js",
 	"keywords": [
@@ -28,6 +28,7 @@
 		"rollup-plugin-esbuild": "latest",
 		"@rollup/plugin-typescript": "^12.3.0",
 		"@rollup/plugin-json": "^6.1.0",
+		"rollup-plugin-dts": "^6.3.0",
 		"autoprefixer": "^10.4.21",
 		"cssnano": "latest",
 		"sass": "^1.53.0",