Skip to content

TagSpaces is an offline, open source, document manager with tagging support

update electron v32 (#2153)

Stanimir0b24fe878f04
diff --git a/.erb/configs/webpack.config.main.dev.ts b/.erb/configs/webpack.config.main.dev.ts
new file mode 100644
index 000000000..94e0e02e2
--- /dev/null
+++ b/.erb/configs/webpack.config.main.dev.ts
@@ -0,0 +1,78 @@
+/**
+ * Webpack config for development electron main process
+ */
+
+import path from 'path';
+import webpack from 'webpack';
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import { merge } from 'webpack-merge';
+import checkNodeEnv from '../scripts/check-node-env';
+import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
+
+// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
+// at the dev webpack config is not accidentally run in a production environment
+if (process.env.NODE_ENV === 'production') {
+ checkNodeEnv('development');
+}
+
+const configuration: webpack.Configuration = {
+ devtool: 'inline-source-map',
+
+ mode: 'development',
+
+ target: 'electron-main',
+
+ entry: {
+ main: path.join(webpackPaths.srcMainPath, 'main.ts'),
+ preload: path.join(webpackPaths.srcMainPath, 'preload.ts'),
+ },
+
+ output: {
+ path: webpackPaths.dllPath,
+ filename: '[name].bundle.dev.js',
+ library: {
+ type: 'umd',
+ },
+ },
+
+ plugins: [
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ new BundleAnalyzerPlugin({
+ analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
+ analyzerPort: 8888,
+ }),
+
+ /**
+ * Create global constants which can be configured at compile time.
+ *
+ * Useful for allowing different behaviour between development builds and
+ * release builds
+ *
+ * NODE_ENV should be production so that modules do not perform certain
+ * development checks
+ */
+ new webpack.EnvironmentPlugin({
+ NODE_ENV: 'development',
+ DEBUG_PROD: false,
+ START_MINIMIZED: false,
+ }),
+
+ new webpack.DefinePlugin({
+ 'process.type': '"browser"',
+ }),
+ ],
+
+ /**
+ * Disables webpack processing of __dirname and __filename.
+ * If you run the bundle in node.js it falls back to these values of node.js.
+ * https://github.com/webpack/webpack/issues/2010
+ */
+ node: {
+ __dirname: false,
+ __filename: false,
+ },
+};
+
+export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.paths.ts b/.erb/configs/webpack.paths.ts
index e5ba57343..5242a26ad 100644
--- a/.erb/configs/webpack.paths.ts
+++ b/.erb/configs/webpack.paths.ts
@@ -2,6 +2,9 @@ const path = require('path');
const rootPath = path.join(__dirname, '../..');
+const erbPath = path.join(__dirname, '..');
+const erbNodeModulesPath = path.join(erbPath, 'node_modules');
+
const dllPath = path.join(__dirname, '../dll');
const srcPath = path.join(rootPath, 'src');
@@ -22,6 +25,8 @@ const buildPath = path.join(releasePath, 'build');
export default {
rootPath,
+ erbPath,
+ erbNodeModulesPath,
dllPath,
srcPath,
srcMainPath,
diff --git a/.erb/scripts/link-modules.ts b/.erb/scripts/link-modules.ts
index 10cda3608..318182ff3 100644
--- a/.erb/scripts/link-modules.ts
+++ b/.erb/scripts/link-modules.ts
@@ -2,8 +2,15 @@ import fs from 'fs';
import webpackPaths from '../configs/webpack.paths';
import path from 'path';
-const { srcNodeModulesPath, appNodeModulesPath, appPath, srcPath, distPath } =
- webpackPaths;
+const {
+ srcNodeModulesPath,
+ appNodeModulesPath,
+ erbPath,
+ erbNodeModulesPath,
+ appPath,
+ srcPath,
+ distPath,
+} = webpackPaths;
try {
if (fs.existsSync(srcNodeModulesPath)) {
@@ -16,6 +23,10 @@ if (fs.existsSync(appNodeModulesPath)) {
fs.symlinkSync(appNodeModulesPath, srcNodeModulesPath, 'junction');
}
+if (!fs.existsSync(erbNodeModulesPath) && fs.existsSync(appNodeModulesPath)) {
+ fs.symlinkSync(appNodeModulesPath, erbNodeModulesPath, 'junction');
+}
+
const targetNodeModules = path.join(distPath, 'node_modules');
try {
if (fs.existsSync(targetNodeModules)) {
@@ -35,7 +46,7 @@ if (fs.existsSync(appNodeModulesPath)) {
}
////////link .env
-const targetEnv = path.join(srcPath, '.env');
+const targetEnv = path.join(erbPath, '.env'); //srcPath, '.env');
const appEnv = path.join(appPath, '.env');
try {
diff --git a/.prettierignore b/.prettierignore
index 24023f45f..73f2e7abc 100755
--- a/.prettierignore
+++ b/.prettierignore
@@ -19,6 +19,7 @@ tests/testdata
tests/testdata-tmp
tests/file-structure
tests/bin
+test-results
.ycache
src/renderer/aws-exports.js
src/main/config/config.json
diff --git a/package-lock.json b/package-lock.json
index 17823711e..1938308c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,10 +19,10 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.5.2",
- "@tagspaces/tagspaces-common-aws3": "4.5.5",
- "@tagspaces/tagspaces-common-cordova": "4.5.2",
- "@tagspaces/tagspaces-indexer": "4.5.2",
+ "@tagspaces/tagspaces-common": "4.5.15",
+ "@tagspaces/tagspaces-common-aws3": "4.5.15",
+ "@tagspaces/tagspaces-common-cordova": "4.5.15",
+ "@tagspaces/tagspaces-indexer": "4.5.15",
"@tagspaces/tagspaces-md": "4.5.14",
"aws-amplify": "^4.3.8",
"classnames": "^2.3.1",
@@ -90,8 +90,8 @@
"devDependencies": {
"@electron/notarize": "^2.3.2",
"@electron/rebuild": "^3.3.0",
- "@playwright/test": "1.38.1",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+ "@playwright/test": "1.46.1",
+ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@svgr/webpack": "^8.1.0",
"@teamsupercell/typings-for-css-modules-loader": "^2.5.2",
"@testing-library/jest-dom": "^6.1.3",
@@ -123,10 +123,10 @@
"current-git-branch": "^1.1.0",
"detect-port": "^1.5.1",
"dotenv-webpack": "^8.0.1",
- "electron": "^27.3.11",
+ "electron": "^32.0.0",
"electron-builder": "^24.13.3",
"electron-devtools-installer": "^3.2.0",
- "electronmon": "^2.0.2",
+ "electronmon": "^2.0.3",
"eslint": "^8.49.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-base": "^15.0.0",
@@ -162,7 +162,7 @@
"lint-staged": "^8.1.0",
"mini-css-extract-plugin": "^2.7.6",
"npm": "^8.5.5",
- "playwright": "1.38.1",
+ "playwright": "1.46.1",
"prettier": "^3.2.5",
"properties-reader": "^2.2.0",
"raw-loader": "^4.0.2",
@@ -14589,18 +14589,18 @@
}
},
"node_modules/@playwright/test": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",
- "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==",
+ "version": "1.46.1",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
+ "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
"dev": true,
"dependencies": {
- "playwright": "1.38.1"
+ "playwright": "1.46.1"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
- "node": ">=16"
+ "node": ">=18"
}
},
"node_modules/@pmmmwh/react-refresh-webpack-plugin": {
@@ -15534,30 +15534,30 @@
}
},
"node_modules/@react-native/assets-registry": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.75.1.tgz",
- "integrity": "sha512-mrW6dvueJgP5v5mR/dxvW9v+t9AmzR5OMDMq94reT04QarREGGDHEOW5sLzj4uT6Xhqtda2+ZQOaEZ6PPcv+QA==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.75.2.tgz",
+ "integrity": "sha512-P1dLHjpUeC0AIkDHRYcx0qLMr+p92IPWL3pmczzo6T76Qa9XzruQOYy0jittxyBK91Csn6HHQ/eit8TeXW8MVw==",
"peer": true,
"engines": {
"node": ">=18"
}
},
"node_modules/@react-native/babel-plugin-codegen": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.75.1.tgz",
- "integrity": "sha512-M7CxPAYZVDeBCCyC4BToEf6vPFtZ5EAA5F2fcm0RuErWMNiB2ycD7nCSVpZtQXOxgNItNi+7mRFTLKTNb7AFrQ==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.75.2.tgz",
+ "integrity": "sha512-BIKVh2ZJPkzluUGgCNgpoh6NTHgX8j04FCS0Z/rTmRJ66hir/EUBl8frMFKrOy/6i4VvZEltOWB5eWfHe1AYgw==",
"peer": true,
"dependencies": {
- "@react-native/codegen": "0.75.1"
+ "@react-native/codegen": "0.75.2"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@react-native/babel-preset": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.75.1.tgz",
- "integrity": "sha512-u5+7PCkz9J5XKhUwDSJCxLyt49L9qirlBvOR8IwztWVhrf+gd/iIgQLZm9vf/j9tfLhEsgvMup6FMha2/u1cQw==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.75.2.tgz",
+ "integrity": "sha512-mprpsas+WdCEMjQZnbDiAC4KKRmmLbMB+o/v4mDqKlH4Mcm7RdtP5t80MZGOVCHlceNp1uEIpXywx69DNwgbgg==",
"peer": true,
"dependencies": {
"@babel/core": "^7.20.0",
@@ -15602,7 +15602,7 @@
"@babel/plugin-transform-typescript": "^7.5.0",
"@babel/plugin-transform-unicode-regex": "^7.0.0",
"@babel/template": "^7.0.0",
- "@react-native/babel-plugin-codegen": "0.75.1",
+ "@react-native/babel-plugin-codegen": "0.75.2",
"babel-plugin-transform-flow-enums": "^0.0.2",
"react-refresh": "^0.14.0"
},
@@ -15614,9 +15614,9 @@
}
},
"node_modules/@react-native/codegen": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.75.1.tgz",
- "integrity": "sha512-nO5CQuXTPL8iou9EzkUjOrGsiano3hGC80AwFlFt8h7q8Bked293YaB3qRQRwN4gmedR8ZKVZGI/pyuvuOWLfQ==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.75.2.tgz",
+ "integrity": "sha512-OkWdbtO2jTkfOXfj3ibIL27rM6LoaEuApOByU2G8X+HS6v9U87uJVJlMIRWBDmnxODzazuHwNVA2/wAmSbucaw==",
"peer": true,
"dependencies": {
"@babel/parser": "^7.20.0",
@@ -15625,7 +15625,8 @@
"invariant": "^2.2.4",
"jscodeshift": "^0.14.0",
"mkdirp": "^0.5.1",
- "nullthrows": "^1.1.1"
+ "nullthrows": "^1.1.1",
+ "yargs": "^17.6.2"
},
"engines": {
"node": ">=18"
@@ -15635,15 +15636,15 @@
}
},
"node_modules/@react-native/community-cli-plugin": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.75.1.tgz",
- "integrity": "sha512-G0GPvFAVrC9k0MfwnKXimaYKqOlEzXFMZ6DmZi2zxSGPFt/MV3sSRjbv3yb8q0mLcK78/J7w1DyImcSQopOCLg==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.75.2.tgz",
+ "integrity": "sha512-/tz0bzVja4FU0aAimzzQ7iYR43peaD6pzksArdrrGhlm8OvFYAQPOYSNeIQVMSarwnkNeg1naFKaeYf1o3++yA==",
"peer": true,
"dependencies": {
"@react-native-community/cli-server-api": "14.0.0-alpha.11",
"@react-native-community/cli-tools": "14.0.0-alpha.11",
- "@react-native/dev-middleware": "0.75.1",
- "@react-native/metro-babel-transformer": "0.75.1",
+ "@react-native/dev-middleware": "0.75.2",
+ "@react-native/metro-babel-transformer": "0.75.2",
"chalk": "^4.0.0",
"execa": "^5.1.1",
"metro": "^0.80.3",
@@ -15840,22 +15841,22 @@
}
},
"node_modules/@react-native/debugger-frontend": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/debugger-frontend/-/debugger-frontend-0.75.1.tgz",
- "integrity": "sha512-N+awwEYZHj9lR4hieBK2oFB6C0qa4/6NPpzeqvtLnZddr38H6Wv9CHxSFA8pqIBu4qmn4JcRjOjVD6pXCcLohA==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/debugger-frontend/-/debugger-frontend-0.75.2.tgz",
+ "integrity": "sha512-qIC6mrlG8RQOPaYLZQiJwqnPchAVGnHWcVDeQxPMPLkM/D5+PC8tuKWYOwgLcEau3RZlgz7QQNk31Qj2/OJG6Q==",
"peer": true,
"engines": {
"node": ">=18"
}
},
"node_modules/@react-native/dev-middleware": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/dev-middleware/-/dev-middleware-0.75.1.tgz",
- "integrity": "sha512-2vBIqNe5p/j3ZfDtV3R74OlwoGTgJVDhx9bMIK1U8ODqic+8OVjqvQKGNB+KUb/+HiPkKAhpAIsgcEmL/Nq1sg==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/dev-middleware/-/dev-middleware-0.75.2.tgz",
+ "integrity": "sha512-fTC5m2uVjYp1XPaIJBFgscnQjPdGVsl96z/RfLgXDq0HBffyqbg29ttx6yTCx7lIa9Gdvf6nKQom+e+Oa4izSw==",
"peer": true,
"dependencies": {
"@isaacs/ttlcache": "^1.4.1",
- "@react-native/debugger-frontend": "0.75.1",
+ "@react-native/debugger-frontend": "0.75.2",
"chrome-launcher": "^0.15.2",
"chromium-edge-launcher": "^0.2.0",
"connect": "^3.6.5",
@@ -15912,31 +15913,31 @@
}
},
"node_modules/@react-native/gradle-plugin": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.75.1.tgz",
- "integrity": "sha512-a2gVjX3MB9TF9QZSKje79n1GDAnseTU94VIcFH/4DS3KjbK3yrNXsu1maxGZxDUAKmTUH7Rz4An/Rb5nkZG7dw==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.75.2.tgz",
+ "integrity": "sha512-AELeAOCZi3B2vE6SeN+mjpZjjqzqa76yfFBB3L3f3NWiu4dm/YClTGOj+5IVRRgbt8LDuRImhDoaj7ukheXr4Q==",
"peer": true,
"engines": {
"node": ">=18"
}
},
"node_modules/@react-native/js-polyfills": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.75.1.tgz",
- "integrity": "sha512-7yUCDtsNaIoOefI3M1XiqUaxNQIzNYL0P38IE6JuroVZspPaGmwB34RkgBTuDzNQ+p/4EIgBmqRzqF5Jjlf92A==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.75.2.tgz",
+ "integrity": "sha512-AtLd3mbiE+FXK2Ru3l2NFOXDhUvzdUsCP4qspUw0haVaO/9xzV97RVD2zz0lur2f/LmZqQ2+KXyYzr7048b5iw==",
"peer": true,
"engines": {
"node": ">=18"
}
},
"node_modules/@react-native/metro-babel-transformer": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.75.1.tgz",
- "integrity": "sha512-X4NZNWox2E97fJG97XNuTd9wU3FK2c+S/Neg7KsBETPOHUkdoORC3nH1VQRrIqID85yYgdxLxvDwXa9hkmzjuA==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.75.2.tgz",
+ "integrity": "sha512-EygglCCuOub2sZ00CSIiEekCXoGL2XbOC6ssOB47M55QKvhdPG/0WBQXvmOmiN42uZgJK99Lj749v4rB0PlPIQ==",
"peer": true,
"dependencies": {
"@babel/core": "^7.20.0",
- "@react-native/babel-preset": "0.75.1",
+ "@react-native/babel-preset": "0.75.2",
"hermes-parser": "0.22.0",
"nullthrows": "^1.1.1"
},
@@ -15948,15 +15949,15 @@
}
},
"node_modules/@react-native/normalize-colors": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.75.1.tgz",
- "integrity": "sha512-TnUII4YFtPBzxA0Eu1RvXrauw+fZlixK6QgbuOZSfhEfgM1ri6O1wse3VaR+h1CJw2NlNjgi902x9uUX8HbH8w==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.75.2.tgz",
+ "integrity": "sha512-nPwWJFtsqNFS/qSG9yDOiSJ64mjG7RCP4X/HXFfyWzCM1jq49h/DYBdr+c3e7AvTKGIdy0gGT3vgaRUHZFVdUQ==",
"peer": true
},
"node_modules/@react-native/virtualized-lists": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.75.1.tgz",
- "integrity": "sha512-e7XL9XtU2Z9NUFJFwL9StHa9l2La0/fU7wZ05s8YEMxB+7Fgyn7/X4JsIk7G4xTSPXxPKV2Yz9STHGzKT5OcKQ==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.75.2.tgz",
+ "integrity": "sha512-pD5SVCjxc8k+JdoyQ+IlulBTEqJc3S4KUKsmv5zqbNCyETB0ZUvd4Su7bp+lLF6ALxx6KKmbGk8E3LaWEjUFFQ==",
"peer": true,
"dependencies": {
"invariant": "^2.2.4",
@@ -17130,9 +17131,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.2.tgz",
- "integrity": "sha512-ZYpuo6YvLH+wC5YpYIa7jSsQ6wM64awA91vevsuEecqDRSCIbdKe+XdhFpbl6R8+NRMLo3+65HhirSHQZVRsRw==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.15.tgz",
+ "integrity": "sha512-v3CYMUNpR3Xs4+7m3dEiJ0RrdUsonlhDlx8H9Iz9yNpnKbCzvVsoDG62aR19/B9YfL/JbG455EMTGm+dSjnChg==",
"dependencies": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -17140,23 +17141,23 @@
}
},
"node_modules/@tagspaces/tagspaces-common-aws3": {
- "version": "4.5.5",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.5.tgz",
- "integrity": "sha512-sWiyyd0fHwjP7tlIGsrm1Vqr5MxXokM7MESg0vsuFanrC82vuNRsi2CYc37DxxsNbC/0BnT9PSYsw11+fw6AWA==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.15.tgz",
+ "integrity": "sha512-jHf/81nA8VFhsQUh/LCx231lltdWAvGmsmzRCvP31rsJAFJTQBDUiIDn9N+vLebDe/HofOlv9bGVCB8vpG11Tw==",
"dependencies": {
"@aws-sdk/client-s3": "^3.624.0",
"@aws-sdk/lib-storage": "^3.624.0",
"@aws-sdk/s3-request-presigner": "^3.624.0",
- "@tagspaces/tagspaces-common": "^4.5.2",
+ "@tagspaces/tagspaces-common": "^4.5.15",
"crypto-js": "^4.2.0"
}
},
"node_modules/@tagspaces/tagspaces-common-cordova": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.2.tgz",
- "integrity": "sha512-Fn3NJ8ex+KxHXA8+kZKerDIN3J0lOfb9VOFaPJvGUYSJRZlzn+ols4jzGyBbnZa7Zh2u9yyNaDcdI4xFQNQT9g==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.15.tgz",
+ "integrity": "sha512-s1KqNx7AbK2UpDWxWVro7uX1l1JkEIYgB3Zs8QxJEe4nImgEH9CxZoWw0cPA/YARLudGDvF5EZzXC7DKUTQPvg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.2"
+ "@tagspaces/tagspaces-common": "^4.5.15"
}
},
"node_modules/@tagspaces/tagspaces-common/node_modules/uuid": {
@@ -17168,11 +17169,11 @@
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.2.tgz",
- "integrity": "sha512-Ll386DuzVm/5O9ycGM1UgN+f/GWf0SSTEm2KUhfOgf3rRfKO8vnThFKmsmWRz8+xajRHSsPT5Tj6OPgf8bZDtQ==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.15.tgz",
+ "integrity": "sha512-Dvnn8Wc5znSEfhMYmn2VBavruV+ev8qN/be0e+b4LuarCn04rFw6UENrvf2zOvZTBvdMMyNqq/X5ZoIQuEYMhw==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.2"
+ "@tagspaces/tagspaces-common": "^4.5.15"
}
},
"node_modules/@tagspaces/tagspaces-md": {
@@ -19785,9 +19786,9 @@
}
},
"node_modules/async": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
- "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
"dev": true
},
"node_modules/async-exit-hook": {
@@ -22112,9 +22113,9 @@
}
},
"node_modules/core-js": {
- "version": "3.38.0",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.0.tgz",
- "integrity": "sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug==",
+ "version": "3.38.1",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+ "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
"dev": true,
"hasInstallScript": true,
"funding": {
@@ -22123,9 +22124,9 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.38.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.0.tgz",
- "integrity": "sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==",
+ "version": "3.38.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+ "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
"dependencies": {
"browserslist": "^4.23.3"
},
@@ -22135,9 +22136,9 @@
}
},
"node_modules/core-js-pure": {
- "version": "3.38.0",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.38.0.tgz",
- "integrity": "sha512-8balb/HAXo06aHP58mZMtXgD8vcnXz9tUDePgqBgJgKdmTlMt+jw3ujqniuBDQXMvTzxnMpxHFeuSM3g1jWQuQ==",
+ "version": "3.38.1",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.38.1.tgz",
+ "integrity": "sha512-BY8Etc1FZqdw1glX0XNOq2FDwfrg/VGqoZOZCdaL+UmdaqDwQwYXkMJT4t6In+zfEfOJDcM9T0KdbBeJg8KKCQ==",
"dev": true,
"hasInstallScript": true,
"funding": {
@@ -24081,14 +24082,14 @@
}
},
"node_modules/electron": {
- "version": "27.3.11",
- "resolved": "https://registry.npmjs.org/electron/-/electron-27.3.11.tgz",
- "integrity": "sha512-E1SiyEoI8iW5LW/MigCr7tJuQe7+0105UjqY7FkmCD12e2O6vtUbQ0j05HaBh2YgvkcEVgvQ2A8suIq5b5m6Gw==",
+ "version": "32.0.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.0.tgz",
+ "integrity": "sha512-rs+VkhztJd2LvRX7d3ikKH+EIHMW4vKM2l5qp7Dx/dLQAKKz3IFNKyYhYzczDnqO+/jUvx0ic0SQvqpv1/ZAsw==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
"@electron/get": "^2.0.0",
- "@types/node": "^18.11.18",
+ "@types/node": "^20.9.0",
"extract-zip": "^2.0.1"
},
"bin": {
@@ -24256,9 +24257,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.5.11",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.11.tgz",
- "integrity": "sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew=="
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz",
+ "integrity": "sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA=="
},
"node_modules/electron-updater": {
"version": "6.2.1",
@@ -24288,12 +24289,12 @@
}
},
"node_modules/electron/node_modules/@types/node": {
- "version": "18.19.45",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.45.tgz",
- "integrity": "sha512-VZxPKNNhjKmaC1SUYowuXSRSMGyQGmQjvvA1xE4QZ0xce2kLtEhPDS+kqpCPBZYgqblCLQ2DAjSzmgCM5auvhA==",
+ "version": "20.16.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz",
+ "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==",
"dev": true,
"dependencies": {
- "undici-types": "~5.26.4"
+ "undici-types": "~6.19.2"
}
},
"node_modules/electronmon": {
@@ -39575,9 +39576,9 @@
}
},
"node_modules/mini-css-extract-plugin": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
- "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz",
+ "integrity": "sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==",
"dev": true,
"dependencies": {
"schema-utils": "^4.0.0",
@@ -44101,33 +44102,33 @@
}
},
"node_modules/playwright": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",
- "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==",
+ "version": "1.46.1",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
+ "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
"dev": true,
"dependencies": {
- "playwright-core": "1.38.1"
+ "playwright-core": "1.46.1"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
- "node": ">=16"
+ "node": ">=18"
},
"optionalDependencies": {
"fsevents": "2.3.2"
}
},
"node_modules/playwright-core": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",
- "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==",
+ "version": "1.46.1",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
+ "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==",
"dev": true,
"bin": {
"playwright-core": "cli.js"
},
"engines": {
- "node": ">=16"
+ "node": ">=18"
}
},
"node_modules/playwright/node_modules/fsevents": {
@@ -45122,9 +45123,9 @@
}
},
"node_modules/prosemirror-view": {
- "version": "1.33.10",
- "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.33.10.tgz",
- "integrity": "sha512-wsKg9JeQkWlkXG8DDcloI/tbB9r3CysziubigoC8wTuE6zobN/9cl8bGRk1J1XjkUp7rxGBziOSxrhoILL84hg==",
+ "version": "1.33.11",
+ "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.33.11.tgz",
+ "integrity": "sha512-K0z9oMf6EI2ZifS9yW8PUPjEw2o1ZoFAaNzvcuyfcjIzsU6pJMo3tk9r26MyzEsuGHXZwmKPEmrjgFd78biTGA==",
"dependencies": {
"prosemirror-model": "^1.20.0",
"prosemirror-state": "^1.0.0",
@@ -45892,22 +45893,22 @@
}
},
"node_modules/react-native": {
- "version": "0.75.1",
- "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.75.1.tgz",
- "integrity": "sha512-6WGjZdqXLEuBWAP+h2WH5a2Nd9jn7KmQ1GYy0Krzkcfvz9vPtKKIUSEjwvi3q+M0UTu3V/ESBaMDfT/GGr3fkg==",
+ "version": "0.75.2",
+ "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.75.2.tgz",
+ "integrity": "sha512-pP+Yswd/EurzAlKizytRrid9LJaPJzuNldc+o5t01md2VLHym8V7FWH2z9omFKtFTer8ERg0fAhG1fpd0Qq6bQ==",
"peer": true,
"dependencies": {
"@jest/create-cache-key-function": "^29.6.3",
"@react-native-community/cli": "14.0.0",
"@react-native-community/cli-platform-android": "14.0.0",
"@react-native-community/cli-platform-ios": "14.0.0",
- "@react-native/assets-registry": "0.75.1",
- "@react-native/codegen": "0.75.1",
- "@react-native/community-cli-plugin": "0.75.1",
- "@react-native/gradle-plugin": "0.75.1",
- "@react-native/js-polyfills": "0.75.1",
- "@react-native/normalize-colors": "0.75.1",
- "@react-native/virtualized-lists": "0.75.1",
+ "@react-native/assets-registry": "0.75.2",
+ "@react-native/codegen": "0.75.2",
+ "@react-native/community-cli-plugin": "0.75.2",
+ "@react-native/gradle-plugin": "0.75.2",
+ "@react-native/js-polyfills": "0.75.2",
+ "@react-native/normalize-colors": "0.75.2",
+ "@react-native/virtualized-lists": "0.75.2",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
@@ -51225,9 +51226,9 @@
}
},
"node_modules/undici-types": {
- "version": "5.26.5",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
- "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+ "version": "6.19.8",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
"dev": true
},
"node_modules/unfetch": {
diff --git a/package.json b/package.json
index 4053efe08..99f81f127 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"email": "[email protected]",
"url": "https://www.tagspaces.org"
},
- "main": "./src/main/main.ts",
+ "main": "./.erb/dll/main.bundle.dev.js",
"scripts": {
"browserslist:update": "npx browserslist@latest --update-db",
"bs": "npm run build && npm run run-electron",
@@ -126,9 +126,10 @@
"source-map-app": "npx source-map-explorer src/renderer/dist/*.* --html reports/source-map-app.html",
"source-map-cordova": "npx source-map-explorer cordova/www/dist/*.* --html reports/source-map-cordova.html",
"source-map-web": "npx source-map-explorer web/dist/*.* --html reports/source-map-web.html",
- "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
+ "prestart": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.dev.ts",
+ "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run prestart && npm run start:renderer",
+ "start:main": "concurrently -k \"cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --watch --config ./.erb/configs/webpack.config.main.dev.ts\" \"electronmon .\"",
"start-main-debug": "npm run dev --inspect=5858 --remote-debugging-port=9223",
- "start:main": "cross-env NODE_ENV=development electronmon -r ts-node/register/transpile-only .",
"start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.preload.dev.ts",
"start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
"test": "jest",
@@ -165,10 +166,10 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.5.2",
- "@tagspaces/tagspaces-common-aws3": "4.5.5",
- "@tagspaces/tagspaces-common-cordova": "4.5.2",
- "@tagspaces/tagspaces-indexer": "4.5.2",
+ "@tagspaces/tagspaces-common": "4.5.15",
+ "@tagspaces/tagspaces-common-aws3": "4.5.15",
+ "@tagspaces/tagspaces-common-cordova": "4.5.15",
+ "@tagspaces/tagspaces-indexer": "4.5.15",
"@tagspaces/tagspaces-md": "4.5.14",
"aws-amplify": "^4.3.8",
"classnames": "^2.3.1",
@@ -239,8 +240,8 @@
"devDependencies": {
"@electron/notarize": "^2.3.2",
"@electron/rebuild": "^3.3.0",
- "@playwright/test": "1.38.1",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+ "@playwright/test": "1.46.1",
+ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@svgr/webpack": "^8.1.0",
"@teamsupercell/typings-for-css-modules-loader": "^2.5.2",
"@testing-library/jest-dom": "^6.1.3",
@@ -272,10 +273,10 @@
"current-git-branch": "^1.1.0",
"detect-port": "^1.5.1",
"dotenv-webpack": "^8.0.1",
- "electron": "^27.3.11",
+ "electron": "^32.0.0",
"electron-builder": "^24.13.3",
"electron-devtools-installer": "^3.2.0",
- "electronmon": "^2.0.2",
+ "electronmon": "^2.0.3",
"eslint": "^8.49.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-base": "^15.0.0",
@@ -311,7 +312,7 @@
"lint-staged": "^8.1.0",
"mini-css-extract-plugin": "^2.7.6",
"npm": "^8.5.5",
- "playwright": "1.38.1",
+ "playwright": "1.46.1",
"prettier": "^3.2.5",
"properties-reader": "^2.2.0",
"raw-loader": "^4.0.2",
@@ -353,7 +354,8 @@
"electronmon": {
"patterns": [
"!**/**",
- "src/main/**"
+ "src/main/**",
+ ".erb/dll/**"
],
"logLevel": "quiet"
}
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 1d2f41e3f..eae427a76 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -12,8 +12,8 @@
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.127",
- "@tagspaces/tagspaces-common-node": "4.5.2",
- "@tagspaces/tagspaces-ws": "4.5.2",
+ "@tagspaces/tagspaces-common-node": "4.5.15",
+ "@tagspaces/tagspaces-ws": "4.5.15",
"sharp": "0.32.6",
"ws": "8.16.0"
},
@@ -43,9 +43,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.2.tgz",
- "integrity": "sha512-ZYpuo6YvLH+wC5YpYIa7jSsQ6wM64awA91vevsuEecqDRSCIbdKe+XdhFpbl6R8+NRMLo3+65HhirSHQZVRsRw==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.15.tgz",
+ "integrity": "sha512-v3CYMUNpR3Xs4+7m3dEiJ0RrdUsonlhDlx8H9Iz9yNpnKbCzvVsoDG62aR19/B9YfL/JbG455EMTGm+dSjnChg==",
"dependencies": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -53,11 +53,11 @@
}
},
"node_modules/@tagspaces/tagspaces-common-node": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.2.tgz",
- "integrity": "sha512-ZdqCxPcoeOj2NLv1p3aNgltddZQ/MQsZOM3ltTDSPPb0tD64wic0ZF5789AU4kMPp2DKHn98wdW2BOwnnwLPZQ==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.15.tgz",
+ "integrity": "sha512-meMVdY/8tjpF2vcHMt7qnyJt0oUQGMBLTGqUmqxykLMFKqhv+d3L0LdOh+BOCHhtd44f+348WCZQzqy0gns3Xg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.2",
+ "@tagspaces/tagspaces-common": "^4.5.15",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0",
@@ -74,22 +74,22 @@
}
},
"node_modules/@tagspaces/tagspaces-workers": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.2.tgz",
- "integrity": "sha512-AiEBHtTlordnZ2VSHkLIwx13Uh26CqYA2TrQqE4k+P6kCy7o2W3I18TfaiRa8fVM/BE9cKtntP0RwWiTntzBAw==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.15.tgz",
+ "integrity": "sha512-MAoAFHxVKhM+YQ/Wj6cjVURZj/RLgIfY8LDGMTvS4P/+kk5wGLTtUAX0c1Hs3Lb/Kw0MMFHNMpWYW8AK2LcfXg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.5.2",
- "@tagspaces/tagspaces-common-node": "^4.5.2",
+ "@tagspaces/tagspaces-common": "^4.5.15",
+ "@tagspaces/tagspaces-common-node": "^4.5.15",
"@tagspaces/tagspaces-thumbgen-image": "^4.2.3",
"fswin": "^3.24.524"
}
},
"node_modules/@tagspaces/tagspaces-ws": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.2.tgz",
- "integrity": "sha512-QoZYNEj13LlXLiw6Fu9y4zHtJ2TEVhi7hT6Q9o1T90qkELI9UKWjdgx4uskNT3WdKNbPxzHbiYBsMBw6B5WhLg==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.15.tgz",
+ "integrity": "sha512-XbwKe5Qpy4kAFPSiqJsEBO/BGcACfBOu4aZPRWXEVX3SfD9qtwpLwf/CHLXhaG+BTSwbuiiUCulvTvzFeNsChw==",
"dependencies": {
- "@tagspaces/tagspaces-workers": "^4.5.2",
+ "@tagspaces/tagspaces-workers": "^4.5.15",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^8.5.1",
"ws": "^8.15.1"
@@ -125,9 +125,9 @@
}
},
"node_modules/async": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
- "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
},
"node_modules/b4a": {
"version": "1.6.6",
@@ -1131,9 +1131,9 @@
}
},
"@tagspaces/tagspaces-common": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.2.tgz",
- "integrity": "sha512-ZYpuo6YvLH+wC5YpYIa7jSsQ6wM64awA91vevsuEecqDRSCIbdKe+XdhFpbl6R8+NRMLo3+65HhirSHQZVRsRw==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.15.tgz",
+ "integrity": "sha512-v3CYMUNpR3Xs4+7m3dEiJ0RrdUsonlhDlx8H9Iz9yNpnKbCzvVsoDG62aR19/B9YfL/JbG455EMTGm+dSjnChg==",
"requires": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -1141,11 +1141,11 @@
}
},
"@tagspaces/tagspaces-common-node": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.2.tgz",
- "integrity": "sha512-ZdqCxPcoeOj2NLv1p3aNgltddZQ/MQsZOM3ltTDSPPb0tD64wic0ZF5789AU4kMPp2DKHn98wdW2BOwnnwLPZQ==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.15.tgz",
+ "integrity": "sha512-meMVdY/8tjpF2vcHMt7qnyJt0oUQGMBLTGqUmqxykLMFKqhv+d3L0LdOh+BOCHhtd44f+348WCZQzqy0gns3Xg==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.2",
+ "@tagspaces/tagspaces-common": "^4.5.15",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0",
@@ -1162,22 +1162,22 @@
}
},
"@tagspaces/tagspaces-workers": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.2.tgz",
- "integrity": "sha512-AiEBHtTlordnZ2VSHkLIwx13Uh26CqYA2TrQqE4k+P6kCy7o2W3I18TfaiRa8fVM/BE9cKtntP0RwWiTntzBAw==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.15.tgz",
+ "integrity": "sha512-MAoAFHxVKhM+YQ/Wj6cjVURZj/RLgIfY8LDGMTvS4P/+kk5wGLTtUAX0c1Hs3Lb/Kw0MMFHNMpWYW8AK2LcfXg==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.5.2",
- "@tagspaces/tagspaces-common-node": "^4.5.2",
+ "@tagspaces/tagspaces-common": "^4.5.15",
+ "@tagspaces/tagspaces-common-node": "^4.5.15",
"@tagspaces/tagspaces-thumbgen-image": "^4.2.3",
"fswin": "^3.24.524"
}
},
"@tagspaces/tagspaces-ws": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.2.tgz",
- "integrity": "sha512-QoZYNEj13LlXLiw6Fu9y4zHtJ2TEVhi7hT6Q9o1T90qkELI9UKWjdgx4uskNT3WdKNbPxzHbiYBsMBw6B5WhLg==",
+ "version": "4.5.15",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.15.tgz",
+ "integrity": "sha512-XbwKe5Qpy4kAFPSiqJsEBO/BGcACfBOu4aZPRWXEVX3SfD9qtwpLwf/CHLXhaG+BTSwbuiiUCulvTvzFeNsChw==",
"requires": {
- "@tagspaces/tagspaces-workers": "^4.5.2",
+ "@tagspaces/tagspaces-workers": "^4.5.15",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^8.5.1",
"ws": "^8.15.1"
@@ -1200,9 +1200,9 @@
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"async": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
- "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
},
"b4a": {
"version": "1.6.6",
diff --git a/release/app/package.json b/release/app/package.json
index e5144badb..c5972da56 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -19,8 +19,8 @@
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.127",
- "@tagspaces/tagspaces-common-node": "4.5.2",
- "@tagspaces/tagspaces-ws": "4.5.2",
+ "@tagspaces/tagspaces-common-node": "4.5.15",
+ "@tagspaces/tagspaces-ws": "4.5.15",
"sharp": "0.32.6",
"ws": "8.16.0"
},
diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.js
index 93fa63db1..7d75b335b 100644
--- a/tests/e2e/fileopener.pw.e2e.js
+++ b/tests/e2e/fileopener.pw.e2e.js
@@ -370,7 +370,7 @@ test.describe('TST08 - File folder properties', () => {
await expectElementExist(getGridFileSelector(fileName), false, 5000);
await expectMetaFilesExist(arrayMeta, false);
- await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);
+ await setSettings('[data-tid=settingsSetPersistTagsInFileName]', true);
});
test('TST0813a - Delete file and check revisions deleted [web,electron,_pro]', async () => {
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index 72928a7b4..00aa5cba6 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -717,7 +717,8 @@ export async function expectMetaFilesExist(
//await clickOn('[data-tid=folderContainerOpenDirMenu]');
//await clickOn('[data-tid=reloadDirectory]');
if (exist || (await isDisplayed(getGridFileSelector(AppConfig.metaFolder)))) {
- await global.client.dblclick(getGridFileSelector(AppConfig.metaFolder));
+ await openFolder(AppConfig.metaFolder);
+ //await global.client.dblclick(getGridFileSelector(AppConfig.metaFolder));
if (subFolder) {
if (await isDisplayed(getGridFileSelector(subFolder))) {
await global.client.dblclick(getGridFileSelector(subFolder));
diff --git a/tests/e2e/general.pw.e2e.js b/tests/e2e/general.pw.e2e.js
index 80bd9546c..fab1e8466 100644
--- a/tests/e2e/general.pw.e2e.js
+++ b/tests/e2e/general.pw.e2e.js
@@ -219,13 +219,14 @@ test.describe('TST51 - Perspective Grid', () => {
});
test('TST0511 - Generate thumbnail from Videos [electron]', async () => {
- if (global.isWin) {
- // todo in github thumbnails not generated for videos on MacOS
- const metaFiles = AppConfig.ThumbGenSupportedFileTypes.video.map(
- (imgExt) => 'sample.' + imgExt + '.jpg',
- );
- await expectMetaFilesExist(metaFiles);
- }
+ //if (global.isWin) {
+ // todo in github thumbnails not generated for videos on MacOS
+ //todo thumbnails not generated for ogv
+ const metaFiles = AppConfig.ThumbGenSupportedFileTypes.video
+ .filter((file) => file !== 'ogv')
+ .map((imgExt) => 'sample.' + imgExt + '.jpg');
+ await expectMetaFilesExist(metaFiles);
+ //}
});
test('TST0516 - Generate thumbnail from PDF [electron]', async () => {