Skip to content

Commit

Permalink
refactor(): correct folder structure issues on lib modules
Browse files Browse the repository at this point in the history
* Simplified the inner folder structure
* Remove inner modules in extensions lib
* Expose nested modules by directly pointing
instead of using barrels.
See ng-packagr/ng-packagr/issues/195#issuecomment-342951630
  • Loading branch information
FIXED-TERM Toledo Navarro Jose Ignacio (BueP/ICO) committed Oct 20, 2018
1 parent f409878 commit b545c80
Show file tree
Hide file tree
Showing 25 changed files with 22 additions and 58 deletions.
8 changes: 5 additions & 3 deletions projects/extensions/src/lib/common/common.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { NgModule } from '@angular/core';

import { NgxLetModule, NgxRepeatModule } from './directives';
import { NgxNestedValueModule } from './pipes';
import { NgxLet } from './let/let.directive';
import { NgxeRepeat } from './repeat/repeat.directive';
import { NgxNestedValuePipe } from './nested-value/nested-value.pipe';

@NgModule({
exports: [NgxLetModule, NgxRepeatModule, NgxNestedValueModule]
declarations: [NgxLet, NgxeRepeat, NgxNestedValuePipe],
exports: [NgxLet, NgxeRepeat, NgxNestedValuePipe]
})
export class NgxCommonModule {}
2 changes: 0 additions & 2 deletions projects/extensions/src/lib/common/directives/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion projects/extensions/src/lib/common/directives/let/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable, Subject } from 'rxjs';

import { NgxLetModule } from './let.module';
import { NgxLet } from './let.directive';

@Component({ selector: 'ngx-test-cmp', template: '' })
class TestComponent {
Expand Down Expand Up @@ -35,8 +35,7 @@ describe('NgxLet', () => {

beforeEach(() => {
TestBed.configureTestingModule({
declarations: [TestComponent],
imports: [NgxLetModule]
declarations: [TestComponent, NgxLet]
});
});

Expand Down
1 change: 0 additions & 1 deletion projects/extensions/src/lib/common/pipes/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 3 additions & 2 deletions projects/extensions/src/lib/common/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './common.module';
export * from './directives';
export * from './pipes';
export * from './let/let.directive';
export * from './repeat/repeat.directive';
export * from './nested-value/nested-value.pipe';

This file was deleted.

This file was deleted.

4 changes: 3 additions & 1 deletion projects/extensions/src/lib/router/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
export * from './router.module';
export * from './parametrised-router-link';
export * from './parametrised-router-link/parametrised-link-evaluator';
export * from './parametrised-router-link/parametrised-router-link.directive';
export * from './parametrised-router-link/route-parametrised-link-evaluator';
8 changes: 5 additions & 3 deletions projects/extensions/src/lib/router/router.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { NgModule, ModuleWithProviders, Provider } from '@angular/core';

import {
NGX_EVALUATION_OPTIONS,
DefaultEvaluationOptions,
NgxParametrisedRouterLinkWithHrefDirective,
NgxParametrisedRouterLinkDirective
} from './parametrised-router-link';
} from './parametrised-router-link/parametrised-router-link.directive';
import {
NGX_EVALUATION_OPTIONS,
DefaultEvaluationOptions
} from './parametrised-router-link/parametrised-link-evaluator';

export interface NgxRouterModuleConfig {
evaluationOptions?: Provider;
Expand Down
6 changes: 3 additions & 3 deletions projects/extensions/src/public_api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Public API Surface of ngx-extensions
* Public API Surface of @ngx-extensions/extensions
*/

export * from './lib/common';
export * from './lib/router';
export * from './lib/common/index';
export * from './lib/router/index';
2 changes: 1 addition & 1 deletion projects/screenfull/src/public_api.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Public API Surface of screenfull
* Public API Surface of @ngx-extensions/screenfull
*/

export * from './lib/screenfull.module';
Expand Down

0 comments on commit b545c80

Please sign in to comment.