TagSpaces is an offline, open source, document manager with tagging support
add bs
sytolk302e710a4d26
diff --git a/.erb/scripts/link-modules.ts b/.erb/scripts/link-modules.tsindex 6cc31e666..1ca02cdf7 100644--- a/.erb/scripts/link-modules.ts+++ b/.erb/scripts/link-modules.ts@@ -1,9 +1,30 @@import fs from 'fs';import webpackPaths from '../configs/webpack.paths';+import path from "path";-const { srcNodeModulesPath } = webpackPaths;-const { appNodeModulesPath } = webpackPaths;+const { srcNodeModulesPath, appNodeModulesPath, appPath, srcPath, distPath } = webpackPaths;if (!fs.existsSync(srcNodeModulesPath) && fs.existsSync(appNodeModulesPath)) {fs.symlinkSync(appNodeModulesPath, srcNodeModulesPath, 'junction');}++const targetNodeModules = path.join(distPath, 'node_modules');++if (!fs.existsSync(targetNodeModules) && fs.existsSync(appNodeModulesPath)) {+ fs.symlinkSync(appNodeModulesPath, targetNodeModules, 'junction');+}++////////link .env++const targetEnv = path.join(srcPath, '.env');+const appEnv = path.join(appPath, '.env');++if (!fs.existsSync(targetEnv) && fs.existsSync(appEnv)) {+ fs.symlinkSync(appEnv, targetEnv, 'junction');+}++const distEnv = path.join(distPath, '.env');++if (!fs.existsSync(distEnv) && fs.existsSync(appEnv)) {+ fs.symlinkSync(appEnv, distEnv, 'junction');+}diff --git a/README.md b/README.mdindex 11c28b173..7ee44a28a 100644--- a/README.md+++ b/README.md@@ -81,11 +81,13 @@ and install the project dependencies:$ npm install+Note: we have two package.json in `release/app` for the native dependencies and `/` you need to run `npm install` twice.+The last command will automatically build the application with webpack. Now it is time to install all the TagSpaces extensions:$ npm run install-ext-node-Starting from v4 of the application, a web service is running locally as a separate process. The web service is responsible for the search index creation and the generation of the thumbnails for most of the images formats. A key is required in order for the main application to communicate with the web server. It should be defined in the `.env` file located in `app` folder. This is an example for an .env file.+Starting from v4 of the application, a web service is running locally as a separate process. The web service is responsible for the search index creation and the generation of the thumbnails for most of the images formats. A key is required in order for the main application to communicate with the web server. It should be generated from webpack script in the `.env` file located in `release/app` folder. This is an example for an .env file.KEY=a_custom_key@@ -144,9 +146,9 @@ To run tests, run the following command```bashnpm run test-unit-npm run test-e2e-electron+npm run test-playwright-npm run test-e2e-web+npm run test-playwright-web```## Developing viewer and editor for TagSpacesdiff --git a/package.json b/package.jsonindex 22162d43c..3491b3d26 100644--- a/package.json+++ b/package.json@@ -33,11 +33,11 @@"build:cordova": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.prod.ts","build:cordova:dev": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.dev.ts","build-e2e": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test npm run build",- "build-e2e-dev": "ts-node ./.erb/scripts/clean.js dist && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:web\"",+ "build-e2e-dev": "ts-node ./.erb/scripts/clean.js && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:web\"","build-e2e-web": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test && npm run prepare-web-pro && npm run build:web","postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && npm run prepare-node && npm run build:dll","lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",- "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never && npm run build:dll",+ "package": "ts-node ./.erb/scripts/clean.js && npm run build && electron-builder build --publish never && npm run build:dll","rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app","start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer","start:main": "cross-env NODE_ENV=development electronmon -r ts-node/register/transpile-only .",@@ -45,7 +45,8 @@"start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts","test": "jest","browserslist:update": "npx browserslist@latest --update-db",- "bs": "npm run build && npm run start",+ "bs": "npm run build && node -r ts-node/register ./.erb/scripts/link-modules.ts && npm run run-electron",+ "run-electron": "npx electron ./release/app/dist/main/main.js","prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions","bump-version": "cd src/renderer && npm run version && cd .. && npm run version-meta","clean": "npx rimraf node_modules && npx rimraf src/renderer/dist",@@ -79,12 +80,12 @@"minio-start-windows": ".\\tests\\bin\\minio.exe server ./tests/testdata-tmp/file-structure","package-android": "npm run build:cordova && cd cordova && npm install && cordova build --release android","package-ci": "npm run postinstall && npm run build && electron-builder --publish always",- "package-linux": "npm run install-ext-node-linux && ts-node ./.erb/scripts/clean.js dist && electron-builder --linux --config resources/builder.json",- "package-linux-pro": "npm run install-ext-node-linux && ts-node ./.erb/scripts/clean.js dist && electron-builder --linux --config extensions/tagspacespro/resources/builder-pro.json",- "package-mac": "npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js dist && electron-builder --mac --x64 --config resources/builder.json",- "package-mac-arm64": "npm run install-ext-node-mac-arm64 && ts-node ./.erb/scripts/clean.js dist && electron-builder --mac --arm64 --config resources/builder.json",- "package-mac-arm64-pro": "npm run install-ext-node-mac-arm64 && ts-node ./.erb/scripts/clean.js dist && electron-builder --mac --arm64 --config extensions/tagspacespro/resources/builder-pro.json",- "package-mac-pro": "npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --mac --x64 --config extensions/tagspacespro/resources/builder-pro.json --publish never && npm run build:dll",+ "package-linux": "npm run install-ext-node-linux && ts-node ./.erb/scripts/clean.js && electron-builder --linux --config resources/builder.json",+ "package-linux-pro": "npm run install-ext-node-linux && ts-node ./.erb/scripts/clean.js && electron-builder --linux --config extensions/tagspacespro/resources/builder-pro.json",+ "package-mac": "npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js && electron-builder --mac --x64 --config resources/builder.json",+ "package-mac-arm64": "npm run install-ext-node-mac-arm64 && ts-node ./.erb/scripts/clean.js && electron-builder --mac --arm64 --config resources/builder.json",+ "package-mac-arm64-pro": "npm run install-ext-node-mac-arm64 && ts-node ./.erb/scripts/clean.js && electron-builder --mac --arm64 --config extensions/tagspacespro/resources/builder-pro.json",+ "package-mac-pro": "npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js && npm run build && electron-builder build --mac --x64 --config extensions/tagspacespro/resources/builder-pro.json --publish never && npm run build:dll","package-mac-pro-dev": "npx cross-env DEBUG_PROD=true && npm run package-mac-pro","package-pro": "rimraf app/node_modules && node scripts/enablepro.js && npm run install-ext-node && npm run build && npm run package-web-pro && npm run clean-maps && npm run package-win-pro && npm run package-linux-pro && npm run package-web-pro && npm run package-mac-pro","package-web": "npm run prepare-web && zip -r ../builds/tagspaces-web.zip web -xi web/files/**\\* ",diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex fa52bb7da..a81cdc8d6 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -1,12 +1,12 @@{"name": "tagspaces",- "version": "5.6.1",+ "version": "5.6.2","lockfileVersion": 2,"requires": true,"packages": {"": {"name": "tagspaces",- "version": "5.6.1",+ "version": "5.6.2","hasInstallScript": true,"license": "AGPL-3.0"}diff --git a/src/main/main.ts b/src/main/main.tsindex d3e3e89d6..94df0120e 100644--- a/src/main/main.ts+++ b/src/main/main.ts@@ -373,7 +373,7 @@ function startWS() {'../node_modules/@tagspaces/tagspaces-ws/build',);script = 'index.js';- envPath = path.join(__dirname, '../../release/app/.env');+ envPath = path.join(__dirname, '../.env');}const properties = propertiesReader(envPath); //getAssetPath('.env')//console.debug(JSON.stringify(properties.get('KEY')));