From 72e86fe34973eb8a25991b7cd79fc317c424e832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20Gr=C3=A4f?= Date: Tue, 3 Sep 2024 07:34:48 +0200 Subject: [PATCH] establishing new structure --- package.json | 4 ++-- src-bex/manifest-chrome.json | 5 ----- src-bex/manifest.json | 6 ++---- src/app/BrowserApi.ts | 9 +-------- src/core | 2 +- src/windows | 2 +- tag.sh | 13 ------------- yarn.lock | 9 ++++++++- 8 files changed, 15 insertions(+), 35 deletions(-) delete mode 100755 tag.sh diff --git a/package.json b/package.json index 74089364..e47c6c33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tabsets.net", - "version": "0.5.9", + "version": "0.5.10", "description": "Use tabsets.net to safely keep track of all your tabs and links in the Side Panel, stored locally on your browser", "productName": "Tabsets.net", "author": "evandor ", @@ -107,7 +107,7 @@ "@quasar/app-vite": "^1.9.5", "@quasar/babel-preset-app": "^2.0.3", "@quasar/quasar-app-extension-testing-unit-vitest": "^1.0.0", - "@types/node": "^22.5.1", + "@types/node": "^22.5.2", "@types/uuid": "^10.0.0", "@vitest/coverage-c8": "^0.33.0", "@vitest/coverage-v8": "^1.6.0", diff --git a/src-bex/manifest-chrome.json b/src-bex/manifest-chrome.json index 9ce4cf90..a7cbb40b 100644 --- a/src-bex/manifest-chrome.json +++ b/src-bex/manifest-chrome.json @@ -25,11 +25,6 @@ "", "*://*/*" ], - "sidebar_action": { - "default_icon": "icons/icon-48x48.png", - "default_title": "tabsets.bet - Better Bookmarks", - "default_panel": "www/sidepanel.html" - }, "background": { "service_worker": "background.js" }, diff --git a/src-bex/manifest.json b/src-bex/manifest.json index 9ce4cf90..43047327 100644 --- a/src-bex/manifest.json +++ b/src-bex/manifest.json @@ -25,10 +25,8 @@ "", "*://*/*" ], - "sidebar_action": { - "default_icon": "icons/icon-48x48.png", - "default_title": "tabsets.bet - Better Bookmarks", - "default_panel": "www/sidepanel.html" + "side_panel": { + "default_path": "www/sidepanel.html" }, "background": { "service_worker": "background.js" diff --git a/src/app/BrowserApi.ts b/src/app/BrowserApi.ts index e589155f..a9b359f3 100644 --- a/src/app/BrowserApi.ts +++ b/src/app/BrowserApi.ts @@ -286,7 +286,7 @@ class BrowserApi { restore(tabset: Tabset, windowName: string | undefined = undefined, inNewWindow: boolean = true) { console.log("restoring tabset ", tabset.id, windowName, inNewWindow) - +debugger const urlAndGroupArray: object[] = _.map(tabset.tabs, (t: Tab) => { return {url: t.url, group: t.groupName} || {url: '', group: undefined} }) @@ -305,13 +305,6 @@ class BrowserApi { _.map(urlAndGroupArray, a => a['url' as keyof object]), undefined, _.map(urlAndGroupArray, a => a['group' as keyof object])) - // TODO deactivate listeners - needed? - // useTabsStore().deactivateListeners() - // this.getCurrentTab() - // ... - // Promise.all(promisedTabs) - // .then(() => useTabsStore().activateListeners()) - // }) } else { console.log("opening urls", urlAndGroupArray) NavigationService.openOrCreateTab(_.map(urlAndGroupArray, a => a['url' as keyof object]), diff --git a/src/core b/src/core index 623d6ad4..143919d5 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 623d6ad435ff2f045f3d02d3d6f91e1a694fa18a +Subproject commit 143919d5be45b66a88af85936e2335b5a0b7ecb5 diff --git a/src/windows b/src/windows index 2084df7b..cbe51cab 160000 --- a/src/windows +++ b/src/windows @@ -1 +1 @@ -Subproject commit 2084df7b2bf0a58c20cc229907bcc1bab98f2587 +Subproject commit cbe51cab04168ba3199379d2655b2ef8cff51226 diff --git a/tag.sh b/tag.sh deleted file mode 100755 index 91562f95..00000000 --- a/tag.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -VERSION="$1" -if [ $# -eq 0 ] - then - echo "No version supplied, please run script like 'tag.sh 0.5.0" - exit -fi - - -#git submodule foreach git tag -m "new release" v$VERSION -git tag -a v$VERSION -m "new release" -git submodule foreach git push origin --tags -git push origin --tags diff --git a/yarn.lock b/yarn.lock index e61cb137..d81fd1dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2702,7 +2702,7 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== -"@types/node@*", "@types/node@>=10.0.0", "@types/node@^22.2.0", "@types/node@^22.5.1": +"@types/node@*", "@types/node@>=10.0.0", "@types/node@^22.2.0": version "22.5.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560" integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw== @@ -2721,6 +2721,13 @@ dependencies: undici-types "~6.19.2" +"@types/node@^22.5.2": + version "22.5.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.2.tgz#e42344429702e69e28c839a7e16a8262a8086793" + integrity sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg== + dependencies: + undici-types "~6.19.2" + "@types/normalize-package-data@^2.4.1": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"