Skip to content

build: update dependencies #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Userscripts.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"folders": [
{
"name": "Userscripts-JS",
"path": "."
"path": ".",
},
{
"name": "Userscripts-Xcode",
"path": "xcode"
}
"path": "xcode",
},
],
"settings": {}
"settings": {},
}
2 changes: 2 additions & 0 deletions docs/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ Reviewing the template will help you understand the composition of the project.
- `xcodebuild -scheme Mac` [^1][^2][^3] or build with `Xcode` App

[^1]: These commands can also be executed directly through the vscode tasks. Please refer to: [/.vscode/tasks.json](../.vscode/tasks.json)

[^2]: Select the corresponding target and platform to build. Please refer to: [/package.json](../package.json) and [xcode-schemes](../xcode/Userscripts.xcodeproj/xcshareddata/xcschemes/)

[^3]: Local setup may be required. Please refer to: [Building from the Command Line with Xcode FAQ](https://developer.apple.com/library/archive/technotes/tn2339/_index.html)

# Xcode
Expand Down
548 changes: 278 additions & 270 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
"prettier": "prettier --write . --plugin prettier-plugin-svelte"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"@types/webextension-polyfill": "^0.10.7",
"autoprefixer": "^10.4.19",
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.7",
"@types/webextension-polyfill": "^0.12.1",
"autoprefixer": "^10.4.20",
"cm-show-invisibles": "^3.1.0",
"codemirror": "^5.65.17",
"eslint": "^9.7.0",
"eslint": "^9.10.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.43.0",
"prettier": "3.0.3",
"prettier-plugin-svelte": "3.2.3",
"eslint-plugin-svelte": "^2.44.0",
"prettier": "3.3.3",
"prettier-plugin-svelte": "3.2.6",
"stylelint": "^16.7.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-standard": "^36.0.0",
"svelte": "^5.0.0-next.192",
"vite": "^5.3.4"
"svelte": "^5.0.0-next.250",
"vite": "^5.4.6"
}
}
4 changes: 2 additions & 2 deletions scripts/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ export const baseConfig = {
),
"import.meta.env.GIT_TAG": JSON.stringify(gitTag),
"import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
}
}
: {
"import.meta.env.GIT_TAG": JSON.stringify(gitTag),
"import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
},
},
};
1 change: 1 addition & 0 deletions src/dev/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
href="https://github.com/quoid/userscripts"
target="_blank"
rel="noreferrer"
aria-label="open userscripts github"
>
<img src={Logo} class="logo" alt="Logo" />
</a>
Expand Down
8 changes: 7 additions & 1 deletion src/ext/extension-page/Components/Editor/CodeMirror.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<script context="module">
<script module>
// once initialized, references the codemirror instance
let instance;
// saved and session code vars are used to track unsaved changes
Expand Down Expand Up @@ -65,6 +65,7 @@
getAnnotations: linter,
};

// svelte-ignore reactive_declaration_module_script_dependency
// update settings when changed
$: if (instance) {
instance.setOption("autoCloseBrackets", $settings["editor_close_brackets"]);
Expand All @@ -76,11 +77,13 @@
);
}

// svelte-ignore reactive_declaration_module_script_dependency
// store cursor position and disable on save
$: if ($state.includes("saving")) {
cursor = instance.getCursor();
disable();
}
// svelte-ignore reactive_declaration_module_script_dependency
// re-enable after, focus and set cursor back save completes
$: if ($state.includes("ready") && state.getOldState().includes("saving")) {
enable();
Expand All @@ -92,18 +95,21 @@
$: if ($state.includes("trashing") || $state.includes("updating")) {
disable();
}
// svelte-ignore reactive_declaration_module_script_dependency
// reset saved and session code & re-enable after trashing completes
$: if ($state && state.getOldState().includes("trashing")) {
savedCode = null;
sessionCode = null;
enable();
}
// update session code and re-enable after updating completes
// svelte-ignore reactive_declaration_module_script_dependency
$: if ($state && state.getOldState().includes("updating")) {
sessionCode = instance.getValue();
enable();
}

// svelte-ignore reactive_declaration_module_script_dependency
// track lint settings and update accordingly
$: if (instance && $settings["editor_javascript_lint"]) {
toggleLint("enable");
Expand Down
4 changes: 2 additions & 2 deletions src/ext/extension-page/Components/Notification.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
item.type === "error"
? iconError
: item.type === "info"
? iconInfo
: iconWarn;
? iconInfo
: iconWarn;
let previousProgress;

function pause() {
Expand Down
1 change: 1 addition & 0 deletions src/ext/shared/Components/Toggle.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
aria-pressed={checked}
{disabled}
{title}
aria-label="toggle"
>
<span aria-hidden="true"></span>
</button>
Expand Down
Loading