Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into refactor/next
Browse files Browse the repository at this point in the history
  • Loading branch information
mtdvlpr committed Feb 25, 2024
2 parents 26a8bdd + 8949359 commit e223f34
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
cache: 'yarn'
Expand All @@ -41,7 +41,7 @@ jobs:
yarn lint
- name: Cancel workflow
if: failure()
uses: andymckay/cancel-action@0.3
uses: andymckay/cancel-action@0.4

test:
uses: ./.github/workflows/build.yml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below).
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -50,4 +50,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"docid",
"dont",
"dryrun",
"edwinhuish",
"eesti",
"español",
"fileformat",
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 24.2.0

### Bug fixes

- Correctly sanitize filenames with an apostrophe
- Correctly save time values when only changing the hour
- Disabled save button while saving
- Exclude songs with described audio from song picker

## 24.1.0

### New or improved features
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/generalHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function strip(value: string, type = 'file') {
// Illegal filename characters
.replace(
// eslint-disable-next-line no-control-regex
/["»«(){}+[\]$<>,/\\:*\x00-\x1F\x80-\x9F\u0000-\u001F]/gu,
/['"»«(){}+[\]$<>,/\\:*\x00-\x1F\x80-\x9F\u0000-\u001F]/gu,
'',
)
.trim()
Expand Down
65 changes: 63 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5345,7 +5345,7 @@ __metadata:
languageName: node
linkType: hard

"consola@npm:^3.2.3":
"consola@npm:^3.0.0, consola@npm:^3.2.3":
version: 3.2.3
resolution: "consola@npm:3.2.3"
checksum: 10c0/c606220524ec88a05bb1baf557e9e0e04a0c08a9c35d7a08652d99de195c4ddcb6572040a7df57a18ff38bbc13ce9880ad032d56630cef27bef72768ef0ac078
Expand Down Expand Up @@ -5656,7 +5656,7 @@ __metadata:
languageName: node
linkType: hard

"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
version: 4.3.4
resolution: "debug@npm:4.3.4"
dependencies:
Expand Down Expand Up @@ -6008,6 +6008,13 @@ __metadata:
languageName: node
linkType: hard

"dotenv@npm:^16.4.5":
version: 16.4.5
resolution: "dotenv@npm:16.4.5"
checksum: 301a12c3d44fd49888b74eb9ccf9f07a1f5df43f489e7fcb89647a2edcd84c42d6bc349dc8df099cd18f07c35c7b04685c1a4f3e6a6a9e6b30f8d48c15b7f49c
languageName: node
linkType: hard

"dotenv@npm:^9.0.2":
version: 9.0.2
resolution: "dotenv@npm:9.0.2"
Expand Down Expand Up @@ -8568,6 +8575,13 @@ __metadata:
languageName: node
linkType: hard

"lilconfig@npm:^3.0.0":
version: 3.0.0
resolution: "lilconfig@npm:3.0.0"
checksum: a155f1cd24d324ab20dd6974db9ebcf3fb6f2b60175f7c052d917ff8a746b590bc1ee550f6fc3cb1e8716c8b58304e22fe2193febebc0cf16fa86d85e6f896c5
languageName: node
linkType: hard

"lines-and-columns@npm:^1.1.6":
version: 1.2.4
resolution: "lines-and-columns@npm:1.2.4"
Expand Down Expand Up @@ -8865,6 +8879,15 @@ __metadata:
languageName: node
linkType: hard

"markdown-table@npm:^2.0.0":
version: 2.0.0
resolution: "markdown-table@npm:2.0.0"
dependencies:
repeat-string: ^1.0.0
checksum: 9bb634a9300016cbb41216c1eab44c74b6b7083ac07872e296f900a29449cf0e260ece03fa10c3e9784ab94c61664d1d147da0315f95e1336e2bdcc025615c90
languageName: node
linkType: hard

"matcher@npm:^3.0.0":
version: 3.0.0
resolution: "matcher@npm:3.0.0"
Expand Down Expand Up @@ -9165,6 +9188,15 @@ __metadata:
languageName: node
linkType: hard

"minipass-collect@npm:^2.0.1":
version: 2.0.1
resolution: "minipass-collect@npm:2.0.1"
dependencies:
minipass: ^7.0.3
checksum: b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342
languageName: node
linkType: hard

"minipass-fetch@npm:^3.0.0":
version: 3.0.4
resolution: "minipass-fetch@npm:3.0.4"
Expand Down Expand Up @@ -10848,6 +10880,24 @@ __metadata:
languageName: node
linkType: hard

"probe-image-size@npm:^7.2.3":
version: 7.2.3
resolution: "probe-image-size@npm:7.2.3"
dependencies:
lodash.merge: ^4.6.2
needle: ^2.5.2
stream-parser: ~0.3.1
checksum: 1a5eeb8f5cb979172144a5d7a017c70fcd664ccc8af9ad3a803903ee81864abea4036adae4fc6e66e9ae21bd3ce0febefaf1f32e65a77ff226b2eb61e9e4978c
languageName: node
linkType: hard

"proc-log@npm:^3.0.0":
version: 3.0.0
resolution: "proc-log@npm:3.0.0"
checksum: 02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02
languageName: node
linkType: hard

"process-nextick-args@npm:~2.0.0":
version: 2.0.1
resolution: "process-nextick-args@npm:2.0.1"
Expand Down Expand Up @@ -11526,6 +11576,17 @@ __metadata:
languageName: node
linkType: hard

"semver@npm:^7.6.0":
version: 7.6.0
resolution: "semver@npm:7.6.0"
dependencies:
lru-cache: ^6.0.0
bin:
semver: bin/semver.js
checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c
languageName: node
linkType: hard

"send@npm:0.18.0":
version: 0.18.0
resolution: "send@npm:0.18.0"
Expand Down

0 comments on commit e223f34

Please sign in to comment.