improve build step

MrWangJustToDo · MrWangJustToDo · commit 24373a56fe64 · 2024-05-09T15:54:48.000+08:00
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -52,10 +52,11 @@
     "diff parse"
   ],
   "dependencies": {
+    "@git-diff-view/lowlight": "^0.0.14",
+    "highlight.js": "^11.9.0",
     "lowlight": "^3.1.0"
   },
   "devDependencies": {
-    "@git-diff-view/lowlight": "latest",
     "@types/hast": "^3.0.0"
   }
 }
diff --git a/packages/core/src/diff-file.ts b/packages/core/src/diff-file.ts
@@ -396,7 +396,13 @@ export class DiffFile {
           _newLength: Number(newNumLength),
         };
 
-        if (__DEV__ && typedI.isFirst && typedI.hunkInfo.oldStartIndex !== typedI.hunkInfo.newStartIndex) {
+        if (
+          __DEV__ &&
+          typedI.isFirst &&
+          typedI.hunkInfo.oldStartIndex &&
+          typedI.hunkInfo.newStartIndex &&
+          typedI.hunkInfo.oldStartIndex !== typedI.hunkInfo.newStartIndex
+        ) {
           console.warn("the first hunk should start with the same line number");
         }
 
diff --git a/packages/file/package.json b/packages/file/package.json
@@ -52,12 +52,12 @@
     "diff parse"
   ],
   "dependencies": {
+    "@git-diff-view/core": "v0.0.14",
     "diff": "^5.2.0",
+    "highlight.js": "^11.9.0",
     "lowlight": "^3.1.0"
   },
   "devDependencies": {
-    "@git-diff-view/core": "latest",
-    "@git-diff-view/lowlight": "latest",
     "@types/diff": "^5.0.9",
     "@types/hast": "^3.0.0"
   }
diff --git a/packages/lowlight/package.json b/packages/lowlight/package.json
@@ -52,10 +52,8 @@
     "virtual dom highlight"
   ],
   "dependencies": {
+    "@types/hast": "^3.0.0",
     "highlight.js": "^11.9.0",
     "lowlight": "^3.1.0"
-  },
-  "devDependencies": {
-    "@types/hast": "^3.0.0"
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -60,14 +60,14 @@
     "react diff component"
   ],
   "dependencies": {
+    "@git-diff-view/core": "v0.0.14",
     "@types/hast": "^3.0.0",
     "highlight.js": "^11.9.0",
     "lowlight": "^3.1.0",
     "reactivity-store": "^0.3.2",
     "use-sync-external-store": "^1.2.0"
   },
   "devDependencies": {
-    "@git-diff-view/core": "latest",
     "@types/use-sync-external-store": "^0.0.3",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
@@ -76,13 +76,7 @@
     "tailwindcss": "^3.4.3"
   },
   "peerDependencies": {
-    "@git-diff-view/core": "latest",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@git-diff-view/core": {
-      "optional": true
-    }
   }
 }
diff --git a/packages/react/src/components/DiffSplitViewNormal.tsx b/packages/react/src/components/DiffSplitViewNormal.tsx
@@ -2,7 +2,7 @@
 import { getSplitContentLines, type DiffFile } from "@git-diff-view/core";
 import { Fragment, memo, useCallback, useEffect, useRef } from "react";
 import * as React from "react";
-import { useSyncExternalStore } from "use-sync-external-store/shim";
+import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
 
 import { useDiffViewContext } from "..";
 import { useTextWidth } from "../hooks/useTextWidth";
diff --git a/packages/react/src/components/DiffSplitViewWrap.tsx b/packages/react/src/components/DiffSplitViewWrap.tsx
@@ -3,7 +3,8 @@ import { Fragment, memo, useCallback, useMemo } from "react";
 import * as React from "react";
 import { flushSync } from "react-dom";
 import { createStore, ref } from "reactivity-store";
-import { useSyncExternalStore } from "use-sync-external-store/shim";
+// SEE https://github.com/facebook/react/pull/25231
+import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
 
 import { useDiffViewContext, SplitSide, diffFontSizeName } from "..";
 import { useTextWidth } from "../hooks/useTextWidth";
diff --git a/packages/react/src/components/DiffUnifiedView.tsx b/packages/react/src/components/DiffUnifiedView.tsx
@@ -3,7 +3,7 @@ import { getUnifiedContentLine } from "@git-diff-view/core";
 import * as React from "react";
 import { Fragment, memo, useEffect, useMemo, useCallback } from "react";
 import { createStore, ref } from "reactivity-store";
-import { useSyncExternalStore } from "use-sync-external-store/shim";
+import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
 
 import { diffFontSizeName, useDiffViewContext, type SplitSide } from "..";
 import { useTextWidth } from "../hooks/useTextWidth";
diff --git a/packages/vue/index.cjs b/packages/vue/index.cjs
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -9,7 +9,7 @@
   "types": "index.d.ts",
   "files": [
     "dist",
-    "index.js",
+    "index.cjs",
     "index.d.ts"
   ],
   "repository": {
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/MrWangJustToDo/git-diff-view",
   "exports": {
     ".": {
-      "require": "./index.js",
+      "require": "./index.cjs",
       "types": "./index.d.ts",
       "import": "./dist/vue-git-diff-view.mjs"
     },
@@ -49,12 +49,12 @@
     "vue diff component"
   ],
   "dependencies": {
+    "@git-diff-view/core": "v0.0.14",
     "@types/hast": "^3.0.0",
     "highlight.js": "^11.9.0",
     "lowlight": "^3.1.0"
   },
   "devDependencies": {
-    "@git-diff-view/core": "latest",
     "@rollup/plugin-typescript": "^11.1.6",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
@@ -68,12 +68,6 @@
     "vue-tsc": "^1.8.27"
   },
   "peerDependencies": {
-    "@git-diff-view/core": "latest",
     "vue": "^3"
-  },
-  "peerDependenciesMeta": {
-    "@git-diff-view/core": {
-      "optional": true
-    }
   }
 }
diff --git a/packages/vue/vite.config.ts b/packages/vue/vite.config.ts
@@ -19,7 +19,7 @@ export default defineConfig({
     },
     sourcemap: true,
     rollupOptions: {
-      external: ["vue", "lowlight"],
+      external: ["vue", "@git-diff-view/core"],
       output: {
         globals: {
           vue: "Vue",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -5,16 +5,11 @@ import { rollupBuild } from "project-tool/rollup";
 import postcss from "rollup-plugin-postcss";
 import tailwindcss from "tailwindcss";
 
-const externalLowlight = (id: string) =>
-  id.includes("node_modules") &&
-  // !id.includes("lowlight") &&
-  // !id.includes("highlight.js") &&
-  // !id.includes("devlop") &&
-  !id.includes("tslib");
+const externalCorePackage = (id: string) =>
+  (id.includes("node_modules") || id.includes("@git-diff-view/")) && !id.includes("tslib");
 
-const externalCorePackage = (id: string) => id.includes("node_modules") && !id.includes("tslib");
-
-const external = (id: string) => id.includes("node_modules") && !id.includes("tslib") && !id.endsWith(".css");
+const external = (id: string) =>
+  (id.includes("node_modules") || id.includes("@git-diff-view/")) && !id.includes("tslib") && !id.endsWith(".css");
 
 const clean = async (packageName: string) => {
   const typePath = resolve(process.cwd(), "packages", packageName, "index.d.ts");
@@ -39,13 +34,34 @@ const buildType = async (packageName: string) => {
 };
 
 const start = async () => {
-  await rollupBuild({ packageName: "lowlight", packageScope: "packages", external: externalLowlight });
+  await rollupBuild({
+    packageName: "lowlight",
+    packageScope: "packages",
+    external: {
+      generateExternal: (type) => {
+        if (type === "singleOther") {
+          return (id: string) => id.includes("node_modules") && !id.includes("tslib");
+        } else {
+          return (id: string) =>
+            id.includes("node_modules") && !id.includes("lowlight") && !id.includes("devlop") && !id.includes("tslib");
+        }
+      },
+    },
+  });
   await buildType("lowlight");
   await rollupBuild({ packageName: "shiki", packageScope: "packages", external: external });
   await buildType("shiki");
-  await rollupBuild({ packageName: "core", packageScope: "packages", external: externalCorePackage });
+  await rollupBuild({
+    packageName: "core",
+    packageScope: "packages",
+    external: externalCorePackage,
+  });
   await buildType("core");
-  await rollupBuild({ packageName: "file", packageScope: "packages", external: externalCorePackage });
+  await rollupBuild({
+    packageName: "file",
+    packageScope: "packages",
+    external: externalCorePackage,
+  });
   await buildType("file");
   await rollupBuild({
     packageName: "react",
@@ -109,9 +125,9 @@ const start = async () => {
     },
   });
   await buildType("react");
-  // // 对于 "jsx": "preserve" 最新的rollup已经不支持解析，因此使用vite来进行打包
-  // // https://github.com/rollup/plugins/issues/72
-  // // https://rollupjs.org/migration/#configuration-changes
+  // 对于 "jsx": "preserve" 最新的rollup已经不支持解析，因此使用vite来进行打包
+  // https://github.com/rollup/plugins/issues/72
+  // https://rollupjs.org/migration/#configuration-changes
   await new Promise<void>((r, j) => {
     const ls = spawn(`cd packages/vue && pnpm run build`, { shell: true, stdio: "inherit" });
     ls.on("close", () => r());

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,11 @@`
`52`	`52`	`"diff parse"`
`53`	`53`	`],`
`54`	`54`	`"dependencies": {`
	`55`	`+ "@git-diff-view/lowlight": "^0.0.14",`
	`56`	`+ "highlight.js": "^11.9.0",`
`55`	`57`	`"lowlight": "^3.1.0"`
`56`	`58`	`},`
`57`	`59`	`"devDependencies": {`
`58`		`- "@git-diff-view/lowlight": "latest",`
`59`	`60`	`"@types/hast": "^3.0.0"`
`60`	`61`	`}`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,8 @@`
`52`	`52`	`"virtual dom highlight"`
`53`	`53`	`],`
`54`	`54`	`"dependencies": {`
	`55`	`+ "@types/hast": "^3.0.0",`
`55`	`56`	`"highlight.js": "^11.9.0",`
`56`	`57`	`"lowlight": "^3.1.0"`
`57`		`- },`
`58`		`- "devDependencies": {`
`59`		`- "@types/hast": "^3.0.0"`
`60`	`58`	`}`
`61`	`59`	`}`