Skip to content

Fix module packaging #24

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/fontawesome.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

import { FaIconComponent } from './icon';
import { FaLayersComponent, FaLayersTextComponent, FaLayersCounterComponent } from './layers';
import { FaIconComponent } from './icon/icon.component';
import { FaLayersComponent } from './layers/layers.component';
import { FaLayersTextComponent } from './layers/layers-text.component';
import { FaLayersCounterComponent } from './layers/layers-counter.component';

@NgModule({
imports: [CommonModule],
Expand Down
10 changes: 7 additions & 3 deletions src/icon/icon.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ import {
} from '@fortawesome/fontawesome-svg-core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';

import { faNotFoundIconHtml, faWarnIfIconHtmlMissing, faWarnIfIconSpecMissing} from '../shared/errors';
import { objectWithKey, faClassList, faNormalizeIconSpec } from '../shared/utils';
import { FaProps } from '../shared/models';
import { faNormalizeIconSpec } from '../shared/utils/normalize-icon-spec.util';
import { FaProps } from '../shared/models/props.model';
import { objectWithKey } from '../shared/utils/object-with-keys.util';
import { faClassList } from '../shared/utils/classlist.util';
import { faWarnIfIconHtmlMissing } from '../shared/errors/warn-if-icon-html-missing';
import { faWarnIfIconSpecMissing } from '../shared/errors/warn-if-icon-spec-missing';
import { faNotFoundIconHtml } from '../shared/errors/not-found-icon-html';

/**
* Fontawesome icon.
Expand Down
1 change: 0 additions & 1 deletion src/icon/index.ts

This file was deleted.

8 changes: 5 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export * from './fontawesome.module';
export { FaProps } from './shared/models';
export { FaIconComponent } from './icon';
export { FaLayersComponent, FaLayersTextComponent, FaLayersCounterComponent } from './layers';
export { FaProps } from './shared/models/props.model';
export { FaIconComponent } from './icon/icon.component';
export { FaLayersComponent } from './layers/layers.component';
export { FaLayersTextComponent } from './layers/layers-text.component';
export { FaLayersCounterComponent } from './layers/layers-counter.component';
3 changes: 0 additions & 3 deletions src/layers/index.ts

This file was deleted.

10 changes: 4 additions & 6 deletions src/layers/layers-text-base.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
Input,
Inject,
Injectable,
Optional,
OnChanges,
Component,
forwardRef,
HostBinding,
SimpleChanges
Expand All @@ -14,13 +14,11 @@ import {
TextParams
} from '@fortawesome/fontawesome-svg-core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { faWarnIfParentNotExist } from '../shared/errors';

import { FaLayersComponent } from './layers.component';
import { faWarnIfParentNotExist } from '../shared/errors/warn-if-parent-not-exist';

@Component({
selector: 'fa-layers-text-base',
template: ''
})
@Injectable()
export abstract class FaLayersTextBaseComponent implements OnChanges {

constructor(@Inject(forwardRef(() => FaLayersComponent)) @Optional() private parent: FaLayersComponent,
Expand Down
5 changes: 3 additions & 2 deletions src/layers/layers-text.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ import {
} from '@fortawesome/fontawesome-svg-core';
import { FaLayersTextBaseComponent } from './layers-text-base.component';

import { objectWithKey, faClassList } from '../shared/utils';
import { FaProps } from '../shared/models';
import { FaProps } from '../shared/models/props.model';
import { objectWithKey } from '../shared/utils/object-with-keys.util';
import { faClassList } from '../shared/utils/classlist.util';

/**
* Fontawesome layers text.
Expand Down
2 changes: 1 addition & 1 deletion src/layers/layers.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, Type } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faUser, faMobile } from '@fortawesome/free-solid-svg-icons';

import { FaIconComponent } from '../icon';
import { FaIconComponent } from '../icon/icon.component';
import { FaLayersComponent } from './layers.component';
import { FaLayersTextComponent } from './layers-text.component';

Expand Down
4 changes: 0 additions & 4 deletions src/shared/errors/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/shared/models/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/shared/utils/classlist.util.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FaProps } from '../models';
import { FaProps } from '../models/props.model';

/**
* Fontawesome class list.
Expand Down
4 changes: 0 additions & 4 deletions src/shared/utils/index.ts

This file was deleted.