Skip to content

init #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

init #19

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
ignorePatterns: ["dist", "dev", "scripts", "node_modules", "next-app-example", "next-page-example", "packages/solid"],
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"dev:vue-ssr": "cd ui/vue-ssr-example && pnpm run dev",
"dev:next-page": "cd ui/next-page-example && pnpm run dev",
"dev:next-app": "cd ui/next-app-example && pnpm run dev",
"dev:solid": "cd ui/solid-example && pnpm run dev",
"build:react": "cd ui/react-example && pnpm run build",
"pre:release": "pnpm run lint && pnpm run prettier && pnpm run clean && pnpm run build:packages",
"release": "pnpm run pre:release && pnpm run start:release",
Expand Down
3 changes: 3 additions & 0 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name": "@git-diff-view/angular"
}
3 changes: 3 additions & 0 deletions packages/dom/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name": "@git-diff-view/dom"
}
5 changes: 5 additions & 0 deletions packages/solid/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
plugins: ["solid"],
extends: ["../../.eslintrc.cjs", "plugin:solid/typescript"],
ignorePatterns: ["dist", "dev", "node_modules"],
};
59 changes: 59 additions & 0 deletions packages/solid/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "@git-diff-view/solid",
"description": "@git-diff-view/solid",
"author": "MrWangJustToDo",
"license": "MIT",
"version": "0.0.25",
"main": "index.js",
"type": "module",
"types": "index.d.ts",
"files": [
"dist",
"index.cjs",
"index.d.ts"
],
"repository": {
"type": "git",
"url": "git+https://github.com/MrWangJustToDo/git-diff-view.git",
"directory": "packages/solid"
},
"scripts": {
"build": "vite build",
"gen:type": "dts-bundle-generator -o index.d.ts dist/index.d.ts"
},
"homepage": "https://mrwangjusttodo.github.io/git-diff-view",
"exports": {
".": {
"require": "./index.cjs",
"types": "./index.d.ts",
"import": "./dist/vue-git-diff-view.mjs"
},
"./styles/*": "./dist/css/*",
"./package.json": "./package.json"
},
"keywords": [
"diff component",
"solid diff component"
],
"dependencies": {
"@git-diff-view/core": "^0.0.25",
"@types/hast": "^3.0.0",
"highlight.js": "^11.11.0",
"lowlight": "^3.3.0",
"fast-diff": "^1.3.0"
},
"devDependencies": {
"@rollup/plugin-typescript": "^11.1.6",
"solid-js": "^1.9.0",
"vite-plugin-solid": "^2.11.0",
"autoprefixer": "^10.4.20",
"eslint-plugin-solid": "^0.14.5",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.14",
"vite": "^5.4.10",
"vite-plugin-dts": "^3.9.1"
},
"peerDependencies": {
"solid-js": "^1.9.0"
}
}
32 changes: 32 additions & 0 deletions packages/solid/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
export default {
plugins: {
tailwindcss: { config: "./tailwind.config.js" },
"postcss-prefix-selector": {
prefix: ".diff-tailwindcss-wrapper",
transform: function (prefix, selector, prefixedSelector, _filePath, rule) {
const filePath = rule.source?.input?.file;
// ignore base css
// TODO next release update
if (rule.source?.start?.line === 1 && rule.source?.start?.column === 1) {
return selector;
}
if (selector.includes("diff-line-extend-wrapper") || selector.includes("diff-line-widget-wrapper")) {
return selector;
}
if (selector.includes("[data-theme")) {
return prefix + selector;
}
if (filePath.includes("node_modules")) {
if (filePath.includes("dark.css")) {
return `${prefix}[data-theme="dark"] .diff-line-syntax-raw ${selector}`;
} else {
return `${prefix}[data-theme="light"] .diff-line-syntax-raw ${selector}`;
}
} else {
return prefixedSelector;
}
},
},
autoprefixer: {},
},
};
74 changes: 74 additions & 0 deletions packages/solid/src/components/DiffAddWidget.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import { diffFontSizeName, addWidgetColorName, addWidgetBGName } from "@git-diff-view/utils";

import type { SplitSide } from "./DiffView";
import type { DiffFile } from "@git-diff-view/core";

export const DiffSplitAddWidget = (props: {
index: number;
className?: string;
lineNumber: number;
diffFile: DiffFile;
side: SplitSide;
onOpenAddWidget: (lineNumber: number, side: SplitSide) => void;
onWidgetClick?: (event: "onAddWidgetClick", lineNumber: number, side: SplitSide) => void;
}) => {
return (
<div
class={
"diff-add-widget-wrapper invisible select-none transition-transform hover:scale-110 group-hover:visible" +
(props.className ? " " + props.className : "")
}
style={{
width: `calc(var(${diffFontSizeName}) * 1.4)`,
height: `calc(var(${diffFontSizeName}) * 1.4)`,
}}
>
<button
class="diff-add-widget z-[1] flex h-full w-full origin-center cursor-pointer items-center justify-center rounded-md text-[1.2em]"
style={{
color: `var(${addWidgetColorName})`,
"background-color": `var(${addWidgetBGName})`,
}}
onClick={() => {
props.onOpenAddWidget(props.lineNumber, props.side);
props.onWidgetClick?.("onAddWidgetClick", props.lineNumber, props.side);
}}
>
+
</button>
</div>
);
};

export const DiffUnifiedAddWidget = (props: {
index: number;
diffFile: DiffFile;
lineNumber: number;
side: SplitSide;
onOpenAddWidget: (lineNumber: number, side: SplitSide) => void;
onWidgetClick?: (event: "onAddWidgetClick", lineNumber: number, side: SplitSide) => void;
}) => {
return (
<div
class="diff-add-widget-wrapper invisible absolute left-[100%] top-[1px] translate-x-[-50%] select-none transition-transform hover:scale-110 group-hover:visible"
style={{
width: `calc(var(${diffFontSizeName}) * 1.4)`,
height: `calc(var(${diffFontSizeName}) * 1.4)`,
}}
>
<button
class="diff-add-widget z-[1] flex h-full w-full origin-center cursor-pointer items-center justify-center rounded-md text-[1.2em]"
style={{
color: `var(${addWidgetColorName})`,
"background-color": `var(${addWidgetBGName})`,
}}
onClick={() => {
props.onOpenAddWidget(props.lineNumber, props.side);
props.onWidgetClick?.("onAddWidgetClick", props.lineNumber, props.side);
}}
>
+
</button>
</div>
);
};
Loading