Skip to content

Commit

Permalink
Merge branch 'release/0.0.25'
Browse files Browse the repository at this point in the history
  • Loading branch information
blackforestboi committed Dec 27, 2023
2 parents d398718 + b7e059a commit 879f0a3
Show file tree
Hide file tree
Showing 22 changed files with 24,128 additions and 2,351 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,5 @@ forge.config.js
afterSignHook.js

buildAPIkeys.js
AuthKey_7LNRLB4RZ6.p8
AuthKey_7LNRLB4RZ6.p8
build/
50 changes: 32 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"name": "memex-desktop",
"productName": "Memex Desktop",
"version": "0.0.24",
"version": "0.0.25",
"description": "Backup and sync to your favorite PKM tools",
"main": "src/index.js",
"main": "build/index.js",
"type": "module",
"resolutions": {
"node-abi": "^3.47.0"
},
"scripts": {
"start": "tsc && electron-forge start",
"package": "electron-forge package",
Expand All @@ -19,7 +23,7 @@
"deploy": "electron-builder build --mac --linux --win --publish never",
"build:manual": "electron-builder build -mwl --publish never",
"build:mac:x64": "electron-builder build --mac dmg zip --x64",
"build:mac:arm64:dmg": "electron-builder build --mac dmg --arm64",
"build:mac:arm64:dmg": "tsc && electron-builder build --mac dmg --arm64",
"build:mac:arm64:dmg:withoutSign": "electron-builder build --mac dmg --arm64 --config.afterSign",
"build:mac:arm64": "electron-builder build --mac dmg zip --arm64",
"build:mac": "electron-builder build --mac dmg zip --x64 --arm64",
Expand Down Expand Up @@ -60,7 +64,6 @@
"x64"
]
}

],
"hardenedRuntime": true,
"entitlements": "entitlements.mac.inherit.plist"
Expand Down Expand Up @@ -93,10 +96,11 @@
"!data/*",
"node_modules/@xenova/*"
],
"files": [
"!dist/**/*",
"!data/**/*"
]
"files": [
"!dist/**/*",
"!data/**/*",
"build/**/*"
]
},
"repository": {
"type": "git",
Expand All @@ -112,13 +116,12 @@
"**/*": "prettier --write --ignore-unknown"
},
"devDependencies": {
"@electron-forge/cli": "^6.4.2",
"@electron-forge/maker-deb": "^6.4.2",
"@electron-forge/maker-rpm": "^6.4.2",
"@electron-forge/maker-squirrel": "^6.4.2",
"@electron-forge/maker-zip": "^6.4.2",
"@electron-forge/plugin-auto-unpack-natives": "^6.4.2",
"@electron-forge/plugin-webpack": "^6.4.2",
"@electron-forge/cli": "^7.2.0",
"@electron-forge/maker-deb": "^7.2.0",
"@electron-forge/maker-rpm": "^7.2.0",
"@electron-forge/maker-squirrel": "^7.2.0",
"@electron-forge/maker-zip": "^7.2.0",
"@electron-forge/plugin-auto-unpack-natives": "^7.2.0",
"@types/jsdom": "^21.1.6",
"@types/mkdirp": "^2.0.0",
"@types/turndown": "^5.0.4",
Expand All @@ -128,7 +131,7 @@
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.0.0",
"dotenv-webpack": "^8.0.1",
"electron": "26.2.1",
"electron": "28.0.0",
"electron-builder": "^24.6.4",
"eslint": "^8.0.1",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -139,15 +142,22 @@
"prettier": "^3.1.1",
"style-loader": "^3.0.0",
"ts-loader": "^9.2.2",
"ts-node": "^10.0.0"
"ts-node": "^10.0.0",
"typescript": "^4.8.3"
},
"dependencies": {
"@anthropic-ai/sdk": "^0.10.2",
"@extractus/feed-extractor": "^7.0.8",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/remove-markdown": "^0.3.4",
"@types/wink-pos-tagger": "^2.2.6",
"@types/xml2js": "^0.4.14",
"@xenova/transformers": "^2.11.0",
"apache-arrow": "^14.0.1",
"axios": "^1.6.2",
"cheerio": "^1.0.0-rc.12",
"chokidar": "^3.5.3",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"electron-builder-notarize": "^1.5.1",
Expand All @@ -158,11 +168,15 @@
"electron-updater": "^6.1.4",
"express": "^4.18.2",
"jsdom": "^23.0.0",
"lancedb": "^0.0.1",
"mkdirp": "^3.0.1",
"node-fetch": "^3.3.2",
"moment": "^2.29.4",
"node-fetch": "^2.6.1",
"notarytool": "^0.0.4",
"openai": "^4.20.0",
"pdfjs-dist": "^4.0.269",
"promised-sqlite3": "^2.1.0",
"remove-markdown": "^0.5.0",
"sqlite3": "^5.1.6",
"stopwords-iso": "^1.1.0",
"turndown": "^7.1.2",
Expand Down
File renamed without changes.
Binary file added src/img/tray_icon_dev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 879f0a3

Please sign in to comment.