wip

Author: MrWangJustToDo

.eslintrc.cjs

@@ -5,5 +5,5 @@ module.exports = {
   },
   // eslint will auto add `eslint-config` for a no scope package(which not start with '@' chart), so here use absolute file path
   extends: [require.resolve("project-tool/baseLint")],
-  ignorePatterns: ["dist", "dev", "scripts", "node_modules", "next-app-example", "next-page-example", "packages/solid"],
+  ignorePatterns: ["dist", "dev", "scripts", "node_modules", "next-app-example", "next-page-example", "packages/solid", "packages/svelte"],
 };

package.json

@@ -30,6 +30,7 @@
     "@git-diff-view/react": "workspace:*",
     "@git-diff-view/solid": "workspace:*",
     "@git-diff-view/vue": "workspace:*",
+    "@git-diff-view/svelte": "workspace:*",
     "@git-diff-view/utils": "workspace:*",
     "@swc/core": "^1.10.15",
     "@types/lodash": "^4.17.15",

packages/solid/src/components/DiffSplitHunkLineNormal.tsx

@@ -7,7 +7,7 @@ import {
   hunkLineNumberBGName,
   plainLineNumberColorName,
 } from "@git-diff-view/utils";
-import { createEffect, createMemo, createSignal, Show } from "solid-js";
+import { createEffect, createMemo, createSignal, onCleanup, Show } from "solid-js";
 
 import { useMode, useSyncHeight } from "../hooks";
 
@@ -45,7 +45,7 @@ const DiffSplitHunkLineGitHub = (props: { index: number; side: SplitSide; diffFi
 
   const currentIsPureHunk = createMemo(() => {
     const hunk = currentHunk();
-    return hunk && !hunk.splitInfo;
+    return hunk && props.diffFile._getIsPureDiffRender() && !hunk.splitInfo;
   });
 
   const currentIsLastLine = createMemo(() => {
@@ -63,9 +63,7 @@ const DiffSplitHunkLineGitHub = (props: { index: number; side: SplitSide; diffFi
 
     const cb = props.diffFile.subscribe(init);
 
-    return () => {
-      cb();
-    };
+    onCleanup(cb);
   });
 
   const currentSyncHeightSide = createMemo(() => SplitSide[SplitSide.old]);
@@ -232,9 +230,7 @@ const DiffSplitHunkLineGitLab = (props: { index: number; side: SplitSide; diffFi
 
     const cb = props.diffFile.subscribe(init);
 
-    return () => {
-      cb();
-    };
+    onCleanup(cb);
   });
 
   useSyncHeight({

packages/solid/src/components/DiffSplitHunkLineWrap.tsx

@@ -7,7 +7,7 @@ import {
   hunkLineNumberBGName,
   plainLineNumberColorName,
 } from "@git-diff-view/utils";
-import { createEffect, createMemo, createSignal, Show } from "solid-js";
+import { createEffect, createMemo, createSignal, onCleanup, Show } from "solid-js";
 
 import { useMode } from "../hooks";
 
@@ -59,9 +59,7 @@ const DiffSplitHunkLineGitHub = (props: { index: number; diffFile: DiffFile; lin
 
     const cb = props.diffFile.subscribe(init);
 
-    return () => {
-      cb();
-    };
+    onCleanup(cb);
   });
 
   return (
@@ -173,7 +171,7 @@ const DiffSplitHunkLineGitLab = (props: { index: number; diffFile: DiffFile; lin
 
   const currentIsPureHunk = createMemo(() => {
     const hunk = currentHunk();
-    return hunk && !hunk.splitInfo;
+    return hunk && props.diffFile._getIsPureDiffRender() && !hunk.splitInfo;
   });
 
   const currentIsLastLine = createMemo(() => {
@@ -191,9 +189,7 @@ const DiffSplitHunkLineGitLab = (props: { index: number; diffFile: DiffFile; lin
 
     const cb = props.diffFile.subscribe(init);
 
-    return () => {
-      cb();
-    };
+    onCleanup(cb);
   });
 
   return (

packages/svelte/eslint.config.js

@@ -5,6 +5,7 @@ import importPlugin from 'eslint-plugin-import';
 import svelte from 'eslint-plugin-svelte';
 import globals from 'globals';
 import { fileURLToPath } from 'node:url';
+import parser from 'svelte-eslint-parser';
 import ts from 'typescript-eslint';
 
 import svelteConfig from './svelte.config.js';
@@ -25,7 +26,19 @@ export default ts.config(
 		rules: { 'no-undef': 'off' }
 	},
 	{
-		files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
+		files: ['**/*.svelte'],
+		languageOptions: {
+			parser: parser,
+			ecmaVersion: 5,
+			sourceType: 'script',
+			parserOptions: {
+				parser: '@typescript-eslint/parser',
+				svelteConfig
+			}
+		}
+	},
+	{
+		files: ['**/*.svelte.ts', '**/*.svelte.js'],
 		languageOptions: {
 			parserOptions: {
 				projectService: true,
@@ -36,12 +49,14 @@ export default ts.config(
 		}
 	},
 	{
-		files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js', '**/*.ts', '**/*.js'],
+		files: ['**/*.svelte.ts', '**/*.svelte.js', '**/*.ts', '**/*.js'],
 		extends: [importPlugin.flatConfigs.recommended, importPlugin.flatConfigs.typescript],
 		settings: {
 			'import/extensions': ['.js', '.ts', '.svelte'],
 			'import/parsers': {
-				'@typescript-eslint/parser': ['.ts', '.js', '.svelte']
+				'@typescript-eslint/parser': ['.ts', '.js'],
+				// https://github.com/import-js/eslint-plugin-import/issues/2837#issuecomment-1646122243
+				'svelte-eslint-parser': ['.svelte']
 			},
 			'import/resolver': {
 				typescript: {

packages/svelte/package.json

@@ -10,10 +10,14 @@
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"format": "prettier --write .",
-		"lint": "prettier --check . && eslint ."
+		"lint": "prettier --check . && eslint .",
+		"gen:css1": "postcss src/tailwind.css -o dist/css/diff-view.css",
+    "gen:css2": "postcss src/tailwind_pure.css -o dist/css/diff-view-pure.css",
+    "gen:css": "npm run gen:css1 && npm run gen:css2"
 	},
 	"files": [
 		"dist",
+		"styles",
 		"!dist/**/*.test.*",
 		"!dist/**/*.spec.*"
 	],