Skip to content

Commit ea899b0

Browse files
msmolensmsmolens
committed
Update prettier and prettier-plugin-svelte
1 parent f10949b commit ea899b0

35 files changed

+349
-343
lines changed

‎.prettierrc.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
plugins = ["prettier-plugin-svelte"]
12
bracketSameLine = true
23
singleQuote = true
34
svelteAllowShorthand = true

‎package-lock.json‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"compile-smui-theme-dark": "smui-theme compile src/treetop/generated/smui-dark.css -i src/theme/dark",
99
"lint": "eslint ./src ./test",
1010
"lint:fix": "eslint ./src ./test --fix",
11-
"prettier": "prettier --check ./src ./test",
12-
"prettier:fix": "prettier --write ./src ./test",
11+
"prettier": "prettier --check --plugin=prettier-plugin-svelte ./src ./test",
12+
"prettier:fix": "prettier --write --plugin=prettier-plugin-svelte ./src ./test",
1313
"build": "concurrently --max-processes 1 \"npm:build:background_script\" \"npm:build:options\" \"npm:build:treetop\" \"npm:build:welcome\"",
1414
"build:watch": "concurrently \"npm:build:background_script:watch\" \"npm:build:options:watch\" \"npm:build:treetop:watch\" \"npm:build:welcome:watch\"",
1515
"build:background_script": "vite build --config vite.background_script.config.ts",
@@ -63,8 +63,8 @@
6363
"normalize.css": "^8.0.1",
6464
"postcss": "^8.4.26",
6565
"postcss-url": "^10.1.3",
66-
"prettier": "^2.8.4",
67-
"prettier-plugin-svelte": "^2.9.0",
66+
"prettier": "3.0.0",
67+
"prettier-plugin-svelte": "^3.0.0",
6868
"rollup-plugin-copy": "^3.4.0",
6969
"sass": "^1.63.6",
7070
"smui-theme": "^6.2.0",

‎src/background_script/open-treetop.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const openWelcome = ({
3434
*/
3535
export const openTreetop = (
3636
_tab: Tabs.Tab,
37-
info: Action.OnClickData | undefined
37+
info: Action.OnClickData | undefined,
3838
): void => {
3939
if (!info) {
4040
return;

‎src/background_script/options.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type * as Treetop from '@Treetop/treetop/types';
77
* Set default options, leaving existing options unchanged.
88
*/
99
export const setDefaultOptions = async (
10-
defaultOptions: Record<string, Treetop.PreferenceValue>
10+
defaultOptions: Record<string, Treetop.PreferenceValue>,
1111
): Promise<void> => {
1212
try {
1313
// Get stored options

‎src/options/options.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />

‎src/treetop/BookmarksManager.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import * as Treetop from './types';
1111
export class BookmarksManager {
1212
constructor(
1313
private readonly nodeStoreMap: Treetop.NodeStoreMap,
14-
private readonly builtInFolderInfo: Treetop.BuiltInFolderInfo
14+
private readonly builtInFolderInfo: Treetop.BuiltInFolderInfo,
1515
) {}
1616

1717
/**
@@ -27,12 +27,12 @@ export class BookmarksManager {
2727

2828
// Firefox: Exclude Mobile Bookmarks folder
2929
rootNode.children = rootNode.children?.filter(
30-
({ id }) => id !== MOBILE_BOOKMARKS_GUID
30+
({ id }) => id !== MOBILE_BOOKMARKS_GUID,
3131
);
3232

3333
// Store built-in folder IDs (e.g. Other Bookmarks)
3434
this.builtInFolderInfo.builtInFolderIds = rootNode.children!.map(
35-
({ id }) => id
35+
({ id }) => id,
3636
);
3737

3838
// Initialize node stores for folders
@@ -119,7 +119,7 @@ export class BookmarksManager {
119119
*/
120120
async handleBookmarkCreated(
121121
id: string,
122-
bookmark: Bookmarks.BookmarkTreeNode
122+
bookmark: Bookmarks.BookmarkTreeNode,
123123
): Promise<void> {
124124
if (isFolder(bookmark)) {
125125
// Add node store for the new folder
@@ -140,7 +140,7 @@ export class BookmarksManager {
140140
*/
141141
async handleBookmarkRemoved(
142142
id: string,
143-
removeInfo: Bookmarks.OnRemovedRemoveInfoType
143+
removeInfo: Bookmarks.OnRemovedRemoveInfoType,
144144
): Promise<string[]> {
145145
const removedNodeIds = [];
146146

@@ -183,7 +183,7 @@ export class BookmarksManager {
183183
*/
184184
async handleBookmarkChanged(
185185
id: string,
186-
_changeInfo: Bookmarks.OnChangedChangeInfoType
186+
_changeInfo: Bookmarks.OnChangedChangeInfoType,
187187
): Promise<void> {
188188
if (this.nodeStoreMap.has(id)) {
189189
// Folder changed. Update its node.
@@ -201,7 +201,7 @@ export class BookmarksManager {
201201
*/
202202
async handleBookmarkMoved(
203203
_id: string,
204-
moveInfo: Bookmarks.OnMovedMoveInfoType
204+
moveInfo: Bookmarks.OnMovedMoveInfoType,
205205
): Promise<void> {
206206
const parentId = moveInfo.parentId;
207207
const oldParentId = moveInfo.oldParentId;

‎src/treetop/FilterManager.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class FilterManager {
1818

1919
constructor(
2020
private readonly filterSet: Treetop.FilterSet,
21-
private readonly nodeStoreMap: Treetop.NodeStoreMap
21+
private readonly nodeStoreMap: Treetop.NodeStoreMap,
2222
) {}
2323

2424
/**
@@ -86,7 +86,7 @@ export class FilterManager {
8686
*/
8787
handleBookmarkCreated(
8888
_id: string,
89-
bookmark: Bookmarks.BookmarkTreeNode
89+
bookmark: Bookmarks.BookmarkTreeNode,
9090
): void {
9191
if (this.filter === null) {
9292
return;
@@ -151,7 +151,7 @@ export class FilterManager {
151151
*/
152152
handleBookmarkChanged(
153153
_id: string,
154-
_changeInfo: Bookmarks.OnChangedChangeInfoType
154+
_changeInfo: Bookmarks.OnChangedChangeInfoType,
155155
): void {
156156
this.refreshFilter();
157157
}
@@ -162,7 +162,7 @@ export class FilterManager {
162162
*/
163163
handleBookmarkMoved(
164164
_id: string,
165-
_moveInfo: Bookmarks.OnMovedMoveInfoType
165+
_moveInfo: Bookmarks.OnMovedMoveInfoType,
166166
): void {
167167
this.refreshFilter();
168168
}

‎src/treetop/HistoryManager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class HistoryManager {
8383
*/
8484
async handleBookmarkCreated(
8585
_id: string,
86-
bookmark: Bookmarks.BookmarkTreeNode
86+
bookmark: Bookmarks.BookmarkTreeNode,
8787
): Promise<void> {
8888
if (!isBookmark(bookmark)) {
8989
return;
@@ -110,7 +110,7 @@ export class HistoryManager {
110110
*/
111111
async handleBookmarkChanged(
112112
id: string,
113-
changeInfo: Bookmarks.OnChangedChangeInfoType
113+
changeInfo: Bookmarks.OnChangedChangeInfoType,
114114
): Promise<void> {
115115
// Ignore changed folders
116116
if (changeInfo.url === undefined) {
@@ -146,7 +146,7 @@ export class HistoryManager {
146146
* history.
147147
*/
148148
async handleVisitRemoved(
149-
removed: History.OnVisitRemovedRemovedType
149+
removed: History.OnVisitRemovedRemovedType,
150150
): Promise<void> {
151151
if (removed.allHistory) {
152152
// All history was removed

‎src/treetop/PreferencesManager.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class PreferencesManager {
3030
*/
3131
createStore(
3232
name: string,
33-
value: Treetop.PreferenceValue
33+
value: Treetop.PreferenceValue,
3434
): Writable<Treetop.PreferenceValue> {
3535
const store = writable(value);
3636
this.stores.set(name, store);
@@ -60,7 +60,7 @@ export class PreferencesManager {
6060
*/
6161
private handleStorageChanged(
6262
changes: Record<string, Storage.StorageChange>,
63-
_areaName: string
63+
_areaName: string,
6464
): void {
6565
for (const key of Object.keys(changes)) {
6666
const value = changes[key].newValue as Treetop.PreferenceValue;

0 commit comments

Comments
 (0)