@qn-pandora/pandora-tools 1.0.1 → 2.0.0

package/CHANGELOG.json

@@ -2,13 +2,13 @@
   "name": "@qn-pandora/pandora-tools",
   "entries": [
     {
-      "version": "1.0.1",
-      "tag": "@qn-pandora/pandora-tools_v1.0.1",
-      "date": "Fri, 28 Jan 2022 15:30:56 GMT",
+      "version": "2.0.0",
+      "tag": "@qn-pandora/pandora-tools_v2.0.0",
+      "date": "Tue, 14 Jun 2022 09:21:39 GMT",
       "comments": {
-        "patch": [
+        "major": [
           {
-            "comment": "1.28publish"
+            "comment": "很久没发版了，统一发个大版本"
           }
         ]
       }

package/CHANGELOG.md

@@ -1,14 +1,14 @@
 # Change Log - @qn-pandora/pandora-tools
 
-This log was last generated on Fri, 28 Jan 2022 15:30:56 GMT and should not be manually modified.
+This log was last generated on Tue, 14 Jun 2022 09:21:39 GMT and should not be manually modified.
 
-## 1.0.1
+## 2.0.0
 
-Fri, 28 Jan 2022 15:30:56 GMT
+Tue, 14 Jun 2022 09:21:39 GMT
 
-### Patches
+### Breaking changes
 
-- 1.28publish
+- 很久没发版了，统一发个大版本
 
 ## 1.0.0
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qn-pandora/pandora-tools",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "Pandora Lib 常用开发&打包工具集",
   "author": "pandora <pandora@qiniu.com>",
   "homepage": "https://github.com/qbox/phoenix#readme",
@@ -44,7 +44,7 @@
     "webpack": "^4.35.3",
     "@oclif/command": "^1",
     "@oclif/errors": "~1.3.5",
-    "classnames": "^2.3.1",
+    "classnames": "^2.2.6",
     "@storybook/react": "6.4.9",
     "@storybook/theming": "6.4.9",
     "@storybook/components": "6.4.9",
@@ -56,17 +56,15 @@
     "css-loader": "^3.0.0",
     "less-loader": "^5.0.0",
     "@mdx-js/loader": "^1.5.1",
-    "react-is": "^16.8.0"
+    "react-is": "^16.8.0",
+    "lodash": "^4.17.15",
+    "antd": "4.17.1"
   },
   "devDependencies": {
-    "lodash": "^4.17.15",
-    "react": "^16.8.6",
-    "antd": "4.16.9"
+    "react": "^16.8.6"
   },
   "peerDependencies": {
-    "lodash": "^4.17.15",
-    "react": "^16.8.6",
-    "antd": "4.16.9"
+    "react": "^16.8.6"
   },
   "oclif": {
     "commands": "./src/cli/commands"

package/src/cli/commands/storybook.js

@@ -24,7 +24,7 @@ class StoryBookCommand extends Command {
 
     const params = supportFlags.map(key => {
       let value = flags[key]
-      if (key === 'output-dir' && value) {
+      if (key === 'output-dir' && !value) {
         // 默认输出路径
         value = getProjectPath(value)
       }

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/gulpfile.js

@@ -2,13 +2,48 @@ const gulp = require('gulp')
 const clear = require('./tasks/clear')
 const compileLess = require('./tasks/less')
 const compileTs = require('./tasks/ts')
-const { getProjectRoot, getToolsConfig } = require('./projectHelper')
+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(
@@ -17,10 +52,7 @@ gulp.task(
       compileTs(getProjectRoot(), getToolsConfig().esmDir, {
         module: 'esnext'
       }),
-    () => {
-      const { srcDir, esmDir } = getToolsConfig()
-      return compileLess(srcDir, esmDir)
-    }
+    compileLessToEsm
   )
 )
 
@@ -32,9 +64,26 @@ gulp.task(
       compileTs(getProjectRoot(), getToolsConfig().libDir, {
         module: 'commonjs'
       }),
-    () => {
-      const { srcDir, libDir } = getToolsConfig()
-      return compileLess(srcDir, libDir)
-    }
+    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/projectHelper.js

@@ -53,7 +53,6 @@ function getProjectRoot() {
       // do nothing
     }
   }
-  console.log('[pandora tools] get project root', projectRoot)
   return projectRoot
 }
 

package/src/tasks/less.js

@@ -9,46 +9,56 @@ 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'
+  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 gulp
-    .src(`${srcDir}/**/*.less`)
-    .pipe(
-      gulpLess({
-        paths: [srcDir, 'node_modules'],
-        plugins: [autoprefix],
-        javascriptEnabled: true
-      })
-    )
-    .pipe(gulp.dest(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 = function(srcDir, outDir) {
-  return gulp.series(
-    () => copyLess(srcDir, outDir),
-    () => compileLess(outDir, outDir)
-  )()
+module.exports = async function (srcDir, outDir) {
+  await copyLess(srcDir, outDir)
+  await compileLess(outDir, outDir)
 }