Skip to content

Commit 87a949b

Browse files
committed
ci: Change branch for start job
1 parent 07a58d7 commit 87a949b

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"error",
99
{
1010
"enforceBuildableLibDependency": true,
11-
"allow": [],
11+
"allow": ["json-shared-type", "shared-utils"],
1212
"depConstraints": [
1313
{
1414
"sourceTag": "*",

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# This line is needed for nx affected to work when CI is running on a PR
1919
- run: git branch --track main origin/master
2020
- name: Test and build
21-
run: npx nx affected -t lint test build --parallel=3 --exclude='json-api-front,json-api-server,json-api-server-e2e,shared-utils,json-shared-type,database'
21+
run: npx nx affected -t test build --parallel=3 --exclude='json-api-front,json-api-server,json-api-server-e2e,json-shared-type,database,@nestjs-json-api/source'
2222
- name: Cache npm dependencies
2323
id: cache-dependencies-save
2424
uses: actions/cache/save@v4

libs/json-api/json-api-nestjs/src/lib/helper/bind-controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function bindController(
4242
if (!allowMethod.includes(name)) continue;
4343
}
4444

45-
if (!controller.prototype.hasOwnProperty(name)) {
45+
if (!Object.prototype.hasOwnProperty.call(controller, name)) {
4646
// need uniq descriptor for correct work swagger
4747
Reflect.defineProperty(controller.prototype, name, {
4848
value: function (

libs/json-api/json-api-nestjs/src/lib/helper/create-controller.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ export function createController(
2727
const entityName =
2828
entity instanceof Function ? entity.name : entity.options.name;
2929

30-
if (!JsonBaseController.isPrototypeOf(controllerClass)) {
30+
if (
31+
!Object.prototype.isPrototypeOf.call(JsonBaseController, controllerClass)
32+
) {
3133
throw new Error(
3234
`Controller "${controller?.name}" should be inherited of "JsonBaseController"`
3335
);

0 commit comments

Comments
 (0)