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

@liuli-util/cli 3.17.1 → 3.17.2

Files changed (15) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@liuli-util/cli",
-  "version": "3.17.1",
+  "version": "3.17.2",
   "description": "一个针对于库和 CLI 应用程序打包的零配置 CLI",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

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

@@ -145,14 +145,21 @@ export class GhPagesDeployService implements IDeployService {
       const remoteDestPath = path.join(localRepoPath, this.options.remote)
       await mkdirp(remoteDestPath)
       await copy(path.resolve(this.options.cwd, this.options.dest), remoteDestPath)
-      mark('推送到远端')
+      mark('提交所有文件')
       await git.cwd(localRepoPath)
       await git.add('-A')
-      if ((await git.status()).files.length !== 0) {
+      if ((await git.status()).files.length === 0) {
+        mark('没有任何提交，跳过提交')
+      } else {
         await git.commit('Updates gh-pages by liuli-cli')
+      }
+      mark('推送到远端')
+      if ((await git.status()).ahead === 0) {
+        mark('没有更新，跳过推送')
+      } else {
         await git.push(defaultRemote, defaultBranch)
+        mark('完成推送')
       }
-      mark('完成推送')
       obs.disconnect()
     })
   }

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

@@ -1,6 +1,7 @@
 import simpleGit, { SimpleGit } from 'simple-git'
 import * as path from 'path'
-import { mkdirp, remove } from 'fs-extra'
+import { mkdirp, pathExists, remove } from 'fs-extra'
+import * as os from 'os'
 describe('测试 simple-git', () => {
   async function getOriginRemote() {
@@ -32,3 +33,22 @@ 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',
+  )
+  const 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/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/templates/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/templates/lib/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/tsconfig.json CHANGED Viewed

@@ -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/esbuild/__tests__/.temp/getDeps/package.json DELETED Viewed

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

package/src/commands/generate/__tests__/.temp/test-cli/CHANGELOG.md DELETED Viewed

	@@ -1 +0,0 @@
1	- # CHANGELOG

package/src/commands/generate/__tests__/.temp/test-cli/README.md DELETED Viewed

	@@ -1 +0,0 @@
1	- # @liuli-util/cli-test-cli

package/src/commands/generate/__tests__/.temp/test-cli/bin.js DELETED Viewed

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-// eslint-disable-next-line no-undef
-require('./dist/bin.js')

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

@@ -1,44 +0,0 @@
-{
-  "name": "test-cli",
-  "version": "0.1.0",
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "types": "dist/index.d.ts",
-  "license": "MIT",
-  "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"
-  },
-  "bin": {
-    "cli-name": "./bin.js"
-  },
-  "jest": {
-    "preset": "ts-jest"
-  },
-  "dependencies": {
-    "commander": "^8.2.0",
-    "fs-extra": "^10.0.0",
-    "inquirer": "^8.1.5"
-  },
-  "devDependencies": {
-    "@liuli-util/cli": "^3.11.1",
-    "@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/src/commands/generate/__tests__/.temp/test-cli/src/bin.ts DELETED Viewed

@@ -1,13 +0,0 @@
-import { Command } from 'commander'
-import { prompt } from 'inquirer'
-new Command()
-  .action(async () => {
-    const { name } = await prompt<{ name: string }>({
-      type: 'input',
-      name: 'name',
-      message: '请输入名字',
-    })
-    console.log(`hello ${name}`)
-  })
-  .parse()

package/src/commands/generate/__tests__/.temp/test-cli/src/index.ts DELETED Viewed

	@@ -1 +0,0 @@
1	- export {}

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

@@ -1,28 +0,0 @@
-{
-  "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"
-  }
-}