Merge pull request cangzhang#2 from cangzhang/feat/prettier

feat: add prettier configuration

Author: uniquemo

.eslintrc.js

@@ -1,20 +1,20 @@
 /**@type {import('eslint').Linter.Config} */
 // eslint-disable-next-line no-undef
 module.exports = {
-	root: true,
-	parser: '@typescript-eslint/parser',
-	plugins: [
-		'@typescript-eslint',
-	],
-	extends: [
-		'eslint:recommended',
-		'plugin:@typescript-eslint/recommended',
-	],
-	rules: {
-		'semi': [2, "always"],
-		'@typescript-eslint/no-unused-vars': 0,
-		'@typescript-eslint/no-explicit-any': 0,
-		'@typescript-eslint/explicit-module-boundary-types': 0,
-		'@typescript-eslint/no-non-null-assertion': 0,
-	}
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+  ],
+  rules: {
+    'semi': [2, "always"],
+    '@typescript-eslint/no-unused-vars': 0,
+    '@typescript-eslint/no-explicit-any': 0,
+    '@typescript-eslint/explicit-module-boundary-types': 0,
+    '@typescript-eslint/no-non-null-assertion': 0,
+  }
 };

.prettierrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  semi: true,
+  trailingComma: 'all',
+  singleQuote: true,
+  jsxSingleQuote: true,
+  printWidth: 120,
+  tabWidth: 2
+}

package.json

@@ -105,6 +105,19 @@
     "watch:extension": "tsc --watch -p ./src",
     "watch:webviews": "webpack --watch --mode development"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{ts,tsx,json}": [
+      "prettier --write"
+    ],
+    "webview/**/*.{ts,tsx}": [
+      "prettier --write"
+    ]
+  },
   "dependencies": {
     "axios": "^0.21.0",
     "isomorphic-git": "^1.8.0",
@@ -120,7 +133,10 @@
     "@typescript-eslint/parser": "^4.7.0",
     "css-loader": "^5.0.1",
     "eslint": "^7.13.0",
+    "husky": "^4.3.0",
+    "lint-staged": "^10.5.1",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.1.2",
     "style-loader": "^2.0.0",
     "ts-loader": "^8.0.11",
     "typescript": "^4.0.5",

src/services/codingServer.ts

@@ -15,7 +15,6 @@ export default class CodingServer {
     if (session) {
       this._session = session;
     }
-
     if (repo) {
       this._repo = repo;
     }
@@ -34,12 +33,14 @@ export default class CodingServer {
       return parseCloneUrl(remotes[0].url);
     } catch {
       console.error('该目录没有进行git初始化');
-    } 
+    }
   }
 
   async getUserInfo(team: string, token: string = this._session?.accessToken || ``) {
     try {
-      const result = await axios.get(`https://${team}.coding.net/api/current_user`, {
+      const result = await axios({
+        method: 'get',
+        url: `https://${team}.coding.net/api/current_user`,
         params: {
           access_token: token,
         },
@@ -59,20 +60,21 @@ export default class CodingServer {
   async getMrList(
     team: string = this._repo.team,
     project: string = this._repo.project,
-    repo: string = this._repo.repo
+    repo: string = this._repo.repo,
   ) {
-    return MOCK.MR_LIST.data.list;
     try {
       const url = `https://${team}.coding.net/api/user/${team}/project/${project}/depot/${repo}/git/merges/query`;
-      const result = await axios.get(url, {
+      const result = await axios({
+        method: 'get',
+        url,
         params: {
           status: `open`,
           sort: `action_at`,
           page: 1,
           PageSize: 100,
           sortDirection: `DESC`,
           access_token: this._session.accessToken,
-        }
+        },
       });
       return result?.data?.list || [];
     } catch (err) {
@@ -81,20 +83,21 @@ export default class CodingServer {
   }
 
   async getDepotList(team: string = this._repo.team, project: string = this._repo.project) {
-    return MOCK.DEPOT_LIST.data.depots;
     try {
-      const result = await axios.get(`https://${team}.coding.net/api/user/${team}/project/${project}/repos`, {
+      const result = await axios({
+        method: 'get',
+        url: `https://${team}.coding.net/api/user/${team}/project/${project}/repos`,
         params: {
           access_token: this._session.accessToken,
-        }
+        },
       });
       return result?.data?.depots || [];
     } catch (err) {
       throw new Error(err);
     }
   }
 
-  async createProjectAndDepot(team: string, payload: { project: string, depot: string }) {
+  async createProjectAndDepot(team: string, payload: { project: string; depot: string }) {
     return 'createProjectAndDepot';
   }
 
@@ -103,15 +106,15 @@ export default class CodingServer {
       const result = await axios({
         method: 'post',
         url: `https://${team}.coding.net/api/user/${team}/project/${project}/depot?access_token=${this._session.accessToken}`,
-        header: {
-          'content-type': 'application/x-www-form-urlencoded;charset=UTF-8'
+        headers: {
+          'content-type': 'application/x-www-form-urlencoded;charset=UTF-8',
         },
         data: qs.stringify({
           name: depot,
           vcsType: 'git',
           gitReadmeEnabled: false,
-          shared: false
-        })
+          shared: false,
+        }),
       });
       console.log('result => ', result);
     } catch (err) {

src/tsconfig.json

@@ -1,13 +1,13 @@
 {
-	"compilerOptions": {
-		"module": "commonjs",
-		"target": "es6",
-		"lib": ["es6"],
-		"outDir": "../out",
-		"sourceMap": false,
-		"strict": true,
-		"rootDir": ".",
-		"esModuleInterop": true
-	},
-	"exclude": ["node_modules"]
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "lib": ["es6"],
+    "outDir": "../out",
+    "sourceMap": false,
+    "strict": true,
+    "rootDir": ".",
+    "esModuleInterop": true
+  },
+  "exclude": ["node_modules"]
 }

src/typings/common.ts

@@ -1,67 +1,61 @@
 export interface IRepoInfo {
-	team: string;
-	project: string;
-	repo: string;
+  team: string
+  project: string
+  repo: string
 }
 
 export enum TokenType {
   AccessToken = `accessToken`,
-  RefreshToken = `refreshToken` ,
+  RefreshToken = `refreshToken`,
 }
 
 export interface IUserResponse {
-  avatar: string;
-  global_key: string;
-  name: string;
-  path: string;
-  team: string;
+  avatar: string
+  global_key: string
+  name: string
+  path: string
+  team: string
 }
 
 export interface ISessionData {
-  id: string;
-  user: IUserResponse | null;
-  accessToken: string;
-  refreshToken: string;
-}
-
-export interface RepoInfo {
-	team: string;
-	project: string;
-	repo: string;
+  id: string
+  user: IUserResponse | null
+  accessToken: string
+  refreshToken: string
 }
 
 export interface IUserInfo {
-  id: number;
+  id: number
 }
 
 export interface IReviewer {
-  reviewer: IUserInfo;
+  reviewer: IUserInfo
 }
 
 export interface IMRItem {
-  id: number;
-  iid: number;
-  srcBranch: string;
-  desBranch: string;
-  title: string;
-  path: string;
-  author: IUserInfo;
-  reviewers: IReviewer[];
+  id: number
+  iid: number
+  srcBranch: string
+  desBranch: string
+  title: string
+  path: string
+  author: IUserInfo
+  reviewers: IReviewer[]
 }
 
 export interface IDepot {
-  depotPath: string;
-  gitHttpsHost: string;
-  gitHttpsUrl: string;
-  gitSshHost: string;
-  gitSshUrl: string;
-  id: number;
-  isDefault: boolean;
-  isSvnHttp: boolean;
-  name: string;
-  shared: boolean;
-  size: number;
-  status: number;
-  svnEnabled: boolean;
+  depotPath: string
+  gitHttpsHost: string
+  gitHttpsUrl: string
+  gitSshHost: string
+  gitSshUrl: string
+  id: number
+  isDefault: boolean
+  isSvnHttp: boolean
+  name: string
+  shared: boolean
+  size: number
+  status: number
+  svnEnabled: boolean
   vcsType: 'git' | 'svn'
 }

src/utils/axios.ts

@@ -10,13 +10,13 @@ const handleError = (error: any) => {
 };
 
 interface Instance extends AxiosInstance {
-  (config: AxiosRequestConfig): Promise<any>
+  (config: AxiosRequestConfig): Promise<any>;
 }
 
-const createInstance = (): any => {
+const createInstance = (): Instance => {
   const instance = axios.create();
   instance.interceptors.response.use(handleResponse, handleError);
   return instance;
 };
 
-export default createInstance();
+export default createInstance();

src/utils/repo.ts

@@ -1,26 +1,26 @@
-import { RepoInfo, IMRItem, IDepot } from '../typings/common';
+import { IRepoInfo, IMRItem, IDepot } from '../typings/common';
 
-export function parseCloneUrl(url: string): RepoInfo | null {
-	const reg = /^(https:\/\/|git@)e\.coding\.net(\/|:)(.*)\.git$/i;
-	const result = url.match(reg);
+export function parseCloneUrl(url: string): IRepoInfo | null {
+  const reg = /^(https:\/\/|git@)e\.coding\.net(\/|:)(.*)\.git$/i;
+  const result = url.match(reg);
 
-	if (!result) {
-		return null;
-	}
+  if (!result) {
+    return null;
+  }
 
-	const str = result.pop();
-	if (!str || !str?.includes(`/`)) {
-		return null;
-	}
+  const str = result.pop();
+  if (!str || !str?.includes(`/`)) {
+    return null;
+  }
 
-	const [team, project, repo] = str.split(`/`);
-	return { team, project, repo: repo || project };
+  const [team, project, repo] = str.split(`/`);
+  return { team, project, repo: repo || project };
 }
 
 export function getMRUrl(team: string, mrItem: IMRItem): string {
-	return `https://${team}.coding.net${mrItem.path}`;
+  return `https://${team}.coding.net${mrItem.path}`;
 }
 
 export function getDepotUrl(team: string, depot: IDepot): string {
-	return `https://${team}.coding.net${depot.depotPath}`;
+  return `https://${team}.coding.net${depot.depotPath}`;
 }