Skip to content

Commit

Permalink
Merge pull request #656 from TriliumNext/renovate/typescript-5.x
Browse files Browse the repository at this point in the history
chore(deps): update dependency typescript to v5.7.2
  • Loading branch information
eliandoran authored Dec 7, 2024
2 parents 7322a88 + 03dbf1a commit 154bd92
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,23 @@ jobs:
context: .
cache-from: type=gha
cache-to: type=gha,mode=max
test_dev:
name: Test development
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v4

- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"

- run: npm ci

- name: Run the TypeScript build
run: npx tsc
test_docker:
name: Check Docker build
runs-on: ubuntu-latest
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
"ts-node": "10.9.2",
"tslib": "2.8.1",
"tsx": "4.19.2",
"typescript": "5.6.3",
"typescript": "5.7.2",
"webpack": "5.97.1",
"webpack-cli": "5.1.4"
}
Expand Down
4 changes: 2 additions & 2 deletions src/services/search/services/parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function getExpression(tokens: TokenData[], searchContext: SearchContext, level
return `"${startIndex !== 0 ? "..." : ""}${searchContext.originalQuery.substr(startIndex, endIndex - startIndex)}${endIndex !== searchContext.originalQuery.length ? "..." : ""}"`;
}

function resolveConstantOperand() {
const resolveConstantOperand = () => {
const operand = tokens[i];

if (!operand.inQuotes
Expand Down Expand Up @@ -136,7 +136,7 @@ function getExpression(tokens: TokenData[], searchContext: SearchContext, level
return date.format(format);
}

function parseNoteProperty(): Expression | undefined | null {
const parseNoteProperty: () => Expression | undefined | null = () => {
if (tokens[i].token !== '.') {
searchContext.addError('Expected "." to separate field path');
return;
Expand Down

0 comments on commit 154bd92

Please sign in to comment.