Skip to content
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.

Sign up for GitHub

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

Jump to bottom

update gitbutler to 0.10.27 and update with PR review feedback #2

Open
wants to merge 6 commits into
base: package/gitbutler
Choose a base branch
from
Open

update gitbutler to 0.10.27 and update with PR review feedback #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be58519
update gitbutler to 0.10.24
hallettj Mar 19, 2024
d543834
update gitbutler to 0.10.27
hallettj Mar 23, 2024
234bdf4
changes requested in pull request review feedback
hallettj Mar 23, 2024
326ec41
replace tabs in package.json with spaces
hallettj Mar 24, 2024
dd5c346
generate yarn.lock with updated branch of pnpm-lock-export
hallettj Mar 25, 2024
c8cf58d
update gitbutler to 0.10.28
hallettj Mar 26, 2024
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
191 changes: 98 additions & 93 deletions pkgs/by-name/gi/gitbutler-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,95 +1,100 @@
{
"name": "@gitbutler/ui",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite dev",
"test": "vitest run --mode development",
"build:development": "vite build --mode development",
"build:nightly": "vite build --mode nightly",
"build": "vite build",
"check": "svelte-check --tsconfig ./tsconfig.json",
"check:watch": "pnpm check --watch",
"lint": "prettier --no-editorconfig --check . && eslint .",
"format": "prettier --no-editorconfig --write .",
"fix": "eslint --fix .",
"tauri": "tauri",
"prepare": "svelte-kit sync"
},
"devDependencies": {
"@codemirror/lang-cpp": "^6.0.2",
"@codemirror/lang-css": "^6.2.1",
"@codemirror/lang-html": "^6.4.8",
"@codemirror/lang-java": "^6.0.1",
"@codemirror/lang-javascript": "^6.2.1",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-markdown": "^6.2.4",
"@codemirror/lang-php": "^6.0.1",
"@codemirror/lang-python": "^6.1.4",
"@codemirror/lang-rust": "^6.0.1",
"@codemirror/lang-vue": "^0.1.3",
"@codemirror/lang-wast": "^6.0.2",
"@codemirror/lang-xml": "^6.0.2",
"@codemirror/language": "^6.10.1",
"@codemirror/legacy-modes": "^6.3.3",
"@codemirror/state": "^6.4.0",
"@codemirror/view": "^6.23.1",
"@lezer/common": "^1.2.1",
"@lezer/highlight": "^1.2.0",
"@octokit/rest": "^20.0.2",
"@replit/codemirror-lang-svelte": "^6.0.0",
"@sentry/sveltekit": "^7.100.1",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.30.3",
"@tauri-apps/api": "^1.5.3",
"@types/crypto-js": "^4.2.2",
"@types/diff": "^5.0.9",
"@types/diff-match-patch": "^1.0.36",
"@types/lscache": "^1.3.4",
"@types/marked": "^5.0.2",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"autoprefixer": "^10.4.17",
"class-transformer": "^0.5.1",
"crypto-js": "^4.2.0",
"date-fns": "^2.30.0",
"diff-match-patch": "^1.0.5",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-square-svelte-store": "^1.0.0",
"eslint-plugin-svelte": "^2.35.1",
"inter-ui": "^4.0.1",
"leven": "^4.0.0",
"lscache": "^1.3.2",
"marked": "^10.0.0",
"mm-jsr": "^3.0.2",
"nanoevents": "^9.0.0",
"nanoid": "^5.0.5",
"postcss": "^8.4.34",
"postcss-load-config": "^5.0.2",
"posthog-js": "1.105.1",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.1.2",
"prettier-plugin-tailwindcss": "^0.5.11",
"reflect-metadata": "^0.2.1",
"rxjs": "^7.8.1",
"svelte": "^4.2.10",
"svelte-check": "^3.6.3",
"svelte-floating-ui": "^1.5.8",
"svelte-french-toast": "^1.2.0",
"svelte-loadable-store": "^2.0.1",
"svelte-outclick": "^3.7.0",
"svelte-resize-observer": "^2.0.0",
"tailwindcss": "^3.4.1",
"tauri-plugin-context-menu": "^0.7.0",
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"tinykeys": "^2.1.0",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^4.5.2",
"vitest": "^0.34.6"
}
"name": "@gitbutler/ui",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite dev",
"test": "vitest run --mode development",
"test:watch": "vitest --watch --mode development",
"build:development": "vite build --mode development",
"build:nightly": "vite build --mode nightly",
"build": "vite build",
"check": "svelte-check --tsconfig ./tsconfig.json",
"check:watch": "pnpm check --watch",
"lint": "prettier --no-editorconfig --check . && eslint .",
"format": "prettier --no-editorconfig --write .",
"fix": "eslint --fix .",
"tauri": "tauri",
"prepare": "svelte-kit sync"
},
"devDependencies": {
"@codemirror/lang-cpp": "^6.0.2",
"@codemirror/lang-css": "^6.2.1",
"@codemirror/lang-html": "^6.4.8",
"@codemirror/lang-java": "^6.0.1",
"@codemirror/lang-javascript": "^6.2.2",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-markdown": "^6.2.4",
"@codemirror/lang-php": "^6.0.1",
"@codemirror/lang-python": "^6.1.4",
"@codemirror/lang-rust": "^6.0.1",
"@codemirror/lang-vue": "^0.1.3",
"@codemirror/lang-wast": "^6.0.2",
"@codemirror/lang-xml": "^6.0.2",
"@codemirror/language": "^6.10.1",
"@codemirror/legacy-modes": "^6.3.3",
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.24.1",
"@lezer/common": "^1.2.1",
"@lezer/highlight": "^1.2.0",
"@octokit/rest": "^20.0.2",
"@replit/codemirror-lang-svelte": "^6.0.0",
"@sentry/sveltekit": "^7.104.0",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.30.4",
"@tauri-apps/api": "^1.5.3",
"@types/crypto-js": "^4.2.2",
"@types/diff": "^5.0.9",
"@types/diff-match-patch": "^1.0.36",
"@types/lscache": "^1.3.4",
"@types/marked": "^5.0.2",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"autoprefixer": "^10.4.17",
"class-transformer": "^0.5.1",
"crypto-js": "^4.2.0",
"date-fns": "^2.30.0",
"diff-match-patch": "^1.0.5",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-square-svelte-store": "^1.0.0",
"eslint-plugin-svelte": "^2.35.1",
"inter-ui": "^4.0.2",
"leven": "^4.0.0",
"lscache": "^1.3.2",
"marked": "^10.0.0",
"mm-jsr": "^3.0.2",
"nanoevents": "^9.0.0",
"nanoid": "^5.0.6",
"postcss": "^8.4.35",
"postcss-load-config": "^5.0.3",
"posthog-js": "1.110.0",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.2.2",
"prettier-plugin-tailwindcss": "^0.5.11",
"reflect-metadata": "^0.2.1",
"rxjs": "^7.8.1",
"svelte": "^4.2.12",
"svelte-check": "^3.6.6",
"svelte-floating-ui": "^1.5.8",
"svelte-french-toast": "^1.2.0",
"svelte-loadable-store": "^2.0.1",
"svelte-outclick": "^3.7.0",
"svelte-resize-observer": "^2.0.0",
"tailwindcss": "^3.4.1",
"tauri-plugin-context-menu": "^0.7.0",
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"tinykeys": "^2.1.0",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^4.5.2",
"vitest": "^0.34.6"
},
"dependencies": {
"openai": "^4.28.4"
}
}
23 changes: 12 additions & 11 deletions pkgs/by-name/gi/gitbutler-ui/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,30 @@

mkYarnPackage rec {
pname = "gitbutler-ui";
version = "0.10.11";
version = "0.10.28";

src = fetchFromGitHub {
owner = "gitbutlerapp";
repo = "gitbutler";
rev = "release/${version}";
hash = "sha256-Y8LurSQKhjHX3RUiuOdHtPkZK5NKmx3eqQ5NGtnhMlY=";
hash = "sha256-j1ioqLcYxrBni8siO5DXLLPCQawAzzZgDumKizPhh1Y=";
};

sourceRoot = "${src.name}/gitbutler-ui";

# The package.json must use spaces instead of upstream's tabs to pass Nixpkgs
# CI.
# To generate the Yarn lockfile, run `yarn install`.
# There is no way to import the tagged pnpm lockfile, so make sure to test the
# result thoughly as dependency versions may differ from the release.
#
# There is a branch of pnpm-lock-export that has been updated to work on
# gitbutler's pnpm-lock.yaml file. To generate an updated yarn.lock run:
#
# $ nix run github:hallettj/pnpm-lock-export?ref=v0.5.0 -- --schema yarn.lock@v1
#
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
offlineCache = fetchYarnDeps {
inherit yarnLock;
hash = "sha256-rggtkfE6An8It0Rvgfk0J8JHpg0NbLiweRsz0nM/tzM=";
hash = "sha256-ilU8t2jj7w41PyGazZvnKCvQ5EMeo4CsZL0hxNeXQ04=";
};

preConfigure = ''
Expand All @@ -53,14 +56,12 @@ mkYarnPackage rec {

distPhase = "true";

meta = rec {
description = "The UI for GitButler.";
meta = {
description = "Git client for simultaneous branches on top of your existing workflow";
homepage = "https://gitbutler.com";
downloadPage = homepage;
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
license = lib.licenses.fsl-10-mit;
maintainers = with lib.maintainers; [ hacker1024 ];
platforms = with lib.platforms; all;
sourceProvenance = with lib.sourceTypes; [ fromSource ];
platforms = lib.platforms.all;
};
}
Loading