npm - @liuli-util/cli - Versions diffs - 3.17.1 → 3.19.0 - Mend

@liuli-util/cli 3.17.1 → 3.19.0

Files changed (54) hide show

package/CHANGELOG.md +4 -0
package/README.md +30 -42
package/README.zh-CN.md +130 -0
package/dist/bin.js +114 -94
package/dist/bin.js.map +3 -3
package/dist/commands/deploy/DeployService.d.ts +25 -7
package/dist/commands/deploy/DeployService.d.ts.map +1 -1
package/dist/commands/deploy/util/validate.d.ts +8 -0
package/dist/commands/deploy/util/validate.d.ts.map +1 -0
package/dist/commands/esbuild/ESBuildProgram.d.ts +5 -2
package/dist/commands/esbuild/ESBuildProgram.d.ts.map +1 -1
package/dist/commands/esbuild/index.d.ts.map +1 -1
package/dist/commands/esbuild/util/esbuildPlugins.d.ts +1 -0
package/dist/commands/esbuild/util/esbuildPlugins.d.ts.map +1 -1
package/dist/commands/sync/when.d.ts.map +1 -1
package/dist/index.esm.js +4 -2
package/dist/index.esm.js.map +2 -2
package/dist/index.js +4 -2
package/dist/index.js.map +2 -2
package/package.json +16 -15
package/src/commands/deploy/DeployService.ts +83 -45
package/src/commands/deploy/__tests__/.temp/test.lock +0 -0
package/src/commands/deploy/__tests__/DeployService.test.ts +52 -20
package/src/commands/deploy/__tests__/conf.test.ts +0 -1
package/src/commands/deploy/__tests__/simpleGit.test.ts +24 -1
package/src/commands/deploy/__tests__/util/deployGhPageWorker.ts +3 -2
package/src/commands/deploy/util/validate.ts +18 -0
package/src/commands/esbuild/ESBuildProgram.ts +25 -5
package/src/commands/esbuild/__tests__/.temp/package.json +1 -0
package/src/commands/esbuild/__tests__/.temp/src/index.ts +1 -0
package/src/commands/esbuild/__tests__/ESBuildProgram.test.ts +50 -13
package/src/commands/esbuild/index.ts +26 -13
package/src/commands/esbuild/util/esbuildPlugins.ts +37 -1
package/src/commands/generate/__tests__/.temp/README.md +1 -0
package/src/commands/generate/__tests__/.temp/package.json +3 -0
package/src/commands/generate/__tests__/.temp/test-cli/package.json +8 -18
package/src/commands/generate/__tests__/.temp/test-cli/src/bin.ts +1 -1
package/src/commands/generate/__tests__/.temp/test-cli/tsconfig.json +28 -28
package/src/commands/sync/SyncProgram.ts +1 -1
package/src/commands/sync/__tests__/.temp/package.json +16 -0
package/src/commands/sync/__tests__/SyncProgram.test.ts +1 -1
package/src/commands/sync/__tests__/when.test.ts +3 -7
package/src/commands/sync/when.ts +8 -23
package/templates/cli/package.json +5 -9
package/templates/cli/src/bin.ts +1 -1
package/templates/cli/tsconfig.json +28 -28
package/templates/lib/package.json +4 -11
package/templates/lib/tsconfig.json +28 -28
package/tsconfig.json +34 -34
package/dist/commands/deploy/util/FileLock.d.ts +0 -14
package/dist/commands/deploy/util/FileLock.d.ts.map +0 -1
package/src/commands/deploy/__tests__/FileLock.test.ts +0 -27
package/src/commands/deploy/util/FileLock.ts +0 -31
package/src/commands/esbuild/__tests__/.temp/getDeps/package.json +0 -1

package/src/commands/deploy/__tests__/DeployService.test.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as path from 'path'
 import { mkdirp, remove, writeFile } from 'fs-extra'
-import { GhPagesDeployService, SftpDeployOptions, SftpDeployService } from '../DeployService'
-import { execPromise } from '../util/execPromise'
+import { GhPagesDeployOptions, GhPagesDeployService, SftpDeployOptions, SftpDeployService } from '../DeployService'
+import { nodeCacheDir } from '../../../utils/nodeCacheDir'
 const tempPath = path.resolve(__dirname, '.temp')
 beforeAll(async () => {
@@ -25,14 +25,15 @@ beforeAll(async () => {
   )
 })
-describe('测试 SftpDeployService', () => {
+describe.skip('测试 SftpDeployService', () => {
   const options: SftpDeployOptions = {
+    debug: false,
     cwd: tempPath,
-    dest: 'dist',
-    remote: '/home/pinefield/apps/test',
+    dist: 'dist',
+    dest: process.env.dest!,
     sshConfig: {
-      host: '10.8.2.4',
-      username: 'pinefield',
+      host: process.env.host,
+      username: process.env.username,
     },
   }
   it('基本示例', async () => {
@@ -54,22 +55,53 @@ describe('测试 SftpDeployService', () => {
   })
 })
-describe('测试 GhPagesDeployService', () => {
-  const ghPagesDeployService = new GhPagesDeployService({
+describe.skip('测试 GhPagesDeployService', () => {
+  const options: GhPagesDeployOptions = {
+    debug: false,
     cwd: tempPath,
-    dest: 'dist',
-    remote: 'examples/test-app',
+    dist: 'dist',
+    dest: '/',
+    repo: 'https://github.com/rxliuli/test-git.git',
+    remote: 'origin',
+    branch: 'gh-pages',
+  }
+  const ghPagesDeployService = new GhPagesDeployService(options)
+  const distPath = path.resolve(tempPath, 'dist')
+  const mock = jest.fn().mockImplementation((title) => console.log(title))
+  beforeEach(async () => {
+    await writeFile(
+      path.resolve(distPath, 'index.html'),
+      `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>测试部署</title>
+  </head>
+  <body>
+    <h1>测试部署</h1>
+    <p>${Date.now()}</p>
+  </body>
+</html>
+    `,
+    )
+    mock.mockClear()
   })
   it('基本示例', async () => {
-    await ghPagesDeployService.deploy().on('process', (title) => console.log(title))
+    await ghPagesDeployService.deploy().on('process', mock)
+    console.log(mock.mock.calls)
+    expect(mock.mock.calls.some((item: string[]) => item.includes('完成推送'))).toBeTruthy()
   }, 10_000)
-  //TODO 无法使用单元测试
-  it.skip('并发推送', async () => {
-    const scriptPath = path.resolve(__dirname, './util/deployGhPageWorker.ts').replace(/\\/g, '/')
-    await Promise.all(
-      [1, 2].map(async () => {
-        await execPromise(`esno ${scriptPath}`)
-      }),
-    )
+  it('测试没有任何修改', async () => {
+    await writeFile(path.resolve(distPath, 'index.html'), 'test')
+    await ghPagesDeployService.deploy().on('process', mock)
+    await ghPagesDeployService.deploy().on('process', mock)
+    expect(mock.mock.calls.some((item: string[]) => item.includes('没有任何提交，跳过提交'))).toBeTruthy()
+    expect(mock.mock.calls.some((item: string[]) => item.includes('没有更新，跳过推送'))).toBeTruthy()
+  }, 20_000)
+  it('测试首次拉取代码', async () => {
+    const dir = path.resolve(nodeCacheDir('liuli-cli'), 'gh-pages', options.repo!.replace(new RegExp('[/:]', 'g'), '_'))
+    await remove(dir)
+    await ghPagesDeployService.deploy().on('process', mock)
+    expect(mock.mock.calls.some((item: string[]) => item.includes('克隆项目'))).toBeTruthy()
   }, 10_000)
 })

package/src/commands/deploy/__tests__/conf.test.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import Conf from 'conf'
 import { wait } from '../util/wait'
 import { writeJson } from 'fs-extra'
-import * as path from 'path'
 describe('测试 conf', () => {
   const conf = new Conf<{ lock: boolean }>({ projectName: '@liuli-util/test' })

package/src/commands/deploy/__tests__/simpleGit.test.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 import simpleGit, { SimpleGit } from 'simple-git'
 import * as path from 'path'
 import { mkdirp, remove } from 'fs-extra'
+import * as os from 'os'
-describe('测试 simple-git', () => {
+describe.skip('测试 simple-git', () => {
   async function getOriginRemote() {
     const git = simpleGit()
     const remotes = await git.getRemotes(true)
@@ -32,3 +33,25 @@ describe('测试 simple-git', () => {
     console.log('status: ', status.files)
   })
 })
+describe.skip('测试真实场景', () => {
+  const gitPath = path.resolve(
+    os.homedir(),
+    './AppData/Local/liuli-cli/Cache/gh-pages/https___github.com_rxliuli_webos.git',
+  )
+  let git: SimpleGit
+  beforeAll(() => {
+    git = simpleGit(gitPath)
+  })
+  it('测试获取提交状态', async () => {
+    const res = await git.status()
+    console.log(res)
+  })
+  it('测试获取更新', async () => {
+    const res = await git.pull()
+    console.log(res)
+  }, 100_000)
+  it('测试 git add -A', async () => {
+    await git.add('-A')
+  })
+})

package/src/commands/deploy/__tests__/util/deployGhPageWorker.ts CHANGED Viewed

@@ -5,8 +5,9 @@ async function deployGhPages() {
   const tempPath = path.resolve(__dirname, '../.temp/')
   const ghPagesDeployService = new GhPagesDeployService({
     cwd: tempPath,
-    dest: 'dist',
-    remote: 'examples/test-app',
+    dist: 'dist',
+    dest: 'examples/test-app',
+    debug: false,
   })
   const now = Date.now()
   await ghPagesDeployService.deploy().on('process', (title) => console.log(`[${now}] ${title}`))

package/src/commands/deploy/util/validate.ts ADDED Viewed

@@ -0,0 +1,18 @@
+import Ajv, { JSONSchemaType } from 'ajv'
+import localize from 'ajv-i18n/localize'
+import formatsPlugin from 'ajv-formats'
+/**
+ * 使用 ajv 校验数据
+ * @param schema json 模式配置
+ * @param data 校验的数据
+ */
+export function validate<T>(schema: JSONSchemaType<T>, data: T): [isValid: boolean, errorText: string] {
+  const ajv = new Ajv({ allErrors: true, messages: false })
+  formatsPlugin(ajv)
+  const res = ajv.validate(schema, data)
+  if (!res) {
+    localize.zh(ajv.errors)
+  }
+  return [res, ajv.errorsText()]
+}

package/src/commands/esbuild/ESBuildProgram.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 import { build, BuildOptions, Platform, Plugin } from 'esbuild'
-import { pathExists, readFile, readJson } from 'fs-extra'
+import { pathExists, readFile, readJson, remove } from 'fs-extra'
 import * as path from 'path'
 import { PackageJson } from 'type-fest'
 import { Project } from 'ts-morph'
 import { promise } from 'glob-promise'
 import { IOptions } from 'glob'
-import { nativeNodeModules, nodeExternals } from './util/esbuildPlugins'
+import { nativeNodeModules, nodeExternals, userJS } from './util/esbuildPlugins'
 import { watch } from 'chokidar'
 import Spinnies from 'spinnies'
 import { debounce } from './util/debounce'
@@ -22,7 +22,7 @@ interface Task {
   task(): Promise<any>
 }
-export type TaskTypeEnum = 'esm' | 'cjs' | 'iife' | 'cli' | 'dts'
+export type TaskTypeEnum = 'esm' | 'cjs' | 'iife' | 'cli' | 'dts' | 'userjs'
 export class ESBuildProgram {
   constructor(private readonly options: ESBuildProgramOptions) {}
@@ -52,7 +52,7 @@ export class ESBuildProgram {
     const tsconfigPath = path.resolve(base, 'tsconfig.json')
     if (await pathExists(tsconfigPath)) {
       const tsconfigJson = parse(await readFile(tsconfigPath, 'utf-8'))
-      if ((tsconfigJson.compilerOptions.lib as string[]).some((lib) => lib.toLowerCase() === 'dom')) {
+      if ((tsconfigJson?.compilerOptions?.lib as string[])?.some((lib) => lib.toLowerCase() === 'dom')) {
         return 'browser'
       }
     }
@@ -97,6 +97,22 @@ export class ESBuildProgram {
       emitOnlyDtsFiles: true,
     })
   }
+  /**
+   * 获取构建 cjs 的选项
+   */
+  getBuildUserJSOption(): BuildOptions {
+    return {
+      entryPoints: [path.resolve(this.options.base, './src/index.ts')],
+      outfile: path.resolve(this.options.base, './dist/index.user.js'),
+      format: 'iife',
+      bundle: true,
+      external: [...ESBuildProgram.globalExternal],
+      platform: 'browser',
+      plugins: [userJS()],
+      incremental: this.options.isWatch,
+      absWorkingDir: this.options.base,
+    }
+  }
   /**
    * 获取构建 cjs 的选项
@@ -144,7 +160,6 @@ export class ESBuildProgram {
    * 获取构建 iife 的选项
    * @param deps
    * @param platform
-   * @param plugins
    */
   getBuildIifeOption({ platform, globalName }: { platform: Platform; globalName: string }): BuildOptions {
     return {
@@ -253,6 +268,10 @@ export class ESBuildProgram {
         title: '生成类型定义',
         task: () => this.genDTS(),
       },
+      userjs: {
+        title: '打包 userjs',
+        task: () => this.build(this.getBuildUserJSOption()),
+      },
     }
   }
@@ -277,6 +296,7 @@ export class ESBuildProgram {
     }
     if (!this.options.isWatch) {
+      await remove(path.resolve(this.options.base, 'dist'))
       await run()
       return
     }

package/src/commands/esbuild/__tests__/.temp/package.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"name":"test","version":"1.0.0","userjs":{"name":"test","version":"0.1.0","description":"测试脚本","author":"rxliuli","match":["https://twitter.com/*"],"grant":["unsafeWindow"],"license":"MIT"}}

package/src/commands/esbuild/__tests__/.temp/src/index.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ console.log(unsafeWindow)

package/src/commands/esbuild/__tests__/ESBuildProgram.test.ts CHANGED Viewed

@@ -1,17 +1,18 @@
 import { ESBuildProgram } from '../ESBuildProgram'
 import * as path from 'path'
-import { mkdirp, pathExists, remove, writeJson } from 'fs-extra'
+import { mkdirp, pathExists, remove, writeFile, writeJson } from 'fs-extra'
 import { PackageJson } from 'type-fest'
 import { build, Platform } from 'esbuild'
 import { nativeNodeModules, nodeExternals } from '../util/esbuildPlugins'
+import { findParent } from '../../../utils'
 describe('测试 ESBuildProgram', () => {
+  const base: string = path.resolve(__dirname, '.temp')
+  beforeEach(async () => {
+    await remove(base)
+    await mkdirp(base)
+  })
   describe('测试 getPlatform', () => {
-    const base: string = path.resolve(__dirname, '.temp/getPlatform')
-    beforeEach(async () => {
-      await remove(base)
-      await mkdirp(base)
-    })
     it('测试 node 类型', async () => {
       await writeJson(path.resolve(base, 'package.json'), {
         devDependencies: {
@@ -34,11 +35,6 @@ describe('测试 ESBuildProgram', () => {
     })
   })
   describe('测试 getDeps', () => {
-    const base: string = path.resolve(__dirname, '.temp/getDeps')
-    beforeEach(async () => {
-      await remove(base)
-      await mkdirp(base)
-    })
     it('基本示例', async () => {
       await writeJson(path.resolve(base, 'package.json'), {
         devDependencies: {
@@ -72,7 +68,7 @@ describe('测试 ESBuildProgram', () => {
     it('测试 genDTS', async () => {
       await program.genDTS()
       expect(await pathExists(path.resolve(base, 'dist/index.d.ts'))).toBeTruthy()
-    })
+    }, 10_000)
     it('测试 getBuildCjsOption', async () => {
       await build(
         program.getBuildCjsOption({
@@ -112,7 +108,7 @@ describe('测试 ESBuildProgram', () => {
       )
       expect(await pathExists(path.resolve(base, 'dist/bin.js'))).toBeTruthy()
     })
-    it('测试 metafile', async () => {
+    it.skip('测试 metafile', async () => {
       program.isWatch = true
       await program.build(
         program.getBuildCliOption({
@@ -123,6 +119,33 @@ describe('测试 ESBuildProgram', () => {
       expect(await pathExists(path.resolve(base, 'dist/bin.js'))).toBeTruthy()
     })
   })
+  describe('测试构建 userjs', () => {
+    const program = new ESBuildProgram({
+      base,
+      isWatch: false,
+    })
+    beforeEach(async () => {
+      await mkdirp(path.resolve(base, 'src'))
+      await writeJson(path.resolve(base, 'package.json'), {
+        name: 'test',
+        version: '1.0.0',
+        userjs: {
+          name: 'test',
+          version: '0.1.0',
+          description: '测试脚本',
+          author: 'rxliuli',
+          match: ['https://twitter.com/*'],
+          grant: ['unsafeWindow'],
+          license: 'MIT',
+        },
+      } as PackageJson)
+      await writeFile(path.resolve(base, 'src/index.ts'), `console.log(unsafeWindow)`)
+    })
+    it('基本示例', async () => {
+      await build(program.getBuildUserJSOption())
+      expect(await pathExists(path.resolve(base, 'dist/index.user.js'))).toBeTruthy()
+    })
+  })
 })
 it('测试 esbuild', async () => {
   await build({
@@ -140,3 +163,17 @@ it('测试 esbuild', async () => {
     treeShaking: true,
   })
 })
+describe('测试 cli 本身的构建', () => {
+  let selfPath: string
+  beforeAll(async () => {
+    selfPath = (await findParent(__dirname, async (dir) => pathExists(path.join(dir, 'package.json'))))!
+  })
+  it('基本示例', async () => {
+    const program = new ESBuildProgram({
+      base: selfPath,
+      isWatch: false,
+    })
+    const { cli, cjs, esm } = await program.getTasks()
+    await program.execTasks([cli, cjs, esm])
+  })
+})

package/src/commands/esbuild/index.ts CHANGED Viewed

@@ -30,17 +30,30 @@ export const esbuildCommand = new Command('build')
       }),
   )
   .addCommand(
-    (['iife', 'cli', 'esm', 'cjs', 'dts'] as TaskTypeEnum[]).reduce((res, type) => {
-      res.addCommand(
-        new Command(type)
-          .description(`单独构建 ${type}`)
-          .option('-w --watch', '监视模式')
-          .action(async (options: CliBuildOptions) => {
-            program.isWatch = !!options.watch
-            const tasks = await program.getTasks()
-            await program.execTasks([tasks[type]])
-          }),
-      )
-      return res
-    }, new Command('single').description('单独构建某种类型的 bundle')),
+    (['iife', 'cli', 'esm', 'cjs', 'dts'] as TaskTypeEnum[]).reduce(
+      (res, type) => {
+        res.addCommand(
+          new Command(type)
+            .description(`单独构建 ${type}`)
+            .option('-w --watch', '监视模式')
+            .action(async (options: CliBuildOptions) => {
+              program.isWatch = !!options.watch
+              const tasks = await program.getTasks()
+              await program.execTasks([tasks[type]])
+            }),
+        )
+        return res
+      },
+      new Command('single')
+        .description('单独构建某种类型的 bundle')
+        .option('-t, --target <target...>', '构建目标，是一个数组，可以使用 , 分割')
+        .option('-w, --watch', '监视模式')
+        .action(async (options: { target: TaskTypeEnum[]; watch?: boolean }) => {
+          program.isWatch = !!options.watch
+          const tasks = await program.getTasks()
+          await program.execTasks(
+            options.target.flatMap((s) => s.split(',') as TaskTypeEnum[]).map((type) => tasks[type]),
+          )
+        }),
+    ),
   )

package/src/commands/esbuild/util/esbuildPlugins.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Plugin } from 'esbuild'
-import { writeJson } from 'fs-extra'
+import { readJson, writeJson } from 'fs-extra'
+import path from 'path'
 /**
  * 处理 nodejs 原生模块
@@ -93,3 +94,38 @@ export function metafile(metafilePath: string): Plugin {
     },
   }
 }
+function generateBanner(meta: object) {
+  return (
+    [
+      '// ==UserScript==',
+      ...Object.entries(meta)
+        .map(([key, value]) => {
+          if (Array.isArray(value)) {
+            return value.map((item) => `// @${key} ${item}`)
+          }
+          return `// @${key} ${value}`
+        })
+        .flat(),
+      '// ==/UserScript==',
+    ].join('\n') + '\n'
+  )
+}
+export function userJS(): Plugin {
+  return {
+    name: 'esbuild-plugin-userjs',
+    async setup(build) {
+      const json = (await readJson(path.resolve(build.initialOptions.absWorkingDir!, 'package.json'))) as {
+        userjs: object
+      }
+      if (!json.userjs) {
+        throw new Error('userjs is not supported')
+      }
+      if (!build.initialOptions.banner) {
+        build.initialOptions.banner = {}
+      }
+      build.initialOptions.banner!['js'] = generateBanner(json.userjs)
+    },
+  }
+}

package/src/commands/generate/__tests__/.temp/README.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # @liuli-util/.temp

package/src/commands/generate/__tests__/.temp/package.json ADDED Viewed

@@ -0,0 +1,3 @@
+{
+  "name": ".temp"
+}

package/src/commands/generate/__tests__/.temp/test-cli/package.json CHANGED Viewed

@@ -6,39 +6,29 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && liuli-cli build cli",
+    "build": "liuli-cli build cli",
     "dev": "liuli-cli build cli -w",
-    "start": "esno src/bin.ts",
-    "docs:server": "live-server docs",
-    "docs:dev": "typedoc --watch",
-    "docs:build": "rimraf docs && typedoc",
-    "docs:deploy": "yarn docs:build && gh-pages -d docs/ -e / -a"
+    "start": "esno src/bin.ts"
   },
   "bin": {
     "cli-name": "./bin.js"
   },
-  "jest": {
-    "preset": "ts-jest"
-  },
   "dependencies": {
     "commander": "^8.2.0",
-    "fs-extra": "^10.0.0",
-    "inquirer": "^8.1.5"
+    "enquirer": "^2.3.6",
+    "fs-extra": "^10.0.0"
   },
   "devDependencies": {
-    "@liuli-util/cli": "^3.11.1",
+    "@liuli-util/cli": "^3.18.0",
     "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.1.2",
     "@types/jest": "^27.0.2",
     "@types/lodash": "^4.14.173",
     "@types/node": "^16.9.6",
     "esno": "^0.9.1",
-    "gh-pages": "^3.2.3",
-    "jest": "^27.2.1",
+    "jest": "^27.4.7",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^27.1.3",
     "type-fest": "^2.3.4",
-    "typedoc": "^0.22.4",
-    "typescript": "^4.4.3"
+    "typescript": "^4.5.5"
   }
 }

package/src/commands/generate/__tests__/.temp/test-cli/src/bin.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Command } from 'commander'
-import { prompt } from 'inquirer'
+import { prompt } from 'enquirer'
 new Command()
   .action(async () => {

package/src/commands/generate/__tests__/.temp/test-cli/tsconfig.json CHANGED Viewed

@@ -1,28 +1,28 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "lib": [
-      "ESNext"
-    ],
-    "outDir": "./dist",
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "strict": true,
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": [
-    "src"
-  ],
-  "typedocOptions": {
-    "entryPoints": [
-      "src/index.ts"
-    ],
-    "out": "docs",
-    "readme": "README.md",
-    "gitRemote": "origin"
-  }
-}
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": [
+      "ESNext"
+    ],
+    "outDir": "./dist",
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "src"
+  ],
+  "typedocOptions": {
+    "entryPoints": [
+      "src/index.ts"
+    ],
+    "out": "docs",
+    "readme": "README.md",
+    "gitRemote": "origin"
+  }
+}

package/src/commands/sync/SyncProgram.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { readFile, readJson, writeFile, writeJson } from 'fs-extra'
 import path from 'path'
-import { merge } from 'lodash-es'
+import { merge } from 'lodash'
 import { PackageJson } from 'type-fest'
 import prettier from '@liuli-util/prettier-standard-config/package.json'
 import eslintTs from '@liuli-util/eslint-config-ts/package.json'

package/src/commands/sync/__tests__/.temp/package.json ADDED Viewed

@@ -0,0 +1,16 @@
+{
+  "name": "temp",
+  "sync": [
+    "jest"
+  ],
+  "jest": {
+    "preset": "ts-jest",
+    "testMatch": [
+      "<rootDir>/src/**/__tests__/*.test.ts"
+    ]
+  },
+  "devDependencies": {
+    "jest": "^27.4.3",
+    "ts-jest": "^27.0.7"
+  }
+}

package/src/commands/sync/__tests__/SyncProgram.test.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { mkdir, readJson, remove, writeJson } from 'fs-extra'
 import path from 'path'
 import { SyncConfigType, SyncProgram } from '../SyncProgram'
-import { merge } from 'lodash-es'
+import { merge } from 'lodash'
 import { PackageJson } from 'type-fest'
 describe('测试 SyncProgram', () => {

package/src/commands/sync/__tests__/when.test.ts CHANGED Viewed

@@ -1,17 +1,13 @@
 import { isIncludeDep, isNpmPackage, isYarnRoot, isYarnSubModule } from '../when'
-import { pathExists, readJson } from 'fs-extra'
-import { PackageJson } from 'type-fest'
-import path from 'path'
+import { pathExists } from 'fs-extra'
+import * as path from 'path'
 import { findParent } from '../../../utils'
 describe('测试 when', () => {
   let rootPath: string
   let subModulePath: string
   beforeAll(async () => {
-    rootPath = (await findParent(__dirname, async (dir) => {
-      const jsonPath = path.resolve(dir, 'package.json')
-      return (await pathExists(jsonPath)) && !!((await readJson(jsonPath)) as PackageJson).workspaces
-    }))!
+    rootPath = (await findParent(__dirname, (dir) => pathExists(path.resolve(dir, 'pnpm-workspace.yaml'))))!
     subModulePath = (await findParent(__dirname, async (dir) => pathExists(path.join(dir, 'package.json'))))!
   })
   it('测试 isNpmPackage', async () => {