@es-pkg/compile 1.0.8 → 1.0.10

package/cjs/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var gulp = require('@es-pkg/gulp');
 var utils = require('@es-pkg/utils');
-var config = require('@es-pkg/config');
+var esConfig = require('@es-pkg/config');
 var rollup = require('rollup');
 var resolve = require('@rollup/plugin-node-resolve');
 var commonjs = require('@rollup/plugin-commonjs');
@@ -20,7 +20,27 @@ var ts = require('typescript');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = 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);
@@ -32,17 +52,19 @@ var fs__default = /*#__PURE__*/_interopDefault(fs);
 var esbuild__default = /*#__PURE__*/_interopDefault(esbuild);
 var ts__default = /*#__PURE__*/_interopDefault(ts);
 
-const name = utils.getValidPkgName(config.pkg.name);
+const { remove, log, getValidPkgName, toPascalCase } = utils__namespace;
+const { config, collectInputs, shallowInputs, pkg, relativeToApp, resolveApp } = esConfig__namespace;
+const name = getValidPkgName(pkg.name);
 const clean = () => {
-  utils.log(`\u6E05\u9664 ${config.relativeToApp(config.config.es)} & ${config.relativeToApp(config.config.cjs)} \u76EE\u5F55---\u5F00\u59CB`);
+  log(`\u6E05\u9664 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} \u76EE\u5F55---\u5F00\u59CB`);
   const promises = [
-    utils.remove(config.config.publishDir, true),
-    utils.remove(config.config.es, true),
-    utils.remove(config.config.cjs, true),
-    utils.remove(config.config.iife, true)
+    remove(config.publishDir, true),
+    remove(config.es, true),
+    remove(config.cjs, true),
+    remove(config.iife, true)
   ];
   return Promise.all(promises).then(() => {
-    utils.log(`\u6E05\u9664 ${config.relativeToApp(config.config.es)} & ${config.relativeToApp(config.config.cjs)} \u76EE\u5F55---\u7ED3\u675F`);
+    log(`\u6E05\u9664 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} \u76EE\u5F55---\u7ED3\u675F`);
   });
 };
 function getPostcss(extract) {
@@ -53,7 +75,7 @@ function getPostcss(extract) {
       less: ["less"],
       sass: ["sass"]
     },
-    plugins: [autoprefixer__default.default({ overrideBrowserslist: config.config.css.browserslist }), cssnano__default.default()],
+    plugins: [autoprefixer__default.default({ overrideBrowserslist: config.css.browserslist }), cssnano__default.default()],
     extract
   });
 }
@@ -67,7 +89,7 @@ function isNodeModule(id) {
 }
 function getInputOptions(format) {
   return {
-    input: config.shallowInputs.filter((item) => !item.endsWith(".d.ts")),
+    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;
@@ -76,29 +98,34 @@ function getInputOptions(format) {
     plugins: [
       json__default.default(),
       resolve__default.default(),
-      esbuild__default.default({ target: "es2018", format: "esm" }),
       commonjs__default.default({
         defaultIsModuleExports: true,
         esmExternals: true,
         transformMixedEsModules: true
         // 混合模块也转换
       }),
-      getPostcss(config.config.css.extract)
+      esbuild__default.default({ target: "es2018", format: "esm" }),
+      getPostcss(config.css.extract)
     ]
   };
 }
 async function buildDeclarations() {
-  const tsConfig = ts__default.default.readConfigFile(config.resolveApp("tsconfig.json"), ts__default.default.sys.readFile);
+  const tsConfig = ts__default.default.readConfigFile(resolveApp("tsconfig.json"), ts__default.default.sys.readFile);
   if (tsConfig.error) {
     console.log(tsConfig.error.messageText);
   }
-  const entryFiles = config.collectInputs.filter((item) => [".ts", ".tsx"].some((suf) => item.endsWith(suf)));
+  const parsedConfig = ts__default.default.parseJsonConfigFileContent(
+    tsConfig.config,
+    ts__default.default.sys,
+    resolveApp("./")
+  );
+  const entryFiles = collectInputs.filter((item) => [".ts", ".tsx"].some((suf) => item.endsWith(suf)));
   const compilerOptions = {
-    ...tsConfig.config,
+    ...parsedConfig.options,
     declaration: true,
     emitDeclarationOnly: true,
-    outDir: config.config.es,
-    rootDir: config.resolveApp("src"),
+    outDir: config.es,
+    rootDir: resolveApp("src"),
     skipLibCheck: true,
     esModuleInterop: true,
     moduleResolution: ts__default.default.ModuleResolutionKind.NodeJs,
@@ -123,18 +150,18 @@ async function buildDeclarations() {
       })
     );
   } else {
-    console.log(`\u2705 Declarations generated in: ${path__default.default.resolve(config.config.es)}`);
+    console.log(`\u2705 Declarations generated in: ${path__default.default.resolve(config.es)}`);
   }
-  utils.log.success("\u2705 Declarations build complete!");
+  log.success("\u2705 Declarations build complete!");
 }
 async function buildExtraCss() {
-  const extras = config.config.css.extra;
+  const extras = config.css.extra;
   if (!(extras == null ? void 0 : extras.length)) return;
-  const srcRoot = config.resolveApp("src");
-  const esRoot = config.resolveApp(config.config.es);
+  const srcRoot = resolveApp("src");
+  const esRoot = resolveApp(config.es);
   const tasks = extras.map(async (v) => {
     try {
-      const absPath = config.resolveApp(v);
+      const absPath = resolveApp(v);
       const relativePath = path__default.default.relative(srcRoot, absPath);
       const dirname = path__default.default.dirname(relativePath);
       const filename = path__default.default.basename(v, path__default.default.extname(v));
@@ -143,7 +170,7 @@ async function buildExtraCss() {
         plugins: getPostcss(path__default.default.join(dirname, `${filename}.min.css`))
       });
       await bundle.write({
-        dir: config.config.es,
+        dir: config.es,
         format: "es",
         sourcemap: false,
         preserveModules: true,
@@ -151,41 +178,41 @@ async function buildExtraCss() {
       });
       const jsFile = path__default.default.join(esRoot, dirname, `${filename}${path__default.default.extname(v)}.js`);
       if (fs__default.default.existsSync(jsFile)) fs__default.default.unlinkSync(jsFile);
-      [config.config.cjs, config.config.iife].forEach((targetRoot) => {
-        const dest = path__default.default.join(config.resolveApp(targetRoot), dirname, `${filename}.min.css`);
+      [config.cjs, config.iife].forEach((targetRoot) => {
+        const dest = path__default.default.join(resolveApp(targetRoot), dirname, `${filename}.min.css`);
         fs__default.default.mkdirSync(path__default.default.dirname(dest), { recursive: true });
         fs__default.default.copyFileSync(path__default.default.join(esRoot, dirname, `${filename}.min.css`), dest);
       });
-      utils.log.success(`\u2705 \u7F16\u8BD1\u5B8C\u6210: ${v}`);
+      log.success(`\u2705 \u7F16\u8BD1\u5B8C\u6210: ${v}`);
     } catch (err) {
-      utils.log.error(`\u274C \u7F16\u8BD1\u5931\u8D25: ${v}`, err);
+      log.error(`\u274C \u7F16\u8BD1\u5931\u8D25: ${v}`, err);
     }
   });
   await Promise.all(tasks);
-  utils.log.success("\u2705 \u6240\u6709\u989D\u5916 CSS \u7F16\u8BD1\u5B8C\u6210");
+  log.success("\u2705 \u6240\u6709\u989D\u5916 CSS \u7F16\u8BD1\u5B8C\u6210");
 }
 async function buildJS() {
   const outputOptions = [
     {
-      dir: config.config.es,
+      dir: config.es,
       format: "es",
       preserveModules: true,
-      preserveModulesRoot: config.resolveApp("src")
+      preserveModulesRoot: resolveApp("src")
     },
     {
-      dir: config.config.cjs,
+      dir: config.cjs,
       format: "cjs",
       preserveModules: true,
-      preserveModulesRoot: config.resolveApp("src"),
+      preserveModulesRoot: resolveApp("src"),
       exports: "named",
       interop: "auto"
     },
-    ...config.config.iife ? [
+    ...config.iife ? [
       {
-        dir: config.config.iife,
+        dir: config.iife,
         format: "iife",
         exports: "named",
-        name: utils.toPascalCase(name)
+        name: toPascalCase(name)
       }
     ] : []
   ];
@@ -194,10 +221,10 @@ async function buildJS() {
     await bundle.write(output);
   }
   await buildExtraCss();
-  utils.log.success("\u2705 JS Build complete!");
+  log.success("\u2705 JS Build complete!");
 }
-const copySrcTds = () => gulp__default.default.src(config.config.include.map((t) => `${t}/**/*.d.ts`)).pipe(gulp__default.default.dest(config.config.es));
-const copyTds = () => gulp__default.default.src([`${config.config.es}/**/*.d.ts`]).pipe(gulp__default.default.dest(config.config.cjs));
+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);
 
 exports.default = src_default;

package/esm/index.js

@@ -1,6 +1,6 @@
 import gulp, { series } from '@es-pkg/gulp';
-import { getValidPkgName, log, remove, toPascalCase } from '@es-pkg/utils';
-import { pkg, relativeToApp, config, resolveApp, collectInputs, shallowInputs } from '@es-pkg/config';
+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';
@@ -14,6 +14,8 @@ import esbuild from 'rollup-plugin-esbuild';
 import { builtinModules } from 'node:module';
 import ts from 'typescript';
 
+const { remove, log, getValidPkgName, toPascalCase } = utils;
+const { config, collectInputs, shallowInputs, pkg, relativeToApp, resolveApp } = esConfig;
 const name = getValidPkgName(pkg.name);
 const clean = () => {
   log(`\u6E05\u9664 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} \u76EE\u5F55---\u5F00\u59CB`);
@@ -58,13 +60,13 @@ function getInputOptions(format) {
     plugins: [
       json(),
       resolve(),
-      esbuild({ target: "es2018", format: "esm" }),
       commonjs({
         defaultIsModuleExports: true,
         esmExternals: true,
         transformMixedEsModules: true
         // 混合模块也转换
       }),
+      esbuild({ target: "es2018", format: "esm" }),
       getPostcss(config.css.extract)
     ]
   };
@@ -74,9 +76,14 @@ async function buildDeclarations() {
   if (tsConfig.error) {
     console.log(tsConfig.error.messageText);
   }
+  const parsedConfig = ts.parseJsonConfigFileContent(
+    tsConfig.config,
+    ts.sys,
+    resolveApp("./")
+  );
   const entryFiles = collectInputs.filter((item) => [".ts", ".tsx"].some((suf) => item.endsWith(suf)));
   const compilerOptions = {
-    ...tsConfig.config,
+    ...parsedConfig.options,
     declaration: true,
     emitDeclarationOnly: true,
     outDir: config.es,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@es-pkg/compile",
-	"version": "1.0.8",
+	"version": "1.0.10",
 	"description": "组件打包工具",
 	"main": "cjs/index.js",
 	"keywords": [