Skip to content

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

Merge branch 'master' into develop

Ilian Sapundshiev80f0956d28ca
diff --cc app/components/FolderContainer.tsx
index e6cec1267,8488a3d93..d1f7f18b2
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@@ -767,8 -764,8 +767,9 @@@ const areEqual = (prevProp: Props, next
nextProp.currentDirectoryPath === prevProp.currentDirectoryPath &&
nextProp.currentDirectoryPerspective ===
prevProp.currentDirectoryPerspective &&
-- /* this props is set before currentDirectoryEntries is loaded and will reload FolderContainer
-- nextProp.currentLocationPath === prevProp.currentLocationPath && */
++ /* this props is set before currentDirectoryEntries is loaded and will reload FolderContainer */
++ /* nextProp.currentLocationPath === prevProp.currentLocationPath && */
++
JSON.stringify(nextProp.directoryContent) ===
JSON.stringify(prevProp.directoryContent) &&
JSON.stringify(nextProp.openedFiles) ===
diff --cc package.json
index 2cc842cc1,5c106a2d6..70c92aa7b
--- a/package.json
+++ b/package.json
@@@ -128,16 -124,16 +128,16 @@@
"test-one": "cross-env HEADLESS_MODE=true jest --detectOpenHandles --config=jest.config.web.js -t 'TST5016' --runInBand --verbose ./tests/e2e/",
"test-one-suite": "cross-env jest --config=jest.config.web.js --verbose ./tests/e2e/perspective-grid-right-button.e2e.js",
"test-one-suite-headless": "cross-env HEADLESS_MODE=true jest --config=jest.config.web.js --verbose ./tests/e2e/fileopener.e2e.js",
- "test-playwright": "yarn test-refresh-data && cross-env JEST_JUNIT_OUTPUT_DIR=./tests NODE_ENV=test jest --config=jest.config.playwright.js -t 'electron' --verbose ./tests/e2e/",
- "test-playwright-web": "yarn test-refresh-data && yarn prepare-web-pro && cross-env NODE_ENV=test SHOW_CONSOLE=true DEBUG=pw:api PLAYWRIGHT=test_playwright jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",
- "test-playwright-web-headless": "yarn test-refresh-data && yarn prepare-web-pro && cross-env NODE_ENV=test SHOW_CONSOLE=true JEST_JUNIT_OUTPUT_DIR=./tests PLAYWRIGHT=test_playwright HEADLESS_MODE=true jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",
+ "test-playwright": "npm run test-refresh-data && cross-env JEST_JUNIT_OUTPUT_DIR=./tests NODE_ENV=test jest --config=jest.config.playwright.js -t 'electron' --verbose ./tests/e2e/",
+ "test-playwright-web": "npm run test-refresh-data && npm run prepare-web-pro && cross-env NODE_ENV=test SHOW_CONSOLE=true DEBUG=pw:api PLAYWRIGHT=test_playwright jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",
+ "test-playwright-web-headless": "npm run test-refresh-data && npm run prepare-web-pro && cross-env NODE_ENV=test SHOW_CONSOLE=true JEST_JUNIT_OUTPUT_DIR=./tests PLAYWRIGHT=test_playwright HEADLESS_MODE=true jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",
"test-refresh-data": "rimraf tests/testdata-tmp && shx mkdir -p tests/testdata-tmp/file-structure && shx cp -rL tests/testdata/file-structure tests/testdata-tmp",
"test-unit": "cross-env NODE_JEST=unit_test BABEL_DISABLE_CACHE=1 jest --config=jest.config.unit.js --verbose ./tests/unit/",
- "test-watch": "yarn test --watch",
- "third-party": "yarn licenses generate-disclaimer --silent > app/third-party.txt",
+ "test-watch": "npm run test --watch",
+ "third-party": "npm run licenses generate-disclaimer --silent > app/third-party.txt",
"type-check": "tsc --noEmit",
- "update-changelog": "git log v4.3.2..HEAD --no-merges --format=%B > CHANGELOG.TXT",
- "update-changelog-pro": "cd extensions/tagspacespro && git log v4.2.1..HEAD --no-merges --format=%B > ../../CHANGELOG-PRO.TXT",
+ "update-changelog": "git log v4.4.3..HEAD --no-merges --format=%B > CHANGELOG.TXT",
+ "update-changelog-pro": "cd extensions/tagspacespro && git log v4.4.3..HEAD --no-merges --format=%B > ../../CHANGELOG-PRO.TXT",
"update-i18n": "tx pull -a -d",
"version-meta": "node scripts/versionmeta.js",
"linux-fix-sandbox": "sudo chown root:root node_modules/electron/dist/chrome-sandbox && sudo chmod 4755 node_modules/electron/dist/chrome-sandbox",