Skip to content

Commit 6a7c567

Browse files
committed
Fix build issues
Barrel exports are problematic angular/angular-cli#1831
1 parent 0191cc8 commit 6a7c567

File tree

15 files changed

+7065
-7070
lines changed

15 files changed

+7065
-7070
lines changed

myadmin-angular/angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,5 +497,5 @@
497497
}
498498
}
499499
},
500-
"defaultProject": "exam-timetable-app"
500+
"defaultProject": "myadmin-lib"
501501
}

myadmin-angular/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@
3636
"zone.js": "^0.8.26"
3737
},
3838
"devDependencies": {
39-
"@angular/compiler-cli": "^6.0.3",
4039
"@angular-devkit/build-angular": "~0.6.5",
41-
"typescript": "~2.7.2",
4240
"@angular-devkit/build-ng-packagr": "~0.6.5",
43-
"@angular/cli": "~6.0.5",
41+
"@angular/cli": "^6.0.7",
42+
"@angular/compiler-cli": "^6.0.3",
4443
"@angular/language-service": "^6.0.3",
4544
"@types/jasmine": "~2.8.6",
4645
"@types/jasminewd2": "~2.0.3",
@@ -58,6 +57,7 @@
5857
"ts-node": "~5.0.1",
5958
"tsickle": ">=0.25.5",
6059
"tslib": "^1.7.1",
61-
"tslint": "~5.9.1"
60+
"tslint": "~5.9.1",
61+
"typescript": "~2.7.2"
6262
}
63-
}
63+
}

myadmin-angular/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<frontend.maven.plugin.version>1.6</frontend.maven.plugin.version>
22-
<node.version>v8.11.2</node.version>
22+
<node.version>v8.10.0</node.version>
2323
<yarn.version>v1.7.0</yarn.version>
2424
</properties>
2525

myadmin-angular/projects/exam-timetable-app/src/app/components/exam-timetable-search/exam-timetable-search.component.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from "@angul
88
import {atleastOneCourseCode} from "./atleast-one.validator";
99
import {selectedExamPeriod} from "./exam-period.validator";
1010
import {BlockUI, NgBlockUI} from "ng-block-ui";
11-
import {OrderByPipe} from "../../directives/orderby.pipe";
11+
import {DescriptionPipe, OrderByPipe} from "myadmin-lib";
1212
import {Observable} from "rxjs/Rx";
13-
import {tap} from "rxjs/internal/operators";
13+
import {tap} from "rxjs/operators";
1414

1515
/**
1616
* Component to allow a user to enter criteria to search for an exam timetable.
@@ -20,7 +20,8 @@ import {tap} from "rxjs/internal/operators";
2020
templateUrl: './exam-timetable-search.component.html',
2121
styleUrls: ['./exam-timetable-search.component.scss'],
2222
providers : [
23-
OrderByPipe
23+
OrderByPipe,
24+
DescriptionPipe,
2425
]
2526
})
2627
export class ExamTimetableSearchComponent implements OnInit {

myadmin-angular/projects/myadmin-lib/src/lib/config/index.ts

-1
This file was deleted.

myadmin-angular/projects/myadmin-lib/src/lib/http-interceptors/http-error-interceptor.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {Injectable, Injector} from '@angular/core';
22
import {HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';
33
import {Observable, throwError} from 'rxjs';
4-
import {catchError} from "rxjs/internal/operators";
4+
import {catchError} from "rxjs/operators";
55
import {ToasterNotificationService} from "../services/toaster-notification.service";
6-
import {ErrorInfo} from "../info-objects";
6+
import {ErrorInfo} from "../info-objects/error-info";
77

88
@Injectable()
99
export class HttpErrorInterceptor implements HttpInterceptor {

myadmin-angular/projects/myadmin-lib/src/lib/http-interceptors/index.ts

-1
This file was deleted.

myadmin-angular/projects/myadmin-lib/src/lib/info-objects/index.ts

-2
This file was deleted.

myadmin-angular/projects/myadmin-lib/src/lib/myadmin-lib.component.ts

-19
This file was deleted.

myadmin-angular/projects/myadmin-lib/src/lib/myadmin-lib.module.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
import { NgModule } from '@angular/core';
2-
import { MyadminLibComponent } from './myadmin-lib.component';
32
import {ToasterContainerComponent, ToasterModule, ToasterService} from "angular2-toaster";
43
import {ToasterNotificationService} from "./services/toaster-notification.service";
5-
import {DescriptionPipe, ShortDescriptionPipe, OrderByPipe} from "./pipes";
4+
import {OrderByPipe} from "./pipes/orderby.pipe";
5+
import {ShortDescriptionPipe} from "./pipes/short-description.pipe";
6+
import {DescriptionPipe} from "./pipes/description.pipe";
7+
68

79
@NgModule({
810
imports: [
911
ToasterModule,
1012
],
1113
declarations: [
12-
MyadminLibComponent,
1314
OrderByPipe,
1415
ShortDescriptionPipe,
1516
DescriptionPipe,
1617
],
1718
exports: [
18-
MyadminLibComponent,
1919
ToasterContainerComponent,
20-
20+
ShortDescriptionPipe,
21+
DescriptionPipe,
2122
],
2223
providers:[
2324
ToasterService,

myadmin-angular/projects/myadmin-lib/src/lib/pipes/description.pipe.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Pipe, PipeTransform } from '@angular/core';
2-
import {DescriptionInfo} from "myadmin-lib";
2+
import {DescriptionInfo} from "../info-objects/description-info";
33

44
/**
55
* Filter to get the description of a list of DescriptionInfo objects that matches
66
* the request locale.
77
*/
88
@Pipe({
9-
name: 'description'
9+
name: 'description',
1010
})
1111
export class DescriptionPipe implements PipeTransform {
1212

myadmin-angular/projects/myadmin-lib/src/lib/pipes/index.ts

-3
This file was deleted.

myadmin-angular/projects/myadmin-lib/src/lib/pipes/short-description.pipe.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Pipe, PipeTransform } from '@angular/core';
2-
import {DescriptionInfo} from "myadmin-lib";
2+
import {DescriptionInfo} from "../info-objects/description-info";
33

44
/**
55
* Filter to get the short description of a list of DescriptionInfo objects that matches

myadmin-angular/projects/myadmin-lib/src/public_api.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
* Public API Surface of myadmin-lib
33
*/
44

5-
export * from './lib/services/toaster-notification.service';
6-
export * from './lib/myadmin-lib.component';
7-
export * from './lib/myadmin-lib.module';
8-
export * from './lib/info-objects';
9-
export * from './lib/pipes';
10-
export * from './lib/http-interceptors';
11-
export * from './lib/config';
5+
export {ErrorInfo} from './lib/info-objects/error-info';
6+
export { DescriptionInfo} from './lib/info-objects/description-info';
7+
export {DescriptionPipe} from './lib/pipes/description.pipe';
8+
export {ShortDescriptionPipe} from './lib/pipes/short-description.pipe';
9+
export {OrderByPipe} from './lib/pipes/orderby.pipe';
10+
export {unisaToasterConfig} from './lib/config/toaster-config';
11+
export {ToasterNotificationService} from './lib/services/toaster-notification.service';
12+
export {HttpErrorInterceptor} from './lib/http-interceptors/http-error-interceptor';
13+
export {MyadminLibModule} from './lib/myadmin-lib.module';

0 commit comments

Comments
 (0)