fix: 去除ctx设置能力统一采用cwd

xuasir · Feb 24, 2021 · e5714e0 · e5714e0
1 parent 2b776d1
commit e5714e0
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 23 deletions.
diff --git a/packages/cli/src/Service.ts b/packages/cli/src/Service.ts
@@ -2,7 +2,6 @@ import { CliService } from '@xus/core'
 import presetBuiltIn from '@xus/preset-built-in'
 
 type IXUSCliServiceOps = {
-  ctxPath: string
   mode: string
 }
 

diff --git a/packages/cli/src/xus.ts b/packages/cli/src/xus.ts
@@ -7,7 +7,6 @@ const rawArgs = process.argv.slice(2)
 const args = minimist(rawArgs)
 const commandName = args._[0]
 const ops = {
-  ctxPath: process.env.XUS_CLI_CONTEXT || process.cwd(),
   mode: args?.mode || 'development'
 }
 const cli = new XUSCliService(ops)

diff --git a/packages/core/src/cli/Service.ts b/packages/core/src/cli/Service.ts
@@ -38,7 +38,7 @@ export class CliService {
     logger.debug(ops)
     // 1. init manager
     this.setStage(CliServiceStage.initManager)
-    this.PathManager = new PathManager(ops.ctxPath)
+    this.PathManager = new PathManager()
     this.EnvManager = new EnvManager({
       service: this,
       mode: ops.mode

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -4,7 +4,6 @@ import { createSchema, validateSchema } from '@xus/cli-shared'
 
 export const ProjectConfigSchema = createSchema<IProjectConfig>((joi) => {
   return joi.object({
-    ctxPath: joi.string(),
     mode: joi.string(),
     plugins: joi.array(),
     presets: joi.array()
@@ -23,7 +22,6 @@ export function defaultProjectConfig(
 ): IProjectConfig {
   return {
     ...ops,
-    ctxPath: ops?.ctxPath || process.cwd(),
     mode: ops?.mode || 'development'
   }
 }
diff --git a/packages/core/src/manager/ConfigManager.ts b/packages/core/src/manager/ConfigManager.ts
@@ -41,7 +41,6 @@ export class ConfigManager {
 
     this.finalConfig = deepmerge(
       defaultProjectConfig({
-        ctxPath: this.service.PathManager.cwd,
         mode: this.service.EnvManager.mode
       }),
       this.loadUserConfig()
@@ -89,7 +88,7 @@ export class ConfigManager {
     // valid plugin config
     for (const [pluginName, pluginValidator] of this.pluginValidators) {
       if (pluginName in this.finalConfig) {
-        pluginValidator!(this.finalConfig, (msg) => {
+        pluginValidator!(this.finalConfig[pluginName], (msg) => {
           logger.error(`project config invalid ${msg}`)
           process.exit(1)
         })

diff --git a/packages/core/src/manager/PathManager.ts b/packages/core/src/manager/PathManager.ts
@@ -3,13 +3,8 @@ import { statSync, readdirSync } from 'fs'
 import { getFileMeta, isLernaPkg } from '@xus/cli-shared'
 
 export class PathManager {
-  private ctxPath: string
-  constructor(ctx: string) {
-    this.ctxPath = ctx
-  }
-
   get cwd(): string {
-    return this.ctxPath || process.cwd()
+    return process.cwd()
   }
 
   get cwdPkg() {
@@ -18,18 +13,18 @@ export class PathManager {
 
   get userConfigPath() {
     const fileMeta = getFileMeta({
-      base: this.ctxPath,
+      base: this.cwd,
       filenameWithoutExt: 'xus.config'
     })
     return fileMeta && fileMeta.path
   }
 
   // for plugins
   getPathBasedOnCtx(basedOnRoot: string): string {
-    return join(this.ctxPath, basedOnRoot)
+    return join(this.cwd, basedOnRoot)
   }
 
-  getLernaPkgs({ root = this.ctxPath, isRelativeCwd = false } = {}): string[] {
+  getLernaPkgs({ root = this.cwd, isRelativeCwd = false } = {}): string[] {
     const pkgRoot = join(root, 'packages')
     if (isLernaPkg(root) && statSync(pkgRoot).isDirectory()) {
       return (readdirSync(pkgRoot) || []).reduce<string[]>(

diff --git a/packages/core/src/types/cli.ts b/packages/core/src/types/cli.ts
@@ -2,7 +2,6 @@ import type { IPlugin, IPreset } from './plugin'
 
 // cli server ops
 export type ICliServerOps = {
-  ctxPath: string
   mode: string
   presets?: IPreset[]
   plugins?: IPlugin[]

diff --git a/packages/core/src/types/config.ts b/packages/core/src/types/config.ts
@@ -1,10 +1,6 @@
 import type { IPlugin, IPreset } from '.'
 
 export interface IProjectConfig {
-  /**
-   * @description cwd or point path
-   */
-  ctxPath: string
   /**
    * @description mode
    */

diff --git a/packages/core/src/types/plugin.ts b/packages/core/src/types/plugin.ts
@@ -1,9 +1,8 @@
-import type { IPluginAPI } from '../cli/PluginAPI'
 import type { IConfigSchemaValidator } from '@xus/cli-shared'
 
 // plugins / presets
 // api type override in @xus/cli
-export type IPluginApply = (api: IPluginAPI) => void
+export type IPluginApply = (api: any) => void
 type IEnforce = 'post' | 'pre'
 
 export interface IPlugin<T extends (api: any) => void = IPluginApply> {