refactor: 重构配置文件

packages/cli-shared/package.json

@@ -13,9 +13,6 @@
   "files": [
     "dist"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/xus-code/cli.git"
@@ -55,4 +52,4 @@
     "@types/rimraf": "^3.0.0",
     "@types/yargs-parser": "^20.2.0"
   }
-}
+}

packages/cli-types/package.json

@@ -13,9 +13,6 @@
   "files": [
     "dist"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/xus-code/cli.git"
@@ -36,4 +33,4 @@
   "devDependencies": {
     "postcss": "^8.2.8"
   }
-}
+}

packages/cli-types/src/types.ts

@@ -67,6 +67,12 @@ export interface IPluginAPI extends IPluginAPIBase {
 }
 
 // IConfig
+
+type ICmd = {
+  bin: string
+  args: string[]
+  message: IRunCmdMessage
+}
 export interface IConfig extends IProjectConfig {
   libBuild: {
     libName: string
@@ -77,7 +83,7 @@ export interface IConfig extends IProjectConfig {
     minify: false | 'esbuild' | 'terser'
     alwaysEmptyDistDir: boolean
     css: {
-      injectScript: boolean
+      injectMode: false | 'script' | 'url'
       cssCodeSplit: boolean
       modules: {
         getJSON?: (
@@ -104,12 +110,30 @@ export interface IConfig extends IProjectConfig {
       postcss: Postcss.ProcessOptions & { plugins: Postcss.Plugin[] }
       preprocessor: Partial<Record<'sass' | 'less' | 'stylus', any>>
     }
+    assets: {
+      dirname: string
+      inlineLimit: number
+    }
+    json: {
+      exportMode: 'named' | 'stringify'
+    }
+    alias: Record<string, string>
+    replace: Record<string, string>
+    excludeExternal: string[]
 
     // lerna mode
-    pkgsOrder: string[]
+    lerna:
+      | false
+      | {
+          // independentConfig: boolean
+          pkgsOrder: string[]
+          excludePkgs: string[]
+        }
 
     // insider
     rollupChain: (rc: IRollupChain) => IRollupChain
+
+    afterBuild: ICmd[]
   }
   lint: {
     eslint:
@@ -132,11 +156,7 @@ export interface IConfig extends IProjectConfig {
   }
   release: {
     // before hooks for run lint test build...
-    beforeRelease: {
-      bin: string
-      args: string[]
-      message: IRunCmdMessage
-    }[]
+    beforeRelease: ICmd[]
     // in lenra mode to ensure pkg publish order
     order: string[]
     branch: string

packages/plugin-cmd-roll-lib/src/config/index.ts

@@ -11,18 +11,35 @@ export const libBuildSchema = createSchema<IRollLibConfig>((joi) =>
     sourcemap: joi.boolean(),
     alwaysEmptyDistDir: joi.boolean(),
     css: joi.object({
-      injectScript: joi.boolean(),
+      injectMode: joi.boolean(),
       cssCodeSplit: joi.boolean(),
       modules: joi.object(),
       preprocessor: joi.object(),
       postcss: joi.object()
     }),
+    assets: {
+      dirname: joi.string(),
+      inlineLimit: joi.number()
+    },
+    json: {
+      exportMode: joi.string()
+    },
+    alias: joi.object(),
+    replace: joi.object(),
+    excludeExternal: joi.array().items(joi.string()),
 
     // lerna mode
-    pkgsOrder: joi.array().items(joi.string()),
-    pointPkgs: joi.array().items(joi.string()),
+    lerna: [
+      joi.boolean(),
+      joi.object({
+        independentConfig: joi.boolean(),
+        pkgsOrder: joi.array().items(joi.string()),
+        excludePkgs: joi.array().items(joi.string())
+      })
+    ],
 
-    rollupChain: joi.function()
+    rollupChain: joi.function(),
+    afterBuild: joi.array()
   })
 )
 
@@ -36,14 +53,30 @@ export const defaultLibBuildConfig: () => IRollLibConfig = () => {
     minify: false,
     alwaysEmptyDistDir: false,
     css: {
-      injectScript: false,
+      injectMode: false,
       cssCodeSplit: false,
       modules: {},
       preprocessor: {},
       postcss: {}
     },
+    assets: {
+      dirname: 'assets',
+      inlineLimit: 0
+    },
+    json: {
+      exportMode: 'named'
+    },
+    alias: {},
+    replace: {},
+    excludeExternal: [],
 
     // lerna mode
-    pkgsOrder: []
+    lerna: {
+      independentConfig: false,
+      pkgsOrder: [],
+      excludePkgs: []
+    },
+
+    afterBuild: []
   }
 }

packages/plugin-cmd-roll-lib/src/index.ts

@@ -1,5 +1,5 @@
 import { createPlugin } from '@xus/cli-types'
-import { chalk } from '@xus/cli-shared'
+import { chalk, runCmd } from '@xus/cli-shared'
 import { basename } from 'path'
 import { rollupBundler } from './bundler'
 import { resolveConfig, generateBuildOps } from './resolveConfig'
@@ -34,6 +34,7 @@ export default createPlugin({
         // resolveConfig
         api.logger.debug(`resolve config `)
         const resolvedConfig = resolveConfig(args, config, api)
+
         // default config should run before user modify
         api.logger.debug(`modify rollup config `)
         api.modifyRollupConfig({
@@ -57,8 +58,28 @@ export default createPlugin({
           // to rollup
           api.logger.info(chalk.yellow(`running for ${basename(pkg)}`))
           await rollupBundler(buildOps)
+          //   if (resolvedConfig.rollTypes) {
+          //     api.logger.debug(`roll types `)
+          //     await runCmd(
+          //       'npx',
+          //       ['tsc', '--emitDeclarationOnly', '--outDir', 'xus_type'],
+          //       {
+          //         start: 'generate types start',
+          //         succeed: 'generate types succeed',
+          //         failed: 'generate types failed'
+          //       }
+          //     )
+          //   }
           process.chdir(saveCwd)
         }
+
+        const afterBuild = resolvedConfig.afterBuild
+        if (afterBuild && afterBuild.length > 0) {
+          api.logger.info(`after build command running `)
+          await afterBuild.reduce((p, cmd) => {
+            return p.then(() => runCmd(cmd.bin, cmd.args, cmd.message))
+          }, Promise.resolve(true))
+        }
       }
     )
   },

packages/plugin-cmd-roll-lib/src/modify.ts

@@ -28,7 +28,9 @@ export function modifyConfig(
       extensions
     }
   ])
-  rc.plugin('commonjs').use(commonjs).after('commonjs')
+  rc.plugin('commonjs')
+    .use(commonjs, [{ sourceMap: false }])
+    .after('nodeResolve')
 
   // esbuild
   rc.plugin('$$esbuild').use(esbuildPlugin, [
@@ -52,7 +54,7 @@ export function modifyConfig(
   const css = resolvedConfig.css
   rc.plugin('$$css').use(cssPlugin, [
     {
-      injectScript: css.injectScript,
+      injectMode: css.injectMode,
       cssCodeSplit: css.cssCodeSplit,
       minify: !!resolvedConfig.minify,
       modules: css.modules || {},
@@ -62,36 +64,48 @@ export function modifyConfig(
   ])
 
   // asset
-  rc.plugin('asset').use(assetPlugin, [
+  const assets = resolvedConfig.assets
+  rc.plugin('$$assets').use(assetPlugin, [
     {
-      assetDir: 'assets',
+      assetDir: assets.dirname,
       assetRoot: join(api.cwd, 'assets'),
-      inlineLimit: 0
+      inlineLimit: assets.inlineLimit
     }
   ])
 
   // json
+  const json = resolvedConfig.json
   rc.plugin('$$json').use(jsonPlugin, [
     {
-      exportMode: 'stringify'
+      exportMode: json.exportMode
     }
   ])
 
   //alias
+  const configAlias = resolvedConfig.alias
+  const aliasEntries = Object.keys(configAlias).map((find) => ({
+    find,
+    replacement: configAlias[find]
+  }))
   rc.plugin('alias').use(alias, [
     {
-      entries: [{ find: '@', replacement: join(api.cwd, 'src') }]
+      entries: [
+        { find: '@', replacement: join(api.cwd, 'src') },
+        ...aliasEntries
+      ]
     }
   ])
+  const configReplace = resolvedConfig.replace
   rc.plugin('replace').use(replace, [
     {
-      preventAssignment: true
+      preventAssignment: true,
+      ...configReplace
     }
   ])
 
   // external
-  // TODO: excludeExternal config
-  getPkgDeps(api.cwd).forEach((dep) => rc.external.set(dep))
+  const excludeExternal = resolvedConfig.excludeExternal
+  getPkgDeps(api.cwd, excludeExternal).forEach((dep) => rc.external.set(dep))
 
   // onwarn
   rc.onwarn((warning, onwarn) => {
@@ -105,7 +119,7 @@ function onRollupWarning(warning: RollupWarning, onwarn: WarningHandler) {
   onwarn(warning)
 }
 
-function getPkgDeps(root: string): string[] {
+function getPkgDeps(root: string, exclude: string[]): string[] {
   let pkg = null
   try {
     pkg = require(join(root, 'package.json'))
@@ -117,7 +131,7 @@ function getPkgDeps(root: string): string[] {
     deps = [
       ...Object.keys(pkg?.dependencies || {}),
       ...Object.keys(pkg?.peerDependencies || {})
-    ]
+    ].filter((dep) => !exclude.includes(dep))
   }
   return deps
 }

packages/plugin-cmd-roll-lib/src/plugins/css.ts

@@ -39,7 +39,7 @@ export type IPostcssOps = Postcss.ProcessOptions & {
 }
 export type IPreprocessorOps = Partial<Record<string, any>>
 interface ICssOps {
-  injectScript?: boolean
+  injectMode?: false | 'script' | 'url'
   cssCodeSplit?: boolean
   minify?: boolean
   // ops
@@ -56,8 +56,7 @@ const commonjsProxyRE = /\?commonjs-proxy/
 const cssCache = new Map<string, string>()
 const opsToFullCssChunk = new WeakMap<NormalizedOutputOptions, string>()
 export function cssPlugin(ops?: ICssOps): Plugin {
-  const { cssCodeSplit = false, injectScript = false, minify = false } =
-    ops || {}
+  const { cssCodeSplit = false, injectMode = false, minify = false } = ops || {}
   let hasGenFullStyle = false
   return {
     name: 'xus:rollup:css',
@@ -103,18 +102,20 @@ export function cssPlugin(ops?: ICssOps): Plugin {
         // bundle a css for every chunk
         // 1. minify  replace
         cssChunk = await processCssChunk(cssChunk, {
-          inject: injectScript,
+          inject: !!injectMode,
           minify
         })
         // 2. inject code
         const filename = `${chunk.name}.css`
-        let injectCode = `import './css/${filename}';\n`
-        if (injectScript) {
+        let injectCode = ''
+        if (injectMode === 'script') {
           const style = `__xus__style__`
           injectCode =
             `var ${style} = document.createElement('style');\n` +
             `${style}.innerHTML = ${JSON.stringify(cssChunk)};\n` +
             `document.head.appendChild(${style});`
+        } else if (injectMode === 'url') {
+          injectCode = `import './css/${filename}';\n`
         }
         const s = new MagicString(code)
         s.prepend(injectCode)
@@ -297,7 +298,7 @@ async function compileCss(
 
 async function processCssChunk(
   css: string,
-  { inject, minify }: { inject: boolean; minify: boolean }
+  { minify }: { inject: boolean; minify: boolean }
 ) {
   let res = css
   // replace assets mark