miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(angular): update remote entry component selector to use the provided prefix (#10561)

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2022-06-02 17:23:54 +01:00 committed by GitHub
parent 7ce487e492
commit edea01aee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/angular/src/generators/setup-mfe/__snapshots__/setup-mfe.spec.ts.snap
View File

@ -108,3 +108,43 @@ exports[`Init MFE should create webpack and mfe configs correctly 4`] = `
},
}"
`;
exports[`Init MFE should generate the remote entry component correctly when prefix is not provided 1`] = `
"import { Component } from '@angular/core';
@Component({
selector: 'remote1-entry',
template: \`nx-welcome></nx-welcome>\`
})
export class RemoteEntryComponent {}
"
`;
exports[`Init MFE should generate the remote entry module and component correctly 1`] = `
"import { Component } from '@angular/core';
@Component({
selector: 'my-org-remote1-entry',
template: \`<my-org-nx-welcome></my-org-nx-welcome>\`
})
export class RemoteEntryComponent {}
"
`;
exports[`Init MFE should generate the remote entry module and component correctly 2`] = `
"import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RemoteEntryComponent } from './entry.component';
import { NxWelcomeComponent } from './nx-welcome.component';
@NgModule({
declarations: [RemoteEntryComponent, NxWelcomeComponent],
imports: [
CommonModule,
],
providers: [],
exports: [RemoteEntryComponent],
})
export class RemoteEntryModule {}"
`;

6
packages/angular/src/generators/setup-mfe/files/entry-module-files/entry.component.ts__tmpl__
View File

@ -1,7 +1,9 @@
import { Component } from '@angular/core';
@Component({
@Component({<% if (prefix) { %>
selector: '<%= prefix %>-<%= appName %>-entry',
template: `<<%= prefix %>-nx-welcome></<%= prefix %>-nx-welcome>`<% } else { %>
selector: '<%= appName %>-entry',
template: `<<%= prefix %>-nx-welcome></<%= prefix %>-nx-welcome>`
template: `nx-welcome></nx-welcome>`<% } %>
})
export class RemoteEntryComponent {}

8
packages/angular/src/generators/setup-mfe/files/entry-module-files/entry.module.ts__tmpl__
View File

@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
<% if(routing) { %>import { RouterModule } from '@angular/router';<% } %>
import { CommonModule } from '@angular/common';<% if(routing) { %>
import { RouterModule } from '@angular/router';<% } %>
import { RemoteEntryComponent } from './entry.component';
import { NxWelcomeComponent } from './nx-welcome.component';
@ -8,8 +8,8 @@ import { NxWelcomeComponent } from './nx-welcome.component';
@NgModule({
declarations: [RemoteEntryComponent, NxWelcomeComponent],
imports: [
CommonModule,
<% if(routing) { %>RouterModule.forChild([
CommonModule,<% if(routing) { %>
RouterModule.forChild([
{
path: '',
component: RemoteEntryComponent,

27
packages/angular/src/generators/setup-mfe/setup-mfe.spec.ts
View File

@ -131,6 +131,33 @@ describe('Init MFE', () => {
}
);
it('should generate the remote entry module and component correctly', async () => {
// ACT
await setupMfe(tree, {
appName: 'remote1',
mfeType: 'remote',
prefix: 'my-org',
});
// ASSERT
expect(
tree.read('apps/remote1/src/app/remote-entry/entry.component.ts', 'utf-8')
).toMatchSnapshot();
expect(
tree.read('apps/remote1/src/app/remote-entry/entry.module.ts', 'utf-8')
).toMatchSnapshot();
});
it('should generate the remote entry component correctly when prefix is not provided', async () => {
// ACT
await setupMfe(tree, { appName: 'remote1', mfeType: 'remote' });
// ASSERT
expect(
tree.read('apps/remote1/src/app/remote-entry/entry.component.ts', 'utf-8')
).toMatchSnapshot();
});
it('should add the remote config to the host when --remotes flag supplied', async () => {
// ACT
await setupMfe(tree, {