@liuli-util/cli 3.13.1 → 3.17.0

package/src/commands/sync/SyncProgram.ts

@@ -13,13 +13,9 @@ import { PathUtil } from '../../PathUtil'
 
 export async function mergeJson(base: string, json: object): Promise<void> {
   const pkgJsonFilePath = path.resolve(base, './package.json')
-  await writeJson(
-    pkgJsonFilePath,
-    merge(await readJson(pkgJsonFilePath), json),
-    {
-      spaces: 2,
-    },
-  )
+  await writeJson(pkgJsonFilePath, merge(await readJson(pkgJsonFilePath), json), {
+    spaces: 2,
+  })
 }
 
 export type SyncConfigType =
@@ -68,10 +64,7 @@ export class SyncProgram {
         } as PackageJson)
       },
       async when(): Promise<boolean> {
-        return (
-          (await isNpmPackage()) &&
-          ((await isYarnRoot()) || !(await isYarnSubModule()))
-        )
+        return (await isNpmPackage()) && ((await isYarnRoot()) || !(await isYarnSubModule()))
       },
     },
     {
@@ -91,23 +84,14 @@ export class SyncProgram {
         } as PackageJson)
       },
       async when(): Promise<boolean> {
-        return (
-          (await isNpmPackage()) &&
-          ((await isYarnRoot()) || !(await isYarnSubModule()))
-        )
+        return (await isNpmPackage()) && ((await isYarnRoot()) || !(await isYarnSubModule()))
       },
     },
     {
       type: 'gitignore',
       handler: async () => {
         const gitignorePath = path.resolve(this.base, '.gitignore')
-        await writeFile(
-          gitignorePath,
-          await readFile(
-            path.resolve(PathUtil.RootPath, '_gitignore'),
-            'utf-8',
-          ),
-        )
+        await writeFile(gitignorePath, await readFile(path.resolve(PathUtil.RootPath, '_gitignore'), 'utf-8'))
       },
     },
     {
@@ -123,11 +107,7 @@ export class SyncProgram {
         } as PackageJson)
       },
       async when(): Promise<boolean> {
-        return (
-          (await isNpmPackage()) &&
-          !(await isIncludeDep(['vue'])) &&
-          !(await isIncludeDep(['react']))
-        )
+        return (await isNpmPackage()) && !(await isIncludeDep(['vue'])) && !(await isIncludeDep(['react']))
       },
     },
     {
@@ -154,6 +134,10 @@ export class SyncProgram {
             preset: 'ts-jest',
             testMatch: ['<rootDir>/src/**/__tests__/*.test.ts'],
           },
+          devDependencies: {
+            jest: '^27.4.3',
+            'ts-jest': '^27.0.7',
+          },
         })
       },
     },
@@ -171,10 +155,7 @@ export class SyncProgram {
         }
         let config = {
           scripts: {
-            postinstall: appendScript(
-              json?.scripts?.postinstall,
-              'npx simple-git-hooks',
-            ),
+            postinstall: appendScript(json?.scripts?.postinstall, 'npx simple-git-hooks'),
           },
           'simple-git-hooks': {
             'pre-commit': 'yarn lint-staged',
@@ -197,26 +178,19 @@ export class SyncProgram {
         await mergeJson(this.base, config as PackageJson)
       },
       async when(): Promise<boolean> {
-        return (
-          (await isNpmPackage()) &&
-          ((await isYarnRoot()) || !(await isYarnSubModule()))
-        )
+        return (await isNpmPackage()) && ((await isYarnRoot()) || !(await isYarnSubModule()))
       },
     },
   ]
 
   async sync(): Promise<void> {
-    const { sync } = (await readJson(
-      path.resolve(this.base, 'package.json'),
-    )) as {
+    const { sync } = (await readJson(path.resolve(this.base, 'package.json'))) as {
       sync?: SyncConfigType[]
     }
     if (!sync) {
       return
     }
-    const syncConfigs = this.syncConfigs.filter((config) =>
-      sync.includes(config.type),
-    )
+    const syncConfigs = this.syncConfigs.filter((config) => sync.includes(config.type))
     for (const syncConfig of syncConfigs) {
       await syncConfig.handler()
     }

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

@@ -30,7 +30,7 @@ describe('测试 SyncProgram', () => {
       workspaces,
     } as PackageJson)
     await syncProgram.sync()
-  }, 100_000)
+  })
 
   it.skip('测试初始化同步配置', async () => {
     await writeJson(path.resolve(tempPath, 'lerna.json'), {})
@@ -42,6 +42,18 @@ describe('测试 SyncProgram', () => {
     await syncProgram.init()
     expect(((await readJson(file)).sync as string[]).length).toBeGreaterThan(0)
   }, 100_000)
+
+  it('测试同步 jest', async () => {
+    const jsonPath = path.resolve(tempPath, 'package.json')
+    await writeJson(jsonPath, {
+      name: 'temp',
+      sync: ['jest'] as SyncConfigType[],
+    } as PackageJson)
+    await syncProgram.sync()
+    const json = (await readJson(jsonPath)) as PackageJson
+    const devDeps = Object.keys(json.devDependencies!)
+    expect(devDeps.includes('jest') && devDeps.includes('ts-jest')).toBeTruthy()
+  })
 })
 
 it('测试 lodash-es.merge', () => {

package/src/utils/__tests__/nodeCacheDir.test.ts

@@ -0,0 +1,6 @@
+import { nodeCacheDir } from '../nodeCacheDir'
+
+it('测试 nodeCacheDir', () => {
+  const res = nodeCacheDir('liuli-cli')
+  console.log(res)
+})

package/src/utils/nodeCacheDir.ts

@@ -0,0 +1,54 @@
+/*
+copy by https://github.com/LinusU/node-cachedir
+ */
+import * as os from 'os'
+import * as path from 'path'
+
+function posix(id: string) {
+  const cacheHome = process.env.XDG_CACHE_HOME || path.join(os.homedir(), '.cache')
+  return path.join(cacheHome, id)
+}
+
+function darwin(id: string) {
+  return path.join(os.homedir(), 'Library', 'Caches', id)
+}
+
+function win32(id: string) {
+  const appData = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local')
+  return path.join(appData, id, 'Cache')
+}
+
+const implementation = (function () {
+  switch (os.platform()) {
+    case 'darwin':
+      return darwin
+    case 'win32':
+      return win32
+    case 'aix':
+    case 'android':
+    case 'freebsd':
+    case 'linux':
+    case 'netbsd':
+    case 'openbsd':
+    case 'sunos':
+      return posix
+    default:
+      console.error(
+        `(node:${
+          process.pid
+        }) [cachedir] Warning: the platform "${os.platform()}" is not currently supported by node-cachedir, falling back to "posix". Please file an issue with your platform here: https://github.com/LinusU/node-cachedir/issues/new`,
+      )
+      return posix
+  }
+})()
+
+export function nodeCacheDir(id: string): string {
+  if (id.length === 0) {
+    throw new Error('id cannot be empty')
+  }
+  if (/[^0-9a-zA-Z-]/.test(id)) {
+    throw new Error('id cannot contain special characters')
+  }
+
+  return implementation(id)
+}

package/templates/cli/package.json

@@ -8,11 +8,7 @@
   "scripts": {
     "build": "rimraf dist && 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"
@@ -22,23 +18,21 @@
   },
   "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": "workspace:*",
     "@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",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.0.5",
     "type-fest": "^2.3.4",
-    "typedoc": "^0.22.4",
     "typescript": "^4.4.3"
   }
 }

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

@@ -8,25 +8,19 @@
   "license": "MIT",
   "scripts": {
     "build": "rimraf dist && liuli-cli build pkg",
-    "dev": "liuli-cli build pkg -w",
-    "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"
+    "dev": "liuli-cli build pkg -w"
   },
   "jest": {
     "preset": "ts-jest"
   },
   "devDependencies": {
-    "@liuli-util/cli": "^3.11.1",
+    "@liuli-util/cli": "workspace:*",
     "@types/jest": "^27.0.2",
     "esno": "^0.9.1",
-    "gh-pages": "^3.2.3",
     "jest": "^27.2.1",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.0.5",
     "type-fest": "^2.3.4",
-    "typedoc": "^0.22.4",
     "typescript": "^4.4.3"
   }
 }

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/src/commands/sync/__tests__/.temp/lerna.json

@@ -1,6 +0,0 @@
-{
-  "packages": [
-    "packages/common/*",
-    "apps/*"
-  ]
-}

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

@@ -1,58 +0,0 @@
-{
-  "name": "temp",
-  "license": "mit",
-  "private": true,
-  "sync": [
-    "prettier",
-    "commitlint",
-    "workspaces",
-    "gitignore",
-    "simplehooks",
-    "eslint-ts",
-    "jest"
-  ],
-  "workspaces": [
-    "packages/common/*",
-    "apps/*"
-  ],
-  "prettier": "@liuli-util/prettier-standard-config",
-  "devDependencies": {
-    "prettier": "^2.3.2",
-    "@liuli-util/prettier-standard-config": "^0.1.0",
-    "@commitlint/cli": "^12.1.4",
-    "@liuli-util/commitlint-standard-config": "^0.1.6",
-    "@liuli-util/eslint-config-ts": "^0.2.0",
-    "simple-git-hooks": "^2.5.1",
-    "lint-staged": "^11.1.1"
-  },
-  "simple-git-hooks": {
-    "commit-msg": "yarn commitlint --edit $1",
-    "pre-commit": "yarn lint-staged"
-  },
-  "commitlint": {
-    "extends": [
-      "@liuli-util/commitlint-standard-config"
-    ]
-  },
-  "eslintConfig": {
-    "extends": [
-      "@liuli-util/eslint-config-ts"
-    ]
-  },
-  "jest": {
-    "preset": "ts-jest",
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/*.test.ts"
-    ]
-  },
-  "scripts": {
-    "postinstall": "npx simple-git-hooks"
-  },
-  "lint-staged": {
-    "*.{ts,tsx,js,jsx,css,vue}": [
-      "prettier --write",
-      "eslint --fix",
-      "git add"
-    ]
-  }
-}