@es-pkg/compile 1.0.1 → 1.0.3

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@es-pkg/compile",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "组件打包工具",
-	"main": "cjs/src/index.js",
+	"main": "src/index.ts",
 	"keywords": [
 		"package",
 		"es-pkg"
@@ -24,6 +24,7 @@
 		"gulp-autoprefixer": "^8.0.0",
 		"gulp-babel": "^8.0.0",
 		"gulp-sass": "^5.1.0",
+		"gulp-less": "^5.0.0",
 		"gulp-typescript": "^6.0.0-alpha.1",
 		"gulp-plumber": "latest",
 		"gulp-rename": "latest",
@@ -37,10 +38,8 @@
 		"access": "public",
 		"registry": "https://registry.npmjs.org"
 	},
-	"module": "esm/src/index.js",
-	"types": "typings",
+	"types": "src/index.ts",
 	"files": [
-		"esm",
-		"cjs"
+		"src"
 	]
 }

package/src/index.ts

@@ -0,0 +1,190 @@
+import gulp, {series, parallel} from "@es-pkg/gulp";
+import logger from "@es-pkg/gulp-logger";
+import plumber from "gulp-plumber"
+import ts from "gulp-typescript"
+import typescript from "typescript"
+import babel from "gulp-babel"
+import gulpSass from "gulp-sass";
+import gulpLess from "gulp-less";
+import rename from "gulp-rename";
+import autoPreFixer from "gulp-autoprefixer"
+import Sass from "sass";
+import {remove, log} from "@es-pkg/utils";
+import {config, getIncludeFiles, relativeToApp, resolveApp} from "@es-pkg/config";
+import path from "path";
+
+const sass = gulpSass(Sass)
+const include = getIncludeFiles()
+
+function getMatchFiles(callback: (path: string) => (string[]) | string, contains: boolean = true) {
+    return include.flatMap(item => {
+        if (contains && !item.isDirectory) {
+            return [item.path]
+        }
+        const res = callback(item.path);
+        return Array.isArray(res) ? res : [res]
+    })
+}
+
+const clean = () => {
+    log(`清除 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} 目录---开始`);
+    const promises = [
+        remove(config.publishDir, true),
+        remove(config.es, true),
+        remove(config.cjs, true),
+        remove(config.iife, true),
+    ]
+    return Promise.all(promises).then(res => {
+        log(`清除 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} 目录---结束`)
+    })
+}
+
+
+const cssPreprocess = () => {
+    const copy = (dest: string) => {
+        return () => gulp.src(
+            getMatchFiles((path) => [`${path}/**/*.scss`, `${path}/**/*.less`], false)
+        ).pipe(logger({
+            before: `copyPreprocessCSS...`,
+            after: 'copyPreprocessCSS complete!',
+            showChange: true
+        })).pipe(gulp.dest(dest))
+    }
+    const compilePreprocess = (extname: string, dest: string) => {
+        return () => gulp.src(
+            getMatchFiles((path) => `${path}/**/*.${extname}`, false)
+        )
+            .pipe(extname === 'less'
+                ? gulpLess()
+                : sass({outputStyle: 'compressed'}).on('error', sass.logError))
+            .pipe(autoPreFixer())
+            .pipe(rename((path) => {
+                path.extname = ".min.css"
+            }))
+            .pipe(plumber())
+            .pipe(gulp.dest(dest));
+    }
+    const compile = (dest: string) => {
+        return parallel(compilePreprocess('scss', dest), compilePreprocess('less', dest))
+    }
+    return parallel(copy(config.es), copy(config.cjs), compile(config.cjs), compile(config.es))
+}
+
+
+const copyScssToLib = () => {
+    return gulp.src(
+        getMatchFiles((path) => [`${path}/**/*.scss`, `${path}/**/*.less`], false)
+    )
+        .pipe(logger({
+            before: 'copyScssToLib...',
+            after: 'copyScssToLib complete!',
+            extname: '.scss',
+            showChange: true
+        }))
+        .pipe(gulp.dest(config.cjs));
+}
+const compileEs = () => {
+    const tsConfig = typescript.readConfigFile(resolveApp('tsconfig.json'), typescript.sys.readFile);
+    if (tsConfig.error) {
+        console.log(tsConfig.error.messageText);
+    }
+    const compile = (src: string[], target: string) => {
+        return gulp.src(src)
+            .pipe(logger({
+                before: 'generate ...es ...',
+                after: 'generate ...es complete!',
+                extname: '.ts',
+                showChange: false,
+            }))
+            .pipe(ts({
+                "jsx": "react",
+                "noImplicitAny": true,
+                ...tsConfig.config.compilerOptions,
+                "module": "esnext",
+                "target": "esnext",
+                "newLine": 'crlf',
+                "allowImportingTsExtensions": false,
+                "baseUrl": "./",
+                "isolatedModules": false,
+                "removeComments": false,
+                "declaration": true,
+                "noEmit": false,
+                "esModuleInterop": true,
+                "resolveJsonModule": true,
+                "skipLibCheck": true,
+                "moduleResolution": 'node',
+            }))
+            .on('error', (e) => {
+                console.error(e)
+                throw e;
+            })
+            .pipe(logger({
+                before: 'writing to es...',
+                after: 'write  complete!',
+                extname: '.ts',
+                showChange: true,
+                display: 'name'
+            }))
+            .pipe(plumber())
+            .pipe(gulp.dest(target))
+            .pipe(gulp.src(config.include.map(item => `${item}/**/*.json`)))
+            .pipe(gulp.dest(target));
+    }
+
+    const tasks = include.map((item) => {
+        const isDirectory = item.isDirectory;
+        return () => compile(isDirectory ? [
+                `${item.path}/**/*.{ts,tsx}`,
+                `!${item.path}/**/__test__/!**`,
+                `${config.typings}/**/*.ts`,
+            ] : [item.path],
+            isDirectory && include.length > 1 ?
+                path.join(config.es, relativeToApp(item.path))
+                : config.es
+        )
+    })
+    return series(tasks)
+}
+const copyTds = () => {
+    return gulp.src([
+        `${config.es}/**/*.d.ts`,
+    ]).pipe(gulp.dest(config.cjs));
+}
+const compileLib = () => {
+    return gulp.src([`${config.es}/**/*.js`])
+        .pipe(logger({
+            before: 'Starting transform ...',
+            after: 'transform complete!',
+            extname: '.js',
+            showChange: true
+        }))
+        .pipe(babel({
+            "presets": [
+                [
+                    "@babel/preset-env",
+                    {
+                        "targets": {
+                            "chrome": "58",
+                            "ie": "9"
+                        }
+                    }
+                ],
+                [
+                    "@babel/preset-react"
+                ]
+            ],
+            "plugins": ["@babel/plugin-transform-runtime"]
+        }))
+        .pipe(plumber())
+        .pipe(logger({
+            before: 'write js ---> ...',
+            after: 'write js ---> complete!',
+            extname: '.js',
+            showChange: true
+        }))
+        .pipe(gulp.dest(config.cjs))
+}
+
+const compileEsAndLib = series(compileEs(), copyTds, compileLib)
+
+export default series(clean, parallel(cssPreprocess(), copyScssToLib, compileEsAndLib))

package/cjs/src/index.d.ts

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

package/cjs/src/index.js

@@ -1,155 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _gulp = _interopRequireWildcard(require("@es-pkg/gulp"));
-var _gulpLogger = _interopRequireDefault(require("@es-pkg/gulp-logger"));
-var _gulpPlumber = _interopRequireDefault(require("gulp-plumber"));
-var _gulpTypescript = _interopRequireDefault(require("gulp-typescript"));
-var _typescript = _interopRequireDefault(require("typescript"));
-var _gulpBabel = _interopRequireDefault(require("gulp-babel"));
-var _gulpSass = _interopRequireDefault(require("gulp-sass"));
-var _gulpRename = _interopRequireDefault(require("gulp-rename"));
-var _gulpAutoprefixer = _interopRequireDefault(require("gulp-autoprefixer"));
-var _sass = _interopRequireDefault(require("sass"));
-var _utils = require("@es-pkg/utils");
-var _config = require("@es-pkg/config");
-var _path = _interopRequireDefault(require("path"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var sass = (0, _gulpSass.default)(_sass.default);
-var include = (0, _config.getTsconfigIncludeFiles)();
-function getMatchFiles(callback) {
-  var contains = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  return include.flatMap(function (item) {
-    if (contains && !item.isDirectory) {
-      return [item.path];
-    }
-    var res = callback(item.path);
-    return Array.isArray(res) ? res : [res];
-  });
-}
-var clean = function clean() {
-  (0, _utils.log)("\u6E05\u9664 ".concat((0, _config.relativeToApp)(_config.config.es), " & ").concat((0, _config.relativeToApp)(_config.config.cjs), " \u76EE\u5F55---\u5F00\u59CB"));
-  var promises = [(0, _utils.remove)(_config.config.publishDir, true), (0, _utils.remove)(_config.config.es, true), (0, _utils.remove)(_config.config.cjs, true), (0, _utils.remove)(_config.config.iife, true)];
-  return Promise.all(promises).then(function (res) {
-    (0, _utils.log)("\u6E05\u9664 ".concat((0, _config.relativeToApp)(_config.config.es), " & ").concat((0, _config.relativeToApp)(_config.config.cjs), " \u76EE\u5F55---\u7ED3\u675F"));
-  });
-};
-var dealScss = function dealScss() {
-  var copy = function copy(dest) {
-    return function () {
-      return _gulp.default.src(getMatchFiles(function (path) {
-        return "".concat(path, "/**/*.scss");
-      }, false)).pipe((0, _gulpLogger.default)({
-        before: "copyScss...",
-        after: 'copyScss complete!',
-        extname: '.scss',
-        showChange: true
-      })).pipe(_gulp.default.dest(dest));
-    };
-  };
-  var compileScss = function compileScss() {
-    return _gulp.default.src(getMatchFiles(function (path) {
-      return "".concat(path, "/**/*.scss");
-    }, false)).pipe(sass({
-      outputStyle: 'compressed',
-      outFile: 'xx'
-    }).on('error', sass.logError)).pipe((0, _gulpAutoprefixer.default)()).pipe((0, _gulpRename.default)(function (path) {
-      path.extname = ".min.css";
-    })).pipe((0, _gulpPlumber.default)()).pipe(_gulp.default.dest(_config.config.cjs));
-  };
-  return (0, _gulp.parallel)(copy(_config.config.es), copy(_config.config.cjs), compileScss);
-};
-var copyScssToLib = function copyScssToLib() {
-  return _gulp.default.src(getMatchFiles(function (path) {
-    return ["".concat(path, "/**/*.scss"), "".concat(path, "/**/*.less")];
-  }, false)).pipe((0, _gulpLogger.default)({
-    before: 'copyScssToLib...',
-    after: 'copyScssToLib complete!',
-    extname: '.scss',
-    showChange: true
-  })).pipe(_gulp.default.dest(_config.config.cjs));
-};
-var compileEs = function compileEs() {
-  var tsConfig = _typescript.default.readConfigFile((0, _config.resolveApp)('tsconfig.json'), _typescript.default.sys.readFile);
-  if (tsConfig.error) {
-    console.log(tsConfig.error.messageText);
-  }
-  var compile = function compile(src, target) {
-    return _gulp.default.src(src).pipe((0, _gulpLogger.default)({
-      before: 'generate ...es ...',
-      after: 'generate ...es complete!',
-      extname: '.ts',
-      showChange: false
-    })).pipe((0, _gulpTypescript.default)(_objectSpread(_objectSpread({
-      "jsx": "react",
-      "noImplicitAny": true
-    }, tsConfig.config.compilerOptions), {}, {
-      "module": "esnext",
-      "target": "esnext",
-      "newLine": 'crlf',
-      "allowImportingTsExtensions": false,
-      "baseUrl": "./",
-      "isolatedModules": false,
-      "removeComments": false,
-      "declaration": true,
-      "noEmit": false,
-      "esModuleInterop": true,
-      "resolveJsonModule": true,
-      "skipLibCheck": true,
-      "moduleResolution": 'node'
-    }))).on('error', function (e) {
-      console.error(e);
-      throw e;
-    }).pipe((0, _gulpLogger.default)({
-      before: 'writing to es...',
-      after: 'write  complete!',
-      extname: '.ts',
-      showChange: true,
-      display: 'name'
-    })).pipe((0, _gulpPlumber.default)()).pipe(_gulp.default.dest(target)).pipe(_gulp.default.src(_config.config.include.map(function (item) {
-      return "".concat(item, "/**/*.json");
-    }))).pipe(_gulp.default.dest(target));
-  };
-  var tasks = include.map(function (item) {
-    var isDirectory = item.isDirectory;
-    return function () {
-      return compile(isDirectory ? ["".concat(item.path, "/**/*"), "!".concat(item.path, "/**/__test__/!**"), "".concat(_config.config.typings, "/**/*")] : [item.path], isDirectory && include.length > 1 ? _path.default.join(_config.config.es, _path.default.basename(item.path)) : _config.config.es);
-    };
-  });
-  return (0, _gulp.series)(tasks);
-};
-var copyTds = function copyTds() {
-  return _gulp.default.src(["".concat(_config.config.es, "/**/*.d.ts")]).pipe(_gulp.default.dest(_config.config.cjs));
-};
-var compileLib = function compileLib() {
-  return _gulp.default.src(["".concat(_config.config.es, "/**/*.js")]).pipe((0, _gulpLogger.default)({
-    before: 'Starting transform ...',
-    after: 'transform complete!',
-    extname: '.js',
-    showChange: true
-  })).pipe((0, _gulpBabel.default)({
-    "presets": [["@babel/preset-env", {
-      "targets": {
-        "chrome": "58",
-        "ie": "9"
-      }
-    }], ["@babel/preset-react"]],
-    "plugins": ["@babel/plugin-transform-runtime"]
-  })).pipe((0, _gulpPlumber.default)()).pipe((0, _gulpLogger.default)({
-    before: 'write js ---> ...',
-    after: 'write js ---> complete!',
-    extname: '.js',
-    showChange: true
-  })).pipe(_gulp.default.dest(_config.config.cjs));
-};
-var compileEsAndLib = (0, _gulp.series)(compileEs(), copyTds, compileLib);
-var _default = exports.default = (0, _gulp.series)(clean, (0, _gulp.parallel)(dealScss(), copyScssToLib, compileEsAndLib));

package/esm/src/index.d.ts

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

package/esm/src/index.js

@@ -1,168 +0,0 @@
-import gulp, { series, parallel } from "@es-pkg/gulp";
-import logger from "@es-pkg/gulp-logger";
-import plumber from "gulp-plumber";
-import ts from "gulp-typescript";
-import typescript from "typescript";
-import babel from "gulp-babel";
-import gulpSass from "gulp-sass";
-import rename from "gulp-rename";
-import autoPreFixer from "gulp-autoprefixer";
-import Sass from "sass";
-import { remove, log } from "@es-pkg/utils";
-import { config, getTsconfigIncludeFiles, relativeToApp, resolveApp } from "@es-pkg/config";
-import path from "path";
-const sass = gulpSass(Sass);
-const include = getTsconfigIncludeFiles();
-function getMatchFiles(callback, contains = true) {
-    return include.flatMap(item => {
-        if (contains && !item.isDirectory) {
-            return [item.path];
-        }
-        const res = callback(item.path);
-        return Array.isArray(res) ? res : [res];
-    });
-}
-const clean = () => {
-    log(`清除 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} 目录---开始`);
-    const promises = [
-        remove(config.publishDir, true),
-        remove(config.es, true),
-        remove(config.cjs, true),
-        remove(config.iife, true),
-    ];
-    return Promise.all(promises).then(res => {
-        log(`清除 ${relativeToApp(config.es)} & ${relativeToApp(config.cjs)} 目录---结束`);
-    });
-};
-const dealScss = () => {
-    const copy = (dest) => {
-        return () => gulp.src(getMatchFiles((path) => `${path}/**/*.scss`, false)).pipe(logger({
-            before: `copyScss...`,
-            after: 'copyScss complete!',
-            extname: '.scss',
-            showChange: true
-        }))
-            .pipe(gulp.dest(dest));
-    };
-    const compileScss = () => {
-        return gulp.src(getMatchFiles((path) => `${path}/**/*.scss`, false))
-            .pipe(sass({ outputStyle: 'compressed', outFile: 'xx' }).on('error', sass.logError))
-            .pipe(autoPreFixer())
-            .pipe(rename((path) => {
-            path.extname = ".min.css";
-        }))
-            .pipe(plumber())
-            .pipe(gulp.dest(config.cjs));
-    };
-    return parallel(copy(config.es), copy(config.cjs), compileScss);
-};
-const copyScssToLib = () => {
-    return gulp.src(getMatchFiles((path) => [`${path}/**/*.scss`, `${path}/**/*.less`], false))
-        .pipe(logger({
-        before: 'copyScssToLib...',
-        after: 'copyScssToLib complete!',
-        extname: '.scss',
-        showChange: true
-    }))
-        .pipe(gulp.dest(config.cjs));
-};
-const compileEs = () => {
-    const tsConfig = typescript.readConfigFile(resolveApp('tsconfig.json'), typescript.sys.readFile);
-    if (tsConfig.error) {
-        console.log(tsConfig.error.messageText);
-    }
-    const compile = (src, target) => {
-        return gulp.src(src)
-            .pipe(logger({
-            before: 'generate ...es ...',
-            after: 'generate ...es complete!',
-            extname: '.ts',
-            showChange: false,
-        }))
-            .pipe(ts({
-            "jsx": "react",
-            "noImplicitAny": true,
-            ...tsConfig.config.compilerOptions,
-            "module": "esnext",
-            "target": "esnext",
-            "newLine": 'crlf',
-            "allowImportingTsExtensions": false,
-            "baseUrl": "./",
-            "isolatedModules": false,
-            "removeComments": false,
-            "declaration": true,
-            "noEmit": false,
-            "esModuleInterop": true,
-            "resolveJsonModule": true,
-            "skipLibCheck": true,
-            "moduleResolution": 'node',
-        }))
-            .on('error', (e) => {
-            console.error(e);
-            throw e;
-        })
-            .pipe(logger({
-            before: 'writing to es...',
-            after: 'write  complete!',
-            extname: '.ts',
-            showChange: true,
-            display: 'name'
-        }))
-            .pipe(plumber())
-            .pipe(gulp.dest(target))
-            .pipe(gulp.src(config.include.map(item => `${item}/**/*.json`)))
-            .pipe(gulp.dest(target));
-    };
-    const tasks = include.map((item) => {
-        const isDirectory = item.isDirectory;
-        return () => compile(isDirectory ? [
-            `${item.path}/**/*`,
-            `!${item.path}/**/__test__/!**`,
-            `${config.typings}/**/*`,
-        ] : [item.path], isDirectory && include.length > 1 ?
-            path.join(config.es, path.basename(item.path))
-            : config.es);
-    });
-    return series(tasks);
-};
-const copyTds = () => {
-    return gulp.src([
-        `${config.es}/**/*.d.ts`,
-    ]).pipe(gulp.dest(config.cjs));
-};
-const compileLib = () => {
-    return gulp.src([`${config.es}/**/*.js`])
-        .pipe(logger({
-        before: 'Starting transform ...',
-        after: 'transform complete!',
-        extname: '.js',
-        showChange: true
-    }))
-        .pipe(babel({
-        "presets": [
-            [
-                "@babel/preset-env",
-                {
-                    "targets": {
-                        "chrome": "58",
-                        "ie": "9"
-                    }
-                }
-            ],
-            [
-                "@babel/preset-react"
-            ]
-        ],
-        "plugins": ["@babel/plugin-transform-runtime"]
-    }))
-        .pipe(plumber())
-        .pipe(logger({
-        before: 'write js ---> ...',
-        after: 'write js ---> complete!',
-        extname: '.js',
-        showChange: true
-    }))
-        .pipe(gulp.dest(config.cjs));
-};
-const compileEsAndLib = series(compileEs(), copyTds, compileLib);
-export default series(clean, parallel(dealScss(), copyScssToLib, compileEsAndLib));