Skip to content

fix(core): mark NgModule as not the root if APP_ROOT is set to false #24814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vikerman wants to merge 1 commit into from
Closed

fix(core): mark NgModule as not the root if APP_ROOT is set to false #24814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/view/ng_module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function moduleDef(providers: NgModuleProviderDef[]): NgModuleDefinition
let isRoot: boolean = false;
for (let i = 0; i < providers.length; i++) {
const provider = providers[i];
if (provider.token === APP_ROOT) {
if (provider.token === APP_ROOT && provider.value === true) {
isRoot = true;
}
if (provider.flags & NodeFlags.TypeNgModule) {
Expand Down
26 changes: 26 additions & 0 deletions packages/core/test/view/ng_module_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {NgModuleDefinition, NgModuleProviderDef, NodeFlags} from '@angular/core/
import {moduleDef, moduleProvideDef, resolveNgModuleDep} from '@angular/core/src/view/ng_module';
import {createNgModuleRef} from '@angular/core/src/view/refs';
import {tokenKey} from '@angular/core/src/view/util';
import {APP_ROOT} from '../../src/di/scope';

class Foo {}

Expand Down Expand Up @@ -229,4 +230,29 @@ describe('NgModuleRef_ injector', () => {
ref.destroy();
expect(Service.destroyed).toBe(1);
});

describe('moduleDef', () => {
function createProvider(token: any, value: any) {
return {
index: 0,
flags: NodeFlags.TypeValueProvider | NodeFlags.LazyProvider,
deps: [], token, value
};
}

it('sets isRoot to `true` when APP_ROOT is `true`', () => {
const def = moduleDef([createProvider(APP_ROOT, true)]);
expect(def.isRoot).toBe(true);
});

it('sets isRoot to `false` when APP_ROOT is absent', () => {
const def = moduleDef([]);
expect(def.isRoot).toBe(false);
});

it('sets isRoot to `false` when APP_ROOT is `false`', () => {
const def = moduleDef([createProvider(APP_ROOT, false)]);
expect(def.isRoot).toBe(false);
});
});
});