TagSpaces is an offline, open source, document manager with tagging support
chore: updating electron, reactivating winattr
Ilian Sapundshievdda15e5ee871
diff --git a/app/package.json b/app/package.jsonindex 6631687b0..9226cbc7d 100644--- a/app/package.json+++ b/app/package.json@@ -13,8 +13,8 @@"license": "AGPL-3.0","scripts": {},"dependencies": {- "@tagspaces/extensions": "1.0.23","@tagspaces/tagspaces-ws": "1.2.1",+ "@tagspaces/extensions": "1.0.23","sharp": "^0.29.3"}}diff --git a/app/services/platform-facade.ts b/app/services/platform-facade.tsindex a3fac236f..ea2bfb624 100644--- a/app/services/platform-facade.ts+++ b/app/services/platform-facade.ts@@ -62,6 +62,7 @@ import {} from '@tagspaces/tagspaces-platforms/platform-io';import { Pro } from '../pro';import { TS } from '-/tagspaces.namespace';+import AppConfig from '-/config';let token: string;@@ -205,19 +206,34 @@ export default class PlatformFacade {return platformCreateDirectoryPromise(dirPath).then(result => {PlatformFacade.deignoreByWatcher(dirPath);- /* if (AppConfig.isWin && dirPath.endsWith("\\" + AppConfig.metaFolder)) {- // hide .ts folder on Windows- return new Promise((resolve, reject) => {- winattr.set(dirPath, { hidden: true }, (err) => {- resolve(dirPath);- if (err) {- console.warn("Error setting hidden attr. to dir: " + dirPath);- } else {- console.log("Success setting hidden attr. to dir: " + dirPath);- }- });+ if (+ process &&+ process.platform &&+ AppConfig.isWin &&+ dirPath.endsWith('\\' + AppConfig.metaFolder)+ ) {+ // hide .ts folder on Windows+ const winattr = import('winattr');+ // @ts-ignore+ winattr.set(dirPath, { hidden: true }, err => {+ if (err) {+ console.warn('Error setting hidden attr. to dir: ' + dirPath);+ } else {+ console.log('Success setting hidden attr. to dir: ' + dirPath);+ }});- } */+ // return new Promise(resolve => {+ // winattr.set(dirPath, { hidden: true }, err => {+ // resolve(dirPath);+ // if (err) {+ // console.warn('Error setting hidden attr. to dir: ' + dirPath);+ // } else {+ // console.log('Success setting hidden attr. to dir: ' + dirPath);+ // }+ // });+ // });+ return true;+ }return result;});};diff --git a/package.json b/package.jsonindex 68772cefa..4ad7ead96 100644--- a/package.json+++ b/package.json@@ -182,7 +182,7 @@"open-location-code": "^1.0.3","open-location-code-typescript": "^1.5.0","path": "^0.12.7",- "pdfjs-dist": "^2.4.456",+ "pdfjs-dist": "2.4.456","qrcode.react": "^1.0.1","rc-table": "^7.8.0","react": "^16.13.1",@@ -208,7 +208,8 @@"tiff.js": "^1.0.0","ts-react-splitter": "^2.1.1","use-state-with-callback": "^2.0.3",- "uuid": "^8.3.2"+ "uuid": "^8.3.2",+ "winattr": "^3.0.0"},"devDependencies": {"@babel/core": "^7.16.0",@@ -274,7 +275,7 @@"current-git-branch": "^1.1.0","detect-port": "^1.3.0","devtron": "^1.4.0",- "electron": "17.1.2",+ "electron": "17.4.3","electron-builder": "^22.14.7","electron-devtools-installer": "^3.2.0","electron-notarize": "^1.2.1",diff --git a/yarn.lock b/yarn.lockindex 4dc3a0111..547502547 100644--- a/yarn.lock+++ b/yarn.lock@@ -9034,6 +9034,14 @@ electron-localshortcut@^3.1.0:keyboardevent-from-electron-accelerator "^2.0.0"keyboardevents-areequal "^0.2.1"+electron-notarize@^1.2.1:+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.1.tgz#347c18eca8e29dddadadee511b870c13d4008baf"+ integrity sha512-u/ECWhIrhkSQpZM4cJzVZ5TsmkaqrRo5LDC/KMbGF0sPkm53Ng59+M0zp8QVaql0obfJy9vlVT+4iOkAi2UDlA==+ dependencies:+ debug "^4.1.1"+ fs-extra "^9.0.1"+electron-osx-sign@^0.5.0:version "0.5.0"resolved "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"@@ -9077,10 +9085,10 @@ electron-window-state@^5.0.3:jsonfile "^4.0.0"mkdirp "^0.5.1"- version "17.1.2"- resolved "https://registry.yarnpkg.com/electron/-/electron-17.1.2.tgz#b4e4a0df883d9a9854cf865efa2bb00b12d55b1d"- integrity sha512-hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ==+ version "17.4.3"+ resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.3.tgz#5f3c26cb211f9267d2becee717f34e3ce564a6bf"+ integrity sha512-WQggyCgNUOzoOn+wJKe+xFhYy56gyrn/jIa/l7dyD3TxPb8lddSc86OAqPnP5EugcNXQ0yIu8b+SIE8duKozSw==dependencies:"@electron/get" "^1.13.0""@types/node" "^14.6.2"@@ -10461,6 +10469,11 @@ fsevents@^2.1.2, fsevents@~2.3.1, fsevents@~2.3.2:resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==+fswin@^3.18.918:+ version "3.22.106"+ resolved "https://registry.yarnpkg.com/fswin/-/fswin-3.22.106.tgz#16724074a63e0bca193c89d311cec56a59f15f1d"+ integrity sha512-j/fa7L2fiwEZkyLHRVecd2d5iZAvFUIS8VcvqaSN1SQe5WlL9xfQT4wZFUl8YafH9vTGZlNohJyI3p/Hrtu1WQ==+function-bind@^1.1.1:version "1.1.1"resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"@@ -15991,9 +16004,9 @@ pbkdf2@^3.0.3:safe-buffer "^5.0.1"sha.js "^2.4.8"-pdfjs-dist@^2.4.456:version "2.4.456"- resolved "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.4.456.tgz"+ resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.4.456.tgz#0eaad2906cda866bbb393e79a0e5b4e68bd75520"integrity sha512-yckJEHq3F48hcp6wStEpbN9McOj328Ib09UrBlGAKxvN2k+qYPN5iq6TH6jD1C0pso7zTep+g/CKsYgdrQd5QA==pend@~1.2.0:@@ -21030,6 +21043,13 @@ wildcard@^2.0.0:resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==+winattr@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/winattr/-/winattr-3.0.0.tgz#33e430c41510ce4018a0daaabb24927c162f1b1d"+ integrity sha512-dt33rYsTYcGbB+I1ubB6ZLODibRSCW//TgY/SuajLllR9kHnHnbUMqnXIe0osYsXUdRLGs770zb3t9z/ScGUpw==+ dependencies:+ fswin "^3.18.918"+word-wrap@~1.2.3:version "1.2.3"resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"