fix: conflict - test, lint

Author: “chae-dahee”

packages/analysis-engine/src/csm.spec.ts

@@ -509,11 +509,11 @@ describe("csm", () => {
     it("should throw error when perPage is less than or equal to 0", () => {
       expect(() => {
         buildPaginatedCSMDict(fakeCommitNodeDict, fakeStemDict, "master", 0);
-      }).toThrow("perPage must be greater than 0");
+      }).toThrow("commitCountPerPage must be greater than 0");
 
       expect(() => {
         buildPaginatedCSMDict(fakeCommitNodeDict, fakeStemDict, "master", -1);
-      }).toThrow("perPage must be greater than 0");
+      }).toThrow("commitCountPerPage must be greater than 0");
     });
 
     it("should throw error when base branch does not exist", () => {

packages/analysis-engine/src/index.ts

@@ -1,9 +1,9 @@
 import "reflect-metadata";
 
-import { diContainer } from "./container";
-import { DI_IDENTIFIERS } from "./diIdentifiers";
 import { buildCommitDict } from "./commit.util";
+import { diContainer } from "./container";
 import { buildCSMDict, buildPaginatedCSMDict } from "./csm";
+import { DI_IDENTIFIERS } from "./diIdentifiers";
 import getCommitRaws from "./parser";
 import { PluginOctokit } from "./pluginOctokit";
 import { buildStemDict } from "./stem";

packages/view/jest.config.ts

@@ -11,6 +11,7 @@ const config: Config.InitialOptions = {
   moduleFileExtensions: ["ts", "tsx", "js", "mjs", "cjs", "jsx", "json", "node"],
   moduleNameMapper: {
     "^utils/(.*)$": "<rootDir>/src/utils/$1",
+    "^constants$": "<rootDir>/src/constants/constants.ts",
     d3: "<rootDir>/../../node_modules/d3/dist/d3.min.js",
   },
 };

packages/view/src/constants/constants.tsx packages/view/src/constants/constants.tspackages/view/src/constants/constants.tsx renamed to packages/view/src/constants/constants.ts

@@ -5,7 +5,7 @@ import { COMMAND_LAUNCH, COMMAND_LOGIN_WITH_GITHUB, COMMAND_RESET_GITHUB_AUTH }
 import { Credentials } from "./credentials";
 import { GithubTokenUndefinedError, WorkspacePathUndefinedError } from "./errors/ExtensionError";
 import { deleteGithubToken, getGithubToken, setGithubToken } from "./setting-repository";
-import { ClusterNodesResult } from "./types/Node";
+import type { ClusterNodesResult } from "./types/Node";
 import { mapClusterNodesFrom } from "./utils/csmMapper";
 import {
   fetchGitLogInParallel,