@qn-pandora/pandora-tools 1.1.1 → 2.0.2

package/CHANGELOG.json

@@ -2,13 +2,37 @@
   "name": "@qn-pandora/pandora-tools",
   "entries": [
     {
-      "version": "1.1.0",
-      "tag": "@qn-pandora/pandora-tools_v1.1.0",
-      "date": "Tue, 15 Mar 2022 12:05:29 GMT",
+      "version": "2.0.2",
+      "tag": "@qn-pandora/pandora-tools_v2.0.2",
+      "date": "Wed, 06 Jul 2022 07:32:15 GMT",
       "comments": {
-        "minor": [
+        "patch": [
           {
-            "comment": "统一发布中版本"
+            "comment": "07月06日发布"
+          }
+        ]
+      }
+    },
+    {
+      "version": "2.0.1",
+      "tag": "@qn-pandora/pandora-tools_v2.0.1",
+      "date": "Wed, 29 Jun 2022 08:28:54 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "app脚手架升级新低代码平台,增强searchContainer"
+          }
+        ]
+      }
+    },
+    {
+      "version": "2.0.0",
+      "tag": "@qn-pandora/pandora-tools_v2.0.0",
+      "date": "Tue, 14 Jun 2022 09:21:39 GMT",
+      "comments": {
+        "major": [
+          {
+            "comment": "很久没发版了，统一发个大版本"
           }
         ]
       }

package/CHANGELOG.md

@@ -1,18 +1,35 @@
 # Change Log - @qn-pandora/pandora-tools
 
-This log was last generated on Tue, 15 Mar 2022 12:05:29 GMT and should not be manually modified.
+This log was last generated on Wed, 06 Jul 2022 07:32:15 GMT and should not be manually modified.
 
-## 1.1.0
-Tue, 15 Mar 2022 12:05:29 GMT
+## 2.0.2
 
-### Minor changes
+Wed, 06 Jul 2022 07:32:15 GMT
 
-- 统一发布中版本
+### Patches
+
+- 07 月 06 日发布
+
+## 2.0.1
+
+Wed, 29 Jun 2022 08:28:54 GMT
+
+### Patches
+
+- app 脚手架升级新低代码平台,增强 searchContainer
+
+## 2.0.0
+
+Tue, 14 Jun 2022 09:21:39 GMT
+
+### Breaking changes
+
+- 很久没发版了，统一发个大版本
 
 ## 1.0.0
+
 Mon, 20 Dec 2021 11:46:43 GMT
 
 ### Breaking changes
 
-- 仓库迁移至rush后统一发个大版本
-
+- 仓库迁移至 rush 后统一发个大版本

package/README.md

@@ -1,19 +1,19 @@
-# pandora-tools
-
-develop and build pandora lib
-
-## Install
-
-``` bash
-# run in terminal
-yarn add @qn-pandora/pandora-tools -D
-# or
-npm install @qn-pandora/pandora-tools -dev
-```
-
-## Usage
-
-``` bash
-# run this command to get help
-pandora-tools --help
-```
+# pandora-tools
+
+develop and build pandora lib
+
+## Install
+
+``` bash
+# run in terminal
+yarn add @qn-pandora/pandora-tools -D
+# or
+npm install @qn-pandora/pandora-tools -dev
+```
+
+## Usage
+
+``` bash
+# run this command to get help
+pandora-tools --help
+```

package/bin/pandora-tools

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
-require('../src/cli')
+#!/usr/bin/env node
+
+require('../src/cli')

package/package.json

@@ -1,74 +1,72 @@
-{
-  "name": "@qn-pandora/pandora-tools",
-  "version": "1.1.1",
-  "description": "Pandora Lib 常用开发&打包工具集",
-  "author": "pandora <pandora@qiniu.com>",
-  "homepage": "https://github.com/qbox/phoenix#readme",
-  "license": "ISC",
-  "main": "src/index.js",
-  "bin": {
-    "pandora-tools": "./bin/pandora-tools"
-  },
-  "files": [
-    "/bin",
-    "/src"
-  ],
-  "scripts": {
-    "build": "exit 0",
-    "lint": "exit 0"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/qbox/phoenix.git"
-  },
-  "bugs": {
-    "url": "https://github.com/qbox/phoenix/issues"
-  },
-  "dependencies": {
-    "@types/classnames": "^2.2.7",
-    "@types/lodash": "^4.14.152",
-    "@types/react": "^16.14.5",
-    "@types/node": "^14.0.12",
-    "gulp": "^4.0.2",
-    "gulp-less": "^4.0.1",
-    "gulp-typescript": "^6.0.0-alpha.1",
-    "less-plugin-autoprefix": "^2.0.0",
-    "merge2": "^1.4.1",
-    "oclif": "^1.16.1",
-    "react-docgen-typescript-loader": "^3.7.2",
-    "rimraf": "^3.0.2",
-    "through2": "^4.0.2",
-    "webpack": "^4.35.3",
-    "@oclif/command": "^1",
-    "@oclif/errors": "~1.3.5",
-    "classnames": "^2.3.1",
-    "@storybook/react": "6.4.9",
-    "@storybook/theming": "6.4.9",
-    "@storybook/components": "6.4.9",
-    "@storybook/addon-docs": "6.4.9",
-    "babel-loader": "^8.1.0",
-    "ts-loader": "^7.0.5",
-    "@babel/core": "^7.0.1",
-    "style-loader": "^0.23.1",
-    "css-loader": "^3.0.0",
-    "less-loader": "^5.0.0",
-    "@mdx-js/loader": "^1.5.1",
-    "react-is": "^16.8.0"
-  },
-  "devDependencies": {
-    "lodash": "^4.17.15",
-    "react": "^16.8.6",
-    "antd": "4.16.9"
-  },
-  "peerDependencies": {
-    "lodash": "^4.17.15",
-    "react": "^16.8.6",
-    "antd": "4.16.9"
-  },
-  "oclif": {
-    "commands": "./src/cli/commands"
-  }
-}
+{
+  "name": "@qn-pandora/pandora-tools",
+  "version": "2.0.2",
+  "description": "Pandora Lib 常用开发&打包工具集",
+  "author": "pandora <pandora@qiniu.com>",
+  "homepage": "https://github.com/qbox/phoenix#readme",
+  "license": "ISC",
+  "main": "src/index.js",
+  "bin": {
+    "pandora-tools": "./bin/pandora-tools"
+  },
+  "files": [
+    "/bin",
+    "/src"
+  ],
+  "scripts": {
+    "build": "exit 0",
+    "lint": "exit 0"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/qbox/phoenix.git"
+  },
+  "bugs": {
+    "url": "https://github.com/qbox/phoenix/issues"
+  },
+  "dependencies": {
+    "@types/classnames": "^2.2.7",
+    "@types/lodash": "^4.14.152",
+    "@types/react": "^16.14.5",
+    "@types/node": "^14.0.12",
+    "gulp": "^4.0.2",
+    "gulp-less": "^4.0.1",
+    "gulp-typescript": "^6.0.0-alpha.1",
+    "less-plugin-autoprefix": "^2.0.0",
+    "merge2": "^1.4.1",
+    "oclif": "^1.16.1",
+    "react-docgen-typescript-loader": "^3.7.2",
+    "rimraf": "^3.0.2",
+    "through2": "^4.0.2",
+    "webpack": "^4.35.3",
+    "@oclif/command": "^1",
+    "@oclif/errors": "~1.3.5",
+    "classnames": "^2.2.6",
+    "@storybook/react": "6.4.9",
+    "@storybook/theming": "6.4.9",
+    "@storybook/components": "6.4.9",
+    "@storybook/addon-docs": "6.4.9",
+    "babel-loader": "^8.1.0",
+    "ts-loader": "^7.0.5",
+    "@babel/core": "^7.0.1",
+    "style-loader": "^0.23.1",
+    "css-loader": "^3.0.0",
+    "less-loader": "^5.0.0",
+    "@mdx-js/loader": "^1.5.1",
+    "react-is": "^16.8.0",
+    "lodash": "^4.17.15",
+    "antd": "4.17.1"
+  },
+  "devDependencies": {
+    "react": "^16.8.6"
+  },
+  "peerDependencies": {
+    "react": "^16.8.6"
+  },
+  "oclif": {
+    "commands": "./src/cli/commands"
+  }
+}

package/src/cli/commands/build.js

@@ -1,32 +1,32 @@
-const { Command } = require('@oclif/command')
-const runTask = require('../../index')
-const { initBuildContext } = require('../../projectHelper')
-
-class BuildCommand extends Command {
-  async run() {
-    initBuildContext()
-
-    const { type } = this.parse(BuildCommand).args
-    runTask('compileTs:' + type)
-  }
-}
-
-BuildCommand.description = `Build project to esm or cjs
-this command will
-1. build .ts, .tsx
-2. copy .less
-3. generate index.less which import all .less files
-4. build all .less to .css
-you can set esmDir, cjsDir, srcDir in pandora-tools.config.json`
-
-BuildCommand.args = [
-  {
-    name: 'type',
-    require: true,
-    description: 'module type',
-    default: 'esm',
-    options: ['esm', 'cjs']
-  }
-]
-
-module.exports = BuildCommand
+const { Command } = require('@oclif/command')
+const runTask = require('../../index')
+const { initBuildContext } = require('../../projectHelper')
+
+class BuildCommand extends Command {
+  async run() {
+    initBuildContext()
+
+    const { type } = this.parse(BuildCommand).args
+    runTask('compileTs:' + type)
+  }
+}
+
+BuildCommand.description = `Build project to esm or cjs
+this command will
+1. build .ts, .tsx
+2. copy .less
+3. generate index.less which import all .less files
+4. build all .less to .css
+you can set esmDir, cjsDir, srcDir in pandora-tools.config.json`
+
+BuildCommand.args = [
+  {
+    name: 'type',
+    require: true,
+    description: 'module type',
+    default: 'esm',
+    options: ['esm', 'cjs']
+  }
+]
+
+module.exports = BuildCommand

package/src/cli/commands/storybook.js

@@ -1,72 +1,72 @@
-const { Command, flags } = require('@oclif/command')
-const { spawn } = require('child_process')
-const path = require('path')
-const { getProjectPath, initStorybookContext } = require('../../projectHelper')
-
-const pandoraToolsDir = path.resolve(__dirname, '../../../')
-const storybookConfigPath = path.resolve(pandoraToolsDir, './.storybook')
-const startOptions = {
-  cmd: path.resolve(pandoraToolsDir, './node_modules/.bin/start-storybook'),
-  supportFlags: ['config-dir', 'port', 'static-dir']
-}
-const buildOptions = {
-  cmd: path.resolve(pandoraToolsDir, './node_modules/.bin/build-storybook'),
-  supportFlags: ['config-dir', 'static-dir', 'output-dir']
-}
-
-class StoryBookCommand extends Command {
-  async run() {
-    initStorybookContext()
-
-    const { args, flags } = this.parse(StoryBookCommand)
-    const { cmd, supportFlags } =
-      args.type === 'build' ? buildOptions : startOptions
-
-    const params = supportFlags.map(key => {
-      let value = flags[key]
-      if (key === 'output-dir' && value) {
-        // 默认输出路径
-        value = getProjectPath(value)
-      }
-      return value ? `--${key} ${value}` : ''
-    })
-
-    spawn(cmd, params, { stdio: 'inherit', shell: true, cwd: pandoraToolsDir })
-  }
-}
-
-StoryBookCommand.description = `start or build storybook of components`
-
-StoryBookCommand.args = [
-  {
-    name: 'type',
-    require: true,
-    description: 'run type',
-    default: 'start',
-    options: ['start', 'build']
-  }
-]
-
-StoryBookCommand.flags = {
-  'config-dir': flags.string({
-    char: 'c',
-    default: storybookConfigPath,
-    description: 'storybook config path'
-  }),
-  port: flags.integer({
-    char: 'p',
-    default: 9000,
-    description: 'port of storybook run'
-  }),
-  'static-dir': flags.string({
-    char: 's',
-    description: 'static directory'
-  }),
-  'output-dir': flags.string({
-    char: 'o',
-    default: './storybook-static',
-    description: 'output directory, relative to your project root'
-  })
-}
-
-module.exports = StoryBookCommand
+const { Command, flags } = require('@oclif/command')
+const { spawn } = require('child_process')
+const path = require('path')
+const { getProjectPath, initStorybookContext } = require('../../projectHelper')
+
+const pandoraToolsDir = path.resolve(__dirname, '../../../')
+const storybookConfigPath = path.resolve(pandoraToolsDir, './.storybook')
+const startOptions = {
+  cmd: path.resolve(pandoraToolsDir, './node_modules/.bin/start-storybook'),
+  supportFlags: ['config-dir', 'port', 'static-dir']
+}
+const buildOptions = {
+  cmd: path.resolve(pandoraToolsDir, './node_modules/.bin/build-storybook'),
+  supportFlags: ['config-dir', 'static-dir', 'output-dir']
+}
+
+class StoryBookCommand extends Command {
+  async run() {
+    initStorybookContext()
+
+    const { args, flags } = this.parse(StoryBookCommand)
+    const { cmd, supportFlags } =
+      args.type === 'build' ? buildOptions : startOptions
+
+    const params = supportFlags.map(key => {
+      let value = flags[key]
+      if (key === 'output-dir' && !value) {
+        // 默认输出路径
+        value = getProjectPath(value)
+      }
+      return value ? `--${key} ${value}` : ''
+    })
+
+    spawn(cmd, params, { stdio: 'inherit', shell: true, cwd: pandoraToolsDir })
+  }
+}
+
+StoryBookCommand.description = `start or build storybook of components`
+
+StoryBookCommand.args = [
+  {
+    name: 'type',
+    require: true,
+    description: 'run type',
+    default: 'start',
+    options: ['start', 'build']
+  }
+]
+
+StoryBookCommand.flags = {
+  'config-dir': flags.string({
+    char: 'c',
+    default: storybookConfigPath,
+    description: 'storybook config path'
+  }),
+  port: flags.integer({
+    char: 'p',
+    default: 9000,
+    description: 'port of storybook run'
+  }),
+  'static-dir': flags.string({
+    char: 's',
+    description: 'static directory'
+  }),
+  'output-dir': flags.string({
+    char: 'o',
+    default: './storybook-static',
+    description: 'output directory, relative to your project root'
+  })
+}
+
+module.exports = StoryBookCommand

package/src/cli/commands/watchLess.js

@@ -0,0 +1,32 @@
+const { Command } = require('@oclif/command')
+const runTask = require('../../index')
+const { initBuildContext } = require('../../projectHelper')
+
+class WatchLessCommand extends Command {
+  async run() {
+    initBuildContext()
+
+    const { type } = this.parse(WatchLessCommand).args
+    runTask('watchLess:' + type)
+  }
+}
+
+WatchLessCommand.description = `Watch and build less files to esm or cjs
+this command will
+1. watching less files, run next steps when less files changed
+2. copy .less
+3. generate index.less which import all .less files
+4. build all .less to .css
+you can set esmDir, cjsDir, srcDir in pandora-tools.config.json`
+
+WatchLessCommand.args = [
+  {
+    name: 'type',
+    require: true,
+    description: 'module type',
+    default: 'esm',
+    options: ['esm', 'cjs']
+  }
+]
+
+module.exports = WatchLessCommand

package/src/cli/index.js

@@ -1,6 +1,6 @@
-#!/usr/bin/env node
-
-require('@oclif/command')
-  .run()
-  .then(require('@oclif/command/flush'))
-  .catch(require('@oclif/errors/handle'))
+#!/usr/bin/env node
+
+require('@oclif/command')
+  .run()
+  .then(require('@oclif/command/flush'))
+  .catch(require('@oclif/errors/handle'))

package/src/gulpfile.js

@@ -1,40 +1,89 @@
-const gulp = require('gulp')
-const clear = require('./tasks/clear')
-const compileLess = require('./tasks/less')
-const compileTs = require('./tasks/ts')
-const { getProjectRoot, getToolsConfig } = require('./projectHelper')
-
-process.on('uncaughtException', function (err) {
-  console.error(err.message)
-  process.exit(1)
-})
-
-gulp.task(
-  'compileTs:esm',
-  gulp.series(
-    () => clear(getToolsConfig().esmDir),
-    () =>
-      compileTs(getProjectRoot(), getToolsConfig().esmDir, {
-        module: 'esnext'
-      }),
-    () => {
-      const { srcDir, esmDir } = getToolsConfig()
-      return compileLess(srcDir, esmDir)
-    }
-  )
-)
-
-gulp.task(
-  'compileTs:cjs',
-  gulp.series(
-    () => clear(getToolsConfig().libDir),
-    () =>
-      compileTs(getProjectRoot(), getToolsConfig().libDir, {
-        module: 'commonjs'
-      }),
-    () => {
-      const { srcDir, libDir } = getToolsConfig()
-      return compileLess(srcDir, libDir)
-    }
-  )
-)
+const gulp = require('gulp')
+const clear = require('./tasks/clear')
+const compileLess = require('./tasks/less')
+const compileTs = require('./tasks/ts')
+const {
+  getProjectRoot,
+  getToolsConfig,
+  getPackageJSON
+} = require('./projectHelper')
+
+process.on('uncaughtException', function (err) {
+  console.error(err.message)
+  process.exit(1)
+})
+
+function compileLessToEsm() {
+  const { srcDir, esmDir } = getToolsConfig()
+  return compileLess(srcDir, esmDir)
+}
+
+function compileLessToCjs() {
+  const { srcDir, libDir } = getToolsConfig()
+  return compileLess(srcDir, libDir)
+}
+
+async function building() {
+  console.log('building')
+}
+
+async function done() {
+  console.log('done')
+}
+
+/**
+ * watch 模式下构建报错不应该退出程序
+ */
+function catchErr(fn) {
+  return async () => {
+    try {
+      return await fn()
+    } catch (e) {
+      console.error(e)
+    }
+  }
+}
+
+gulp.task(
+  'compileTs:esm',
+  gulp.series(
+    () => clear(getToolsConfig().esmDir),
+    () =>
+      compileTs(getProjectRoot(), getToolsConfig().esmDir, {
+        module: 'esnext'
+      }),
+    compileLessToEsm
+  )
+)
+
+gulp.task(
+  'compileTs:cjs',
+  gulp.series(
+    () => clear(getToolsConfig().libDir),
+    () =>
+      compileTs(getProjectRoot(), getToolsConfig().libDir, {
+        module: 'commonjs'
+      }),
+    compileLessToCjs
+  )
+)
+
+gulp.task('watchLess:esm', function () {
+  console.log(
+    `[pandora tools] watchLess:esm watching ${getPackageJSON().name}...`
+  )
+  return gulp.watch(
+    `${getToolsConfig().srcDir}/**/*.less`,
+    gulp.series(building, catchErr(compileLessToEsm), done)
+  )
+})
+
+gulp.task('watchLess:cjs', function () {
+  console.log(
+    `[pandora tools] watchLess:cjs watching ${getPackageJSON().name}...`
+  )
+  return gulp.watch(
+    `${getToolsConfig().srcDir}/**/*.less`,
+    gulp.series(building, catchErr(compileLessToCjs), done)
+  )
+})

package/src/index.js

@@ -1,6 +1,6 @@
-const gulp = require('gulp')
-require('./gulpfile')
-
-module.exports = function(taskName) {
-  gulp.task(taskName).apply(gulp)
-}
+const gulp = require('gulp')
+require('./gulpfile')
+
+module.exports = function(taskName) {
+  gulp.task(taskName).apply(gulp)
+}

package/src/projectHelper.js

@@ -1,103 +1,102 @@
-const fs = require('fs')
-const path = require('path')
-
-const projectConfigFile = path.join(__dirname, '../project.json')
-
-let isStorybookContext = true
-
-function initBuildContext() {
-  initContext('build')
-}
-
-function initStorybookContext() {
-  initContext('storybook')
-}
-
-function initContext(context) {
-  if (context === 'build') {
-    isStorybookContext = false
-  }
-
-  if (isStorybookContext) {
-    const projectRoot = process.cwd()
-    let data = {}
-    try {
-      data = getProjectConfig()
-    } catch (e) {
-      // do nothing
-    }
-    console.log('[pandora tools] init storybook project root: ', projectRoot)
-    setProjectConfig({ ...data, projectRoot })
-  }
-}
-
-function getProjectConfig() {
-  if (fs.existsSync(projectConfigFile)) {
-    const raw = fs.readFileSync(projectConfigFile)
-    return JSON.parse(raw)
-  }
-  return {}
-}
-
-function setProjectConfig(config) {
-  fs.writeFileSync(projectConfigFile, JSON.stringify(config))
-}
-
-function getProjectRoot() {
-  let projectRoot = process.cwd()
-  if (isStorybookContext) {
-    try {
-      const config = getProjectConfig()
-      projectRoot = config.projectRoot
-    } catch (e) {
-      // do nothing
-    }
-  }
-  console.log('[pandora tools] get project root', projectRoot)
-  return projectRoot
-}
-
-function getProjectPath(pathStr) {
-  const projectRoot = getProjectRoot()
-  return path.resolve(projectRoot, pathStr)
-}
-
-function getConfig(pathStr) {
-  const configPath = getProjectPath(pathStr)
-  if (fs.existsSync(configPath)) {
-    return require(configPath)
-  }
-
-  return {}
-}
-
-function getToolsConfig(pathStr) {
-  const toolsConfig = getConfig(pathStr || '.pandora-tools.config.js')
-  return Object.assign(
-    {
-      srcDir: './src',
-      esmDir: './es',
-      libDir: './lib',
-      mainFileName: 'index'
-    },
-    toolsConfig
-  )
-}
-
-function getWebpackConfig(pathStr) {
-  return getConfig(pathStr || 'webpack.config.js')
-}
-
-function getPackageJSON() {
-  return getConfig('package.json')
-}
-
-module.exports = {
-  initBuildContext,
-  initStorybookContext,
-  getProjectRoot,
-  getProjectPath,
-  getToolsConfig,
-  getWebpackConfig,
-  getPackageJSON
-}
+const fs = require('fs')
+const path = require('path')
+
+const projectConfigFile = path.join(__dirname, '../project.json')
+
+let isStorybookContext = true
+
+function initBuildContext() {
+  initContext('build')
+}
+
+function initStorybookContext() {
+  initContext('storybook')
+}
+
+function initContext(context) {
+  if (context === 'build') {
+    isStorybookContext = false
+  }
+
+  if (isStorybookContext) {
+    const projectRoot = process.cwd()
+    let data = {}
+    try {
+      data = getProjectConfig()
+    } catch (e) {
+      // do nothing
+    }
+    console.log('[pandora tools] init storybook project root: ', projectRoot)
+    setProjectConfig({ ...data, projectRoot })
+  }
+}
+
+function getProjectConfig() {
+  if (fs.existsSync(projectConfigFile)) {
+    const raw = fs.readFileSync(projectConfigFile)
+    return JSON.parse(raw)
+  }
+  return {}
+}
+
+function setProjectConfig(config) {
+  fs.writeFileSync(projectConfigFile, JSON.stringify(config))
+}
+
+function getProjectRoot() {
+  let projectRoot = process.cwd()
+  if (isStorybookContext) {
+    try {
+      const config = getProjectConfig()
+      projectRoot = config.projectRoot
+    } catch (e) {
+      // do nothing
+    }
+  }
+  return projectRoot
+}
+
+function getProjectPath(pathStr) {
+  const projectRoot = getProjectRoot()
+  return path.resolve(projectRoot, pathStr)
+}
+
+function getConfig(pathStr) {
+  const configPath = getProjectPath(pathStr)
+  if (fs.existsSync(configPath)) {
+    return require(configPath)
+  }
+
+  return {}
+}
+
+function getToolsConfig(pathStr) {
+  const toolsConfig = getConfig(pathStr || '.pandora-tools.config.js')
+  return Object.assign(
+    {
+      srcDir: './src',
+      esmDir: './es',
+      libDir: './lib',
+      mainFileName: 'index'
+    },
+    toolsConfig
+  )
+}
+
+function getWebpackConfig(pathStr) {
+  return getConfig(pathStr || 'webpack.config.js')
+}
+
+function getPackageJSON() {
+  return getConfig('package.json')
+}
+
+module.exports = {
+  initBuildContext,
+  initStorybookContext,
+  getProjectRoot,
+  getProjectPath,
+  getToolsConfig,
+  getWebpackConfig,
+  getPackageJSON
+}

package/src/tasks/clear.js

@@ -1,6 +1,6 @@
-const rimraf = require('rimraf')
-
-module.exports = function(dir) {
-  rimraf.sync(dir)
-  return Promise.resolve()
-}
+const rimraf = require('rimraf')
+
+module.exports = function(dir) {
+  rimraf.sync(dir)
+  return Promise.resolve()
+}

package/src/tasks/less.js

@@ -1,54 +1,64 @@
-const gulp = require('gulp')
-const gulpLess = require('gulp-less')
-const path = require('path')
-const fs = require('fs')
-const through2 = require('through2')
-const LessAutoprefix = require('less-plugin-autoprefix')
-
-const autoprefix = new LessAutoprefix({ browsers: ['last 2 versions'] })
-
-function copyLess(srcDir, outDir) {
-  const imports = []
-  return gulp
-    .src(`${srcDir}/**/*.less`)
-    .pipe(
-      through2.obj(function(file, encoding, next) {
-        this.push(file)
-        const filePath = path.relative(outDir, file.path)
-        imports.push(`@import './${filePath}';`)
-        next()
-      })
-    )
-    .pipe(gulp.dest(outDir))
-    .on('finish', function() {
-      if (imports.length === 0) {
-        return
-      }
-      // when copy finish write root index.less
-      fs.writeFileSync(
-        path.resolve(outDir, 'index.less'),
-        imports.join('\n'),
-        'utf8'
-      )
-    })
-}
-
-function compileLess(srcDir, outDir) {
-  return gulp
-    .src(`${srcDir}/**/*.less`)
-    .pipe(
-      gulpLess({
-        paths: [srcDir, 'node_modules'],
-        plugins: [autoprefix],
-        javascriptEnabled: true
-      })
-    )
-    .pipe(gulp.dest(outDir))
-}
-
-module.exports = function(srcDir, outDir) {
-  return gulp.series(
-    () => copyLess(srcDir, outDir),
-    () => compileLess(outDir, outDir)
-  )()
-}
+const gulp = require('gulp')
+const gulpLess = require('gulp-less')
+const path = require('path')
+const fs = require('fs')
+const through2 = require('through2')
+const LessAutoprefix = require('less-plugin-autoprefix')
+
+const autoprefix = new LessAutoprefix({ browsers: ['last 2 versions'] })
+
+function copyLess(srcDir, outDir) {
+  const imports = []
+  return new Promise(function (resolve, reject) {
+    gulp
+      .src(`${srcDir}/**/*.less`)
+      .on('error', reject)
+      .pipe(
+        through2.obj(function (file, _, next) {
+          this.push(file)
+          const filePath = path.relative(outDir, file.path)
+          imports.push(`@import './${filePath}';`)
+          next()
+        })
+      )
+      .on('error', reject)
+      .pipe(gulp.dest(outDir))
+      .on('error', reject)
+      .on('finish', function () {
+        if (imports.length === 0) {
+          return
+        }
+        // when copy finish write root index.less
+        fs.writeFileSync(
+          path.resolve(outDir, 'index.less'),
+          imports.join('\n'),
+          'utf8'
+        )
+        resolve()
+      })
+  })
+}
+
+function compileLess(srcDir, outDir) {
+  return new Promise((resolve, reject) => {
+    gulp
+      .src(`${srcDir}/**/*.less`)
+      .on('error', reject)
+      .pipe(
+        gulpLess({
+          paths: [srcDir, 'node_modules'],
+          plugins: [autoprefix],
+          javascriptEnabled: true
+        })
+      )
+      .on('error', reject)
+      .pipe(gulp.dest(outDir))
+      .on('error', reject)
+      .on('finish', resolve)
+  })
+}
+
+module.exports = async function (srcDir, outDir) {
+  await copyLess(srcDir, outDir)
+  await compileLess(outDir, outDir)
+}

package/src/tasks/ts.js

@@ -1,54 +1,54 @@
-const path = require('path')
-const gulp = require('gulp')
-const tsGulp = require('gulp-typescript')
-const merge = require('merge2')
-
-module.exports = function(projectDir, outDir, extraTsConfig) {
-  const tsProject = tsGulp.createProject(
-    path.resolve(projectDir, 'tsconfig.json'),
-    extraTsConfig
-  )
-  const tsResult = tsProject.src().pipe(tsProject())
-  return merge([
-    tsResult.js.pipe(gulp.dest(outDir)),
-    tsResult.dts.pipe(gulp.dest(outDir))
-  ])
-}
-
-/* function compileByWebpack(done) {
-  rimraf.sync(distDir)
-  process.env.RUN_ENV = 'PRODUCTION'
-  webpack(getWebpackConfig(), (err, stats) => {
-    if (err) {
-      console.error(err.stack || err)
-      if (err.details) {
-        console.error(err.details)
-      }
-      return
-    }
-
-    const info = stats.toJson()
-
-    if (stats.hasErrors()) {
-      console.error(info.errors)
-    }
-
-    if (stats.hasWarnings()) {
-      console.warn(info.warnings)
-    }
-
-    const buildInfo = stats.toString({
-      colors: true,
-      children: true,
-      chunks: false,
-      modules: false,
-      chunkModules: false,
-      hash: false,
-      version: false
-    })
-    console.log(buildInfo)
-
-    done(0)
-  })
-}
-gulp.task('compileTs:dist', compileByWebpack)*/
+const path = require('path')
+const gulp = require('gulp')
+const tsGulp = require('gulp-typescript')
+const merge = require('merge2')
+
+module.exports = function(projectDir, outDir, extraTsConfig) {
+  const tsProject = tsGulp.createProject(
+    path.resolve(projectDir, 'tsconfig.json'),
+    extraTsConfig
+  )
+  const tsResult = tsProject.src().pipe(tsProject())
+  return merge([
+    tsResult.js.pipe(gulp.dest(outDir)),
+    tsResult.dts.pipe(gulp.dest(outDir))
+  ])
+}
+
+/* function compileByWebpack(done) {
+  rimraf.sync(distDir)
+  process.env.RUN_ENV = 'PRODUCTION'
+  webpack(getWebpackConfig(), (err, stats) => {
+    if (err) {
+      console.error(err.stack || err)
+      if (err.details) {
+        console.error(err.details)
+      }
+      return
+    }
+
+    const info = stats.toJson()
+
+    if (stats.hasErrors()) {
+      console.error(info.errors)
+    }
+
+    if (stats.hasWarnings()) {
+      console.warn(info.warnings)
+    }
+
+    const buildInfo = stats.toString({
+      colors: true,
+      children: true,
+      chunks: false,
+      modules: false,
+      chunkModules: false,
+      hash: false,
+      version: false
+    })
+    console.log(buildInfo)
+
+    done(0)
+  })
+}
+gulp.task('compileTs:dist', compileByWebpack)*/