Skip to content

Commit

Permalink
Merge pull request #118 from fosslife/master
Browse files Browse the repository at this point in the history
release: v3
  • Loading branch information
Sparkenstein authored Nov 6, 2024
2 parents ea35ac4 + a2507fa commit 6a87fdd
Show file tree
Hide file tree
Showing 66 changed files with 4,609 additions and 1,898 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

github: [fosslife, sparkenstein] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github: ['sparkenstein'] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ yarn-error.log
assets/vips/

.yarn
.eslintcache
.eslintcache
.idea

src-tauri/gen
30 changes: 17 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dev-tools",
"version": "2.15.0",
"version": "3.0.0",
"license": "MIT",
"type": "module",
"scripts": {
Expand All @@ -10,7 +10,7 @@
"preview": "vite preview",
"tauri": "tauri",
"lint:fix": "eslint ./src --ext .jsx,.js,.ts,.tsx --fix",
"lint:format": "prettier --loglevel warn --write \"./**/*.{js,jsx,ts,tsx,css,md,json}\" ",
"lint:format": "prettier --log-level warn --write \"./**/*.{js,jsx,ts,tsx,css,md,json}\" ",
"lint": "yarn lint:format && yarn lint:fix ",
"type-check": "tsc",
"release": "node scripts/sign.mjs",
Expand All @@ -19,7 +19,6 @@
"bump": "node scripts/bumpVersion.mjs"
},
"dependencies": {
"@aptabase/tauri": "^0.4.1",
"@faker-js/faker": "^8.4.1",
"@hello-pangea/dnd": "^16.6.0",
"@loadable/component": "^5.16.3",
Expand All @@ -33,7 +32,13 @@
"@prettier/plugin-xml": "^3.4.1",
"@rollup/plugin-alias": "^5.1.0",
"@sqltools/formatter": "^1.2.5",
"@tauri-apps/api": "^1.6.0",
"@tabler/icons-react": "^3.16.0",
"@tauri-apps/api": "2.0.0",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-dialog": "~2",
"@tauri-apps/plugin-fs": "^2.0.1",
"@tauri-apps/plugin-sql": "^2.0.0",
"@tauri-apps/plugin-store": "^2.1.0",
"@uiw/react-markdown-preview": "^5.1.1",
"angular-html-parser": "^5.2.0",
"chroma-js": "^2.4.2",
Expand Down Expand Up @@ -64,19 +69,17 @@
"react-compare-slider": "^3.0.1",
"react-cropper": "^2.3.3",
"react-dom": "^18.2.0",
"react-icons": "^5.2.1",
"react-highlight-words": "^0.20.0",
"react-katex": "^3.0.1",
"react-live": "^4.1.5",
"react-pdf": "^7.7.3",
"react-pdf": "^9.1.1",
"react-router-dom": "6.22.3",
"react-shepherd": "^4.3.0",
"react-sizeme": "^3.0.2",
"recharts": "2.12.3",
"rehype-katex": "^7.0.0",
"rehype-raw": "^7.0.0",
"remark-math": "^6.0.0",
"simple-base-converter": "^1.0.19",
"tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store",
"terser": "^5.30.0",
"tinycolor2": "^1.6.0",
"typescript-eslint": "^7.4.0",
Expand All @@ -85,7 +88,7 @@
"devDependencies": {
"@actions/github": "^6.0.0",
"@linaria/rollup": "^5.0.4",
"@tauri-apps/cli": "^1.6.0",
"@tauri-apps/cli": "^2.0.4",
"@types/chroma-js": "^2.4.4",
"@types/color-convert": "^2.0.3",
"@types/convert-units": "^2.3.9",
Expand All @@ -100,6 +103,7 @@
"@types/react": "^18.2.73",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18.2.23",
"@types/react-highlight-words": "^0.20.0",
"@types/react-katex": "^3.0.4",
"@types/tinycolor2": "^1.4.6",
"@types/uuid": "^9.0.8",
Expand All @@ -112,20 +116,20 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-simple-import-sort": "^12.0.0",
"fs-extra": "^11.2.0",
"husky": "^9.1.5",
"lint-staged": "^15.2.9",
"monaco-editor": "^0.47.0",
"monaco-editor": "^0.52.0",
"postcss": "^8.4.38",
"postcss-preset-mantine": "^1.13.0",
"postcss-simple-vars": "^7.0.1",
"prettier": "^3.2.4",
"rollup-plugin-visualizer": "^5.12.0",
"typescript": "^5.4.3",
"vite": "^5.2.7",
"vite": "^5.2.14",
"vite-tsconfig-paths": "^5.0.1"
}
}
}
9 changes: 8 additions & 1 deletion scripts/bumpVersion.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ const version = packageJson.version;

const versionParts = version.split(".");

// check if args provided
if (process.argv.length < 3) {
console.error("No argument provided. Please provide a part to bump.");
console.log("Usage: node scripts/bumpVersion.mjs <major|minor|patch>");
process.exit(1);
}

const bumpPart =
process.argv[2] === "major"
? "major"
Expand All @@ -33,7 +40,7 @@ const newVersion =

packageJson.version = newVersion;

tauriConf.package.version = newVersion;
tauriConf.version = newVersion;

const newCargoToml = cargoToml.replace(
/version = "(.*)"/,
Expand Down
1 change: 1 addition & 0 deletions src-tauri/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
# will have compiled files and executables
/target/
WixTools
/gen/
Loading

0 comments on commit 6a87fdd

Please sign in to comment.