@qn-pandora/pandora-tools 0.1.0 → 1.0.0

package/CHANGELOG.json

@@ -0,0 +1,17 @@
+{
+  "name": "@qn-pandora/pandora-tools",
+  "entries": [
+    {
+      "version": "1.0.0",
+      "tag": "@qn-pandora/pandora-tools_v1.0.0",
+      "date": "Mon, 20 Dec 2021 09:51:49 GMT",
+      "comments": {
+        "major": [
+          {
+            "comment": "仓库迁移至rush后统一发个大版本"
+          }
+        ]
+      }
+    }
+  ]
+}

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Change Log - @qn-pandora/pandora-tools
+
+This log was last generated on Mon, 20 Dec 2021 09:51:49 GMT and should not be manually modified.
+
+## 1.0.0
+Mon, 20 Dec 2021 09:51:49 GMT
+
+### Breaking changes
+
+- 仓库迁移至rush后统一发个大版本
+

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@qn-pandora/pandora-tools",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Pandora Lib 常用开发&打包工具集",
   "author": "pandora <pandora@qiniu.com>",
-  "homepage": "https://github.com/qbox/pandora-visualization#readme",
+  "homepage": "https://github.com/qbox/phoenix#readme",
   "license": "ISC",
   "main": "src/index.js",
   "bin": {
@@ -18,17 +18,20 @@
     "lint": "exit 0"
   },
   "publishConfig": {
-    "registry": "http://registry.npmjs.org/"
+    "registry": "https://registry.npmjs.org/"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/qbox/pandora-visualization.git"
+    "url": "git+https://github.com/qbox/phoenix.git"
   },
   "bugs": {
-    "url": "https://github.com/qbox/pandora-visualization/issues"
+    "url": "https://github.com/qbox/phoenix/issues"
   },
   "dependencies": {
-    "@storybook/react": "6.0.0-beta.13",
+    "@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",
@@ -38,16 +41,34 @@
     "react-docgen-typescript-loader": "^3.7.2",
     "rimraf": "^3.0.2",
     "through2": "^4.0.2",
-    "webpack": "^4.35.3"
+    "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": {
-    "@storybook/addon-docs": "^5.3.19"
+    "lodash": "^4.17.15",
+    "react": "^16.8.6",
+    "antd": "4.16.3"
   },
   "peerDependencies": {
-    "@storybook/addon-docs": "^5.3.19"
+    "lodash": "^4.17.15",
+    "react": "^16.8.6",
+    "antd": "4.16.3"
   },
   "oclif": {
     "commands": "./src/cli/commands"
-  },
-  "gitHead": "238bf5cd62d1f0a46e064961bc4ff82ac63dcd6b"
+  }
 }

package/src/cli/commands/build.js

@@ -1,8 +1,11 @@
 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)
   }

package/src/cli/commands/storybook.js

@@ -1,6 +1,7 @@
 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')
@@ -10,18 +11,27 @@ const startOptions = {
 }
 const buildOptions = {
   cmd: path.resolve(pandoraToolsDir, './node_modules/.bin/build-storybook'),
-  supportFlags: ['config-dir', 'static-dir']
+  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 => `--${key} ${flags[key]}`)
+    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 })
+    spawn(cmd, params, { stdio: 'inherit', shell: true, cwd: pandoraToolsDir })
   }
 }
 
@@ -50,8 +60,12 @@ StoryBookCommand.flags = {
   }),
   'static-dir': flags.string({
     char: 's',
-    default: './public',
     description: 'static directory'
+  }),
+  'output-dir': flags.string({
+    char: 'o',
+    default: './storybook-static',
+    description: 'output directory, relative to your project root'
   })
 }
 

package/src/gulpfile.js

@@ -2,11 +2,9 @@ const gulp = require('gulp')
 const clear = require('./tasks/clear')
 const compileLess = require('./tasks/less')
 const compileTs = require('./tasks/ts')
-const { projectRoot, getToolsConfig } = require('./projectHelper')
+const { getProjectRoot, getToolsConfig } = require('./projectHelper')
 
-const { srcDir, esmDir, libDir } = getToolsConfig()
-
-process.on('uncaughtException', function(err) {
+process.on('uncaughtException', function (err) {
   console.error(err.message)
   process.exit(1)
 })
@@ -14,17 +12,29 @@ process.on('uncaughtException', function(err) {
 gulp.task(
   'compileTs:esm',
   gulp.series(
-    () => clear(esmDir),
-    () => compileTs(projectRoot, esmDir, { module: 'ES6' }),
-    () => compileLess(srcDir, esmDir)
+    () => clear(getToolsConfig().esmDir),
+    () =>
+      compileTs(getProjectRoot(), getToolsConfig().esmDir, {
+        module: 'esnext'
+      }),
+    () => {
+      const { srcDir, esmDir } = getToolsConfig()
+      return compileLess(srcDir, esmDir)
+    }
   )
 )
 
 gulp.task(
   'compileTs:cjs',
   gulp.series(
-    () => clear(libDir),
-    () => compileTs(projectRoot, libDir, { module: 'commonjs' }),
-    () => compileLess(srcDir, libDir)
+    () => clear(getToolsConfig().libDir),
+    () =>
+      compileTs(getProjectRoot(), getToolsConfig().libDir, {
+        module: 'commonjs'
+      }),
+    () => {
+      const { srcDir, libDir } = getToolsConfig()
+      return compileLess(srcDir, libDir)
+    }
   )
 )

package/src/projectHelper.js

@@ -1,9 +1,64 @@
 const fs = require('fs')
 const path = require('path')
 
-const projectRoot = process.cwd()
+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)
 }
 
@@ -22,7 +77,8 @@ function getToolsConfig(pathStr) {
     {
       srcDir: './src',
       esmDir: './es',
-      libDir: './lib'
+      libDir: './lib',
+      mainFileName: 'index'
     },
     toolsConfig
   )
@@ -32,9 +88,16 @@ function getWebpackConfig(pathStr) {
   return getConfig(pathStr || 'webpack.config.js')
 }
 
+function getPackageJSON() {
+  return getConfig('package.json')
+}
+
 module.exports = {
-  projectRoot,
+  initBuildContext,
+  initStorybookContext,
+  getProjectRoot,
   getProjectPath,
   getToolsConfig,
-  getWebpackConfig
+  getWebpackConfig,
+  getPackageJSON
 }

package/src/tasks/less.js

@@ -38,7 +38,7 @@ function compileLess(srcDir, outDir) {
     .src(`${srcDir}/**/*.less`)
     .pipe(
       gulpLess({
-        paths: [srcDir],
+        paths: [srcDir, 'node_modules'],
         plugins: [autoprefix],
         javascriptEnabled: true
       })