amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2026-02-15 20:25:59 +01:00
parent 65615baafb
commit d617106f5a
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/core/hooks/on-app-shutdown.hook.ts
View File

@@ -1,18 +1,9 @@
import type { OnApplicationShutdown } from '@nestjs/common'; import type { OnApplicationShutdown } from '@nestjs/common';
import { iterate } from 'iterare';
<<<<<<< HEAD
import { Module } from '../injector/module';
import { getInstancesGroupedByHierarchyLevel } from './utils/get-instances-grouped-by-hierarchy-level';
import { getSortedHierarchyLevels } from './utils/get-sorted-hierarchy-levels';
=======
import {
getNonTransientInstances,
getTransientInstances,
} from '../injector/helpers/transient-instances.js';
import { InstanceWrapper } from '../injector/instance-wrapper.js';
import { Module } from '../injector/module.js';
import { isFunction, isNil } from '@nestjs/common/internal'; import { isFunction, isNil } from '@nestjs/common/internal';
>>>>>>> v12.0.0 import { iterate } from 'iterare';
import { Module } from '../injector/module.js';
import { getInstancesGroupedByHierarchyLevel } from './utils/get-instances-grouped-by-hierarchy-level.js';
import { getSortedHierarchyLevels } from './utils/get-sorted-hierarchy-levels.js';
/** /**
* Checks if the given instance has the `onApplicationShutdown` function * Checks if the given instance has the `onApplicationShutdown` function

2
packages/core/hooks/utils/get-instances-grouped-by-hierarchy-level.ts
View File

@@ -1,5 +1,5 @@
import { InjectionToken } from '@nestjs/common'; import { InjectionToken } from '@nestjs/common';
import { InstanceWrapper } from '../../injector/instance-wrapper'; import { InstanceWrapper } from '../../injector/instance-wrapper.js';
export function getInstancesGroupedByHierarchyLevel( export function getInstancesGroupedByHierarchyLevel(
...collections: Array< ...collections: Array<