Skip to content
This repository was archived by the owner on Dec 14, 2024. It is now read-only.

Commit e2a5d59

Browse files
committed
Merge branch 'development'
2 parents 875f7e6 + 7cc27f4 commit e2a5d59

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ updates:
66
interval: "weekly"
77
target-branch: master
88
commit-message:
9-
prefix: "build"
9+
prefix: "fix"
1010
allow:
1111
- dependency-type: production
1212
- dependency-name: "rxjs"

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
with:
2222
fetch-depth: 0
2323

24-
- uses: actions/setup-node@v2
24+
- uses: actions/setup-node@v3
2525
with:
2626
node-version: "lts/*"
2727
registry-url: "https://registry.npmjs.org"
2828

2929
- name: Lint commit message
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32-
uses: wagoid/commitlint-github-action@v4.1.12
32+
uses: wagoid/commitlint-github-action@v5.3.0
3333

3434
- name: Install
3535
run: npm run bootstrap:ci

commitlint.config.js

+13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1+
// @ts-check
2+
3+
// Extend scopes for dependabot
4+
const configLernaScopes = require("@commitlint/config-lerna-scopes");
5+
const scopeEnum = async (context) => {
6+
const lernaScopes = await configLernaScopes.rules["scope-enum"](context);
7+
const [level, applicable, scopes] = lernaScopes;
8+
return [level, applicable, [...scopes, "deps"]];
9+
};
10+
111
module.exports = {
212
extends: [
313
"@commitlint/config-conventional",
414
"@commitlint/config-lerna-scopes",
515
],
16+
rules: {
17+
"scope-enum": scopeEnum,
18+
},
619
};

packages/dexie-addon-suite/test/unit-tests/karma/addon-suite.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ describe("dexie-addon-suite addon-suite.spec", () => {
945945
setTimeout(() => waits[1].resolve(), 500);
946946
await waits[1].promise;
947947
expect(emitCount).toBe(2);
948-
}, 99999999);
948+
});
949949

950950
it("should not use the reference passed to the user to determine populated changes", async () => {
951951
let friendObs: Populated<Friend>;
@@ -980,7 +980,7 @@ describe("dexie-addon-suite addon-suite.spec", () => {
980980
setTimeout(() => waits[1].resolve(), 500);
981981
await waits[1].promise;
982982
expect(emitCount).toBe(2);
983-
}, 99999999);
983+
});
984984
});
985985
});
986986
});

packages/dexie-encrypted-addon/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ As mentioned in the provided link add:
4848
```
4949

5050
to your angular.json file.
51-
The [tweetnacl package](https://www.npmjs.com/package/tweetnacl) handles te encryption and is not bundled in the main npm package (it is bundled in the min version) so it will be updated on patches.
51+
The [tweetnacl package](https://www.npmjs.com/package/tweetnacl) handles the encryption and is not bundled in the main npm package (it is bundled in the min version) so it will be updated on patches.
5252

5353
## Documentation
5454

packages/dexie-rxjs-addon/test/unit-tests/karma/dexie-rxjs.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ describe("dexie-rxjs-addon dexie-rxjs.spec", () => {
646646
setTimeout(() => waits[1].resolve(), 500);
647647
await waits[1].promise;
648648
expect(emitCount).toBe(2);
649-
}, 99999999);
649+
});
650650
});
651651
});
652652
});

0 commit comments

Comments
 (0)