@liuli-util/cli 3.17.1 → 3.19.0

package/src/commands/sync/when.ts

@@ -1,5 +1,5 @@
 import { pathExists, readJson } from 'fs-extra'
-import path from 'path'
+import * as path from 'path'
 import { PackageJson } from 'type-fest'
 import { findParent } from '../../utils'
 
@@ -7,9 +7,7 @@ import { findParent } from '../../utils'
  * 判断是否包含 package.json
  * @param cwd
  */
-export async function isNpmPackage(
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isNpmPackage(cwd: string = process.cwd()): Promise<boolean> {
   return await pathExists(path.resolve(cwd, './package.json'))
 }
 
@@ -17,24 +15,18 @@ export async function isNpmPackage(
  * 判断是 yarn2 monorepo 项目
  * @param cwd
  */
-export async function isYarnRoot(
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isYarnRoot(cwd: string = process.cwd()): Promise<boolean> {
   if (!(await isNpmPackage(cwd))) {
     return false
   }
-  const json = (await readJson(
-    path.resolve(cwd, './package.json'),
-  )) as PackageJson
+  const json = (await readJson(path.resolve(cwd, './package.json'))) as PackageJson
   return !!json.workspaces
 }
 
 /**
  * 判断是 yarn2 monorepo 的子模块
  */
-export async function isYarnSubModule(
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isYarnSubModule(cwd: string = process.cwd()): Promise<boolean> {
   if (!(await isNpmPackage(cwd))) {
     return false
   }
@@ -50,18 +42,11 @@ export async function isYarnSubModule(
  * @param deps
  * @param cwd
  */
-export async function isIncludeDep(
-  deps: string[],
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isIncludeDep(deps: string[], cwd: string = process.cwd()): Promise<boolean> {
   if (!(await isNpmPackage(cwd))) {
     return false
   }
-  const json = (await readJson(
-    path.resolve(cwd, './package.json'),
-  )) as PackageJson
-  const set = new Set(
-    Object.keys({ ...json.dependencies, ...json.devDependencies }),
-  )
+  const json = (await readJson(path.resolve(cwd, './package.json'))) as PackageJson
+  const set = new Set(Object.keys({ ...json.dependencies, ...json.devDependencies }))
   return deps.every((dep) => set.has(dep))
 }

package/templates/cli/package.json

@@ -6,33 +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"
   },
   "bin": {
     "cli-name": "./bin.js"
   },
-  "jest": {
-    "preset": "ts-jest"
-  },
   "dependencies": {
     "commander": "^8.2.0",
     "enquirer": "^2.3.6",
     "fs-extra": "^10.0.0"
   },
   "devDependencies": {
-    "@liuli-util/cli": "workspace:*",
+    "@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",
-    "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",
-    "typescript": "^4.4.3"
+    "typescript": "^4.5.5"
   }
 }

package/templates/cli/src/bin.ts

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

package/templates/cli/tsconfig.json

@@ -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/templates/lib/package.json

@@ -7,20 +7,13 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && liuli-cli build pkg",
-    "dev": "liuli-cli build pkg -w"
-  },
-  "jest": {
-    "preset": "ts-jest"
+    "build": "liuli-cli build lib",
+    "dev": "liuli-cli build lib -w"
   },
   "devDependencies": {
-    "@liuli-util/cli": "workspace:*",
-    "@types/jest": "^27.0.2",
-    "esno": "^0.9.1",
-    "jest": "^27.2.1",
+    "@liuli-util/cli": "^3.18.0",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5",
     "type-fest": "^2.3.4",
-    "typescript": "^4.4.3"
+    "typescript": "^4.5.5"
   }
 }

package/templates/lib/tsconfig.json

@@ -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/tsconfig.json

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

package/dist/commands/deploy/util/FileLock.d.ts

@@ -1,14 +0,0 @@
-export declare class FileLock {
-    private readonly lockFilePath;
-    constructor(lockFilePath: string);
-    private lockId?;
-    /**
-     * 加锁
-     */
-    lock(): Promise<boolean>;
-    /**
-     * 解锁
-     */
-    unlock(): Promise<void>;
-}
-//# sourceMappingURL=FileLock.d.ts.map

package/dist/commands/deploy/util/FileLock.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FileLock.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/util/FileLock.ts"],"names":[],"mappings":"AAGA,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,MAAM;IAEjD,OAAO,CAAC,MAAM,CAAC,CAAQ;IAEvB;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAS9B;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAO9B"}

package/src/commands/deploy/__tests__/FileLock.test.ts

@@ -1,27 +0,0 @@
-import * as path from 'path'
-import { FileLock } from '../util/FileLock'
-import { AsyncArray } from '../../../utils'
-import { wait } from '../util/wait'
-
-describe('测试文件锁', () => {
-  const tempPath = path.resolve(__dirname, '.temp/test.lock')
-  it('基本示例', async () => {
-    const fileLock = new FileLock(tempPath)
-    expect(await fileLock.lock()).toBeTruthy()
-    expect(await fileLock.lock()).toBeFalsy()
-    await fileLock.unlock()
-    expect(await fileLock.lock()).toBeTruthy()
-    await fileLock.unlock()
-  })
-  it('测试并发调用', async () => {
-    const start = Date.now()
-    await AsyncArray.forEach(Array(10).fill(0), async () => {
-      const fileLock = new FileLock(tempPath)
-      await wait(() => fileLock.lock())
-      await wait(100)
-      await fileLock.unlock()
-    })
-    const time = Date.now() - start
-    expect(time).toBeLessThan(3000)
-  })
-})

package/src/commands/deploy/util/FileLock.ts

@@ -1,31 +0,0 @@
-import { close, open, remove } from 'fs-extra'
-import path from 'path'
-
-export class FileLock {
-  constructor(private readonly lockFilePath: string) {}
-
-  private lockId?: number
-
-  /**
-   * 加锁
-   */
-  async lock(): Promise<boolean> {
-    try {
-      this.lockId = await open(path.resolve(this.lockFilePath), 'wx')
-      return true
-    } catch (e) {
-      return false
-    }
-  }
-
-  /**
-   * 解锁
-   */
-  async unlock(): Promise<void> {
-    if (!this.lockId) {
-      throw new Error('未加锁')
-    }
-    await remove(path.resolve(this.lockFilePath))
-    close(this.lockId)
-  }
-}

package/src/commands/esbuild/__tests__/.temp/getDeps/package.json

@@ -1 +0,0 @@
-{"devDependencies":{"@types/node":"16"},"dependencies":{"ora":"^6"},"peerDependencies":{"typescript":"^4"}}