Skip to content

Commit d4ab8ba

Browse files
authored
Merge branch 'main' into release/v1.4
2 parents d990045 + b6b3a00 commit d4ab8ba

4 files changed

Lines changed: 41 additions & 22 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
"crypto-js": "^4.2.0",
4040
"dayjs": "^1.11.13",
4141
"dexie": "^4.0.10",
42-
"dompurify": "^3.3.1",
42+
"dompurify": "^3.3.3",
4343
"eslint-linter-browserify": "9.26.0",
4444
"eventemitter3": "^5.0.1",
45-
"fast-xml-parser": "^5.3.6",
45+
"fast-xml-parser": "^5.5.8",
4646
"i18next": "^23.16.4",
4747
"monaco-editor": "^0.52.2",
4848
"react": "^18.3.1",

pnpm-lock.yaml

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

src/app/const.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ export const DocumentationSite = "https://docs.scriptcat.org";
77
export const ExtServer = "https://ext.scriptcat.org/";
88
export const ExtServerApi = ExtServer + "api/v1/";
99

10-
export const ExternalWhitelist = ["greasyfork.org", "scriptcat.org", "tampermonkey.net.cn", "openuserjs.org"];
11-
12-
export const ExternalMessage = "externalMessage";
10+
export const ExternalWhitelist = [
11+
"scriptcat.org",
12+
"greasyfork.org",
13+
"sleazyfork.org",
14+
"tampermonkey.net.cn",
15+
"openuserjs.org",
16+
];

src/pages/components/CodeEditor/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const CodeEditor: React.ForwardRefRenderFunction<{ editor: editor.IStandaloneCod
8585
suggestSelection: "first",
8686

8787
// Enable word based suggestions
88-
wordBasedSuggestions: "matchingDocuments",
88+
wordBasedSuggestions: "off",
8989

9090
// Enable parameter hints
9191
parameterHints: {
@@ -97,7 +97,7 @@ const CodeEditor: React.ForwardRefRenderFunction<{ editor: editor.IStandaloneCod
9797
// https://github.com/is0383kk/VSCode
9898

9999
quickSuggestions: {
100-
other: "inline",
100+
other: true,
101101
comments: true,
102102
strings: true,
103103
},

0 commit comments

Comments
 (0)