Skip to content

Commit

Permalink
Merge pull request #427 from tabwrangler/v6.10.1-revert
Browse files Browse the repository at this point in the history
Revert to v6.10.1 to release as v7.1.0 during fix
  • Loading branch information
ssorallen committed Oct 13, 2023
2 parents 41c99f0 + 53d7b8c commit 7bace5d
Show file tree
Hide file tree
Showing 43 changed files with 1,505 additions and 1,742 deletions.
18 changes: 7 additions & 11 deletions .eslintrc.js
Expand Up @@ -26,19 +26,15 @@ module.exports = {
root: true,
rules: {
// Rules included in ESLint
"consistent-return": "error",
eqeqeq: ["error", "smart"],
"no-console": "off",
"no-unused-expressions": "error",
"sort-imports": "error",
"consistent-return": 2,
eqeqeq: [2, "smart"],
"no-console": 0,
"no-unused-expressions": 2,
"sort-imports": 2,

// React Hooks
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",

// TypeScript
"no-unused-vars": "off", // Note: you must disable the base rule as it can report incorrect errors
"@typescript-eslint/no-unused-vars": "error",
"react-hooks/rules-of-hooks": 2,
"react-hooks/exhaustive-deps": 2,
},
settings: {
react: {
Expand Down
35 changes: 18 additions & 17 deletions .github/workflows/main.yml
Expand Up @@ -4,14 +4,15 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [master]
branches: [ master ]
pull_request:
branches: [master]
branches: [ master ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
build:

runs-on: ubuntu-latest

strategy:
Expand All @@ -20,18 +21,18 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
cache: "npm"
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run lint
- run: npm run test
- run: npm run build
- uses: actions/upload-artifact@v3
with:
name: tabwrangler-builds
path: dist/tabwrangler-*.zip
if-no-files-found: error
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
cache: 'npm'
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run lint
- run: npm run test
- run: npm run release
- uses: actions/upload-artifact@v3
with:
name: tabwrangler-builds
path: tabwrangler-*.zip
if-no-files-found: error
4 changes: 3 additions & 1 deletion .gitignore
@@ -1,3 +1,5 @@
coverage/
dist/
node_modules/
coverage/
tabwrangler*.zip
yarn-error.log
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -34,9 +34,9 @@

### Building for Release

1. Create a .zip to upload to the Chrome Store and Firefox AMO with the `build` task
1. Create a .zip to upload to the Chrome Store and Firefox AMO with the `release` task

$ npm run build
$ npm run release

## Contributing Translations

Expand Down
22 changes: 10 additions & 12 deletions README.md
Expand Up @@ -83,14 +83,15 @@ usages are described in the following table:

| Setting | Default | Possible Values | Description |
| --------------------- | ------------------------- | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
| `checkInterval` | `5000` | `0` < `checkInterval` | How often Tab Wrangler should check for stale tabs to close (in milliseconds) |
| `corralTabSortOrder` | `null` | `null, 'alpha', 'reverseAlpha', 'chrono', 'reverseChrono', 'domain', 'reverseDomain'` | Saved sort order for closed tabs. When `null`, defaults to `'reverseChrono'` |
| `debounceOnActivated` | `true` | | Whether to wait 1 second before resetting the active tab's timer |
| `debounceOnActivated` | `false` | | Whether to wait 1 second before resetting the active tab's timer |
| `filterAudio` | `false` | | Whether to prevent auto-closing tabs that are playing audio |
| `lockedIds` | `[]` | | Array of tab IDs that have been explicitly locked by the user |
| `lockTabSortOrder` | `null` | `null, 'chrono', 'reverseChrono', 'tabOrder', 'reverseTabOrder'` | Saved sort order for open tabs. When `null`, defaults to `'tabOrder'` |
| `maxTabs` | `1000` | `0` <= `maxTabs` <= `1000` | Maximum number of tabs to keep in the tab list |
| `minTabs` | `20` | `0` <= `minTabs` | Auto-close tabs only if there are more than this number open |
| `minutesInactive` | `60` | `0` <= `minutesInactive` | How much time (+ `secondsInactive`) before a tab is considered "stale" and ready to close |
| `maxTabs` | `100` | `0` <= `maxTabs` <= `1000` | Maximum number of tabs to keep in the tab list |
| `minTabs` | `5` | `0` <= `minTabs` | Auto-close tabs only if there are more than this number open |
| `minutesInactive` | `20` | `0` <= `minutesInactive` | How much time (+ `secondsInactive`) before a tab is considered "stale" and ready to close |
| `paused` | `false` | | Whether TabWrangler is paused (shouldn't count down) |
| `purgeClosedTabs` | `false` | | Whether to empty the closed tab list when the browser closes |
| `secondsInactive` | `0` | `0` <= `secondsInactive` | How much time (+ `minutesInactive`) before a tab is considered "stale" and ready to close |
Expand All @@ -113,16 +114,14 @@ your tabs but not the content inside those tabs.
Tab Wrangler's requested permissions are listed in its [manifest.json][manifest.json] under the
`"permissions"` key.

* [`"alarms"`][7]: Allows creation of alarms to periodically check Tab Wrangler's background script
that checks for stale tabs is running and healthy.
* [`"contextMenus"`][3]: Allows a "Tab Wrangler" menu item when you right click on a webpage that
* [`"contextMenus"`][3] Enables a "Tab Wrangler" menu item when you right click on a webpage that
lets you send the tab to the Tab Corral, lock that tab, or lock all tabs on that domain.
* [`"sessions"`][4]: Allows Tab Wrangler to read and restore the full history of a tab including
* [`"sessions"`][4] Enables Tab Wrangler to read and restore the full history of a tab including
enabling the back/forward buttons and your scroll position on the page.
* [`"storage"`][5]: Allows Tab Wrangler to sync your Tab Wrangler settings with your browser
* [`"storage"`][5]: Enables Tab Wrangler to sync your Tab Wrangler settings with your browser
account and enables saving your closed tabs to your local computer. *Note: closed tabs are not
synced because the "sync" storage area has only a small amount of storage.*
* [`"tabs"`][6]: Allows Tab Wrangler to read the title and location of any current tabs as well
* [`"tabs"`][6]: Enables Tab Wrangler to read the title and location of any current tabs as well
as close those tabs and open new tabs. This permission **does not** enable Tab Wrangler to
read information on web pages that you visit.

Expand All @@ -139,7 +138,7 @@ include the following:
🇨🇳 Chinese (Simplified) by [yfdyh000](https://crowdin.com/profile/yfdyh000),
🇹🇼 Chinese (Traditional) by [ingrid123](https://crowdin.com/profile/ingrid123) and [xbddc.ho](https://crowdin.com/profile/xbddc.ho),
🇫🇷 French by [orpheuslummis](https://crowdin.com/profile/orpheuslummis) and [bkazez](https://crowdin.com/profile/bkazez),
🇩🇪 German by [johannesfischer](https://crowdin.com/profile/johannesfischer),
🇩🇪 Germany by [johannesfischer](https://crowdin.com/profile/johannesfischer),
🇭🇺 Hungarian by [kottalovag](https://crowdin.com/profile/kottalovag),
🇮🇩 Indonesian by [azhe403](https://crowdin.com/profile/azhe403),
🇰🇷 Korean by [x_nuk](https://crowdin.com/profile/x_nuk),
Expand Down Expand Up @@ -167,4 +166,3 @@ working and tested, submit a pull request to this primary project and we'll get
[5]: https://developer.chrome.com/extensions/storage
[6]: https://developer.chrome.com/extensions/tabs
[manifest.json]: https://github.com/tabwrangler/tabwrangler/blob/master/app/manifest.json
[7]: https://developer.chrome.com/docs/extensions/reference/alarms/
32 changes: 0 additions & 32 deletions _locales/de/messages.json
Expand Up @@ -3,18 +3,10 @@
"description": "Name of the 'About' section, where users can see information about the extension",
"message": "Über"
},
"about_changeLog": {
"description": "Link to the extension's list of changes per release",
"message": "Changelog"
},
"about_sourceCode": {
"description": "Link to the extension's source code and its license type (MIT)",
"message": "Quelltext (MIT)"
},
"about_support": {
"description": "Link to the extension's support site",
"message": "Hilfe"
},
"contextMenu_corralTab": {
"description": "Label for context menu item that closes the clicked tab and adds it to the corral",
"message": "Tab schließen und URL sichern"
Expand Down Expand Up @@ -323,34 +315,10 @@
"description": "Explanation of time remaining before tab is closed",
"message": "Schliessen in..."
},
"tabLock_sort_tabOrder": {
"description": "Description for sorting tabs by how they appear in browser",
"message": "Tab Reihenfolge"
},
"tabLock_sort_tabOrder_short": {
"description": "Short version of tabLock_sort_tabOrder",
"message": "Tab Reihenfolge"
},
"tabLock_sort_tabOrder_desc": {
"description": "Description for sorting tabs by how they appear in browser, in reverse",
"message": "Tab Reihenfolge (umgekehrt)"
},
"tabLock_sort_tabOrder_desc_short": {
"description": "Short version of tabLock_sort_tabOrder_desc",
"message": "Tab Reihenfolge (umgek.)"
},
"tabLock_sort_timeUntilClose": {
"description": "Description for sorting tabs by how much time until TW closes them",
"message": "Zeit bis zum schließen"
},
"tabLock_sort_timeUntilClose_short": {
"description": "Short version of tabLock_sort_timeUntilClose",
"message": "Zeit bis zum schließen"
},
"tabLock_sort_timeUntilClose_desc_short": {
"description": "Short version of tabLock_sort_timeUntilClose_desc",
"message": "Zeit bis zum schließen (absteigend)"
},
"settings_setmaxTabs_error": {
"description": "Error shown when invalid max tabs setting is supplied.",
"message": "Maximale Anzahl von Tabs muss zwischen 1 und 1000 liegen."
Expand Down
7 changes: 7 additions & 0 deletions app/background.template.html
@@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body></body>
</html>

0 comments on commit 7bace5d

Please sign in to comment.