Skip to content

Commit 0ea5218

Browse files
fix: use ngc for angular module output
1 parent 591f63a commit 0ea5218

File tree

8 files changed

+35
-124
lines changed

8 files changed

+35
-124
lines changed

fuse.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ task('bundle', ['cp.jest', 'ng.modules'], () => {
6161

6262
task('ng.modules', () => {
6363
return new Promise((res, rej) => {
64-
const tsc = spawn(resolve('node_modules/.bin/tsc'), [
64+
const tsc = spawn(resolve('node_modules/.bin/ngc'), [
6565
'--p',
66-
resolve('src/modules')
66+
resolve('src/modules/tsconfig.aot.json')
6767
])
6868
tsc.on('close', res)
6969
})

package-lock.json

Lines changed: 0 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"@types/inquirer": "^0.0.42",
4343
"@types/node-sass": "^3.10.32",
4444
"@types/npm": "^2.0.29",
45-
"@types/sinon": "^5.0.1",
4645
"@types/ua-parser-js": "^0.7.32",
4746
"@types/yargs": "^11.0.0",
4847
"chokidar-cli": "^1.2.0",
@@ -53,7 +52,6 @@
5352
"prettier": "^1.13.7",
5453
"pretty-quick": "^1.6.0",
5554
"semantic-release": "^15.6.3",
56-
"sinon": "^6.1.2",
5755
"tslint-immutable": "^4.6.0",
5856
"validate-commit-msg": "^2.14.0"
5957
},

src/modules/http-cache-tag/http-cache-tag-interceptor.service.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import { Inject, Injectable } from '@angular/core'
22
import {
33
HttpHandler,
4+
HttpHeaderResponse,
45
HttpInterceptor,
6+
HttpProgressEvent,
57
HttpRequest,
6-
HttpResponse
8+
HttpResponse,
9+
HttpSentEvent,
10+
HttpUserEvent
711
} from '@angular/common/http'
812
import {
913
CACHE_TAG_CONFIG,
@@ -12,6 +16,7 @@ import {
1216
CacheTagConfig
1317
} from './http-cache-tag.server.module'
1418
import { map } from 'rxjs/operators'
19+
import { Observable } from 'rxjs'
1520

1621
// tslint:disable:no-class
1722
// tslint:disable:no-this

src/modules/tsconfig.aot.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"compilerOptions": {
3+
"target": "es5",
4+
"module": "es2015",
5+
"sourceMap": true,
6+
"moduleResolution": "node",
7+
"emitDecoratorMetadata": true,
8+
"experimentalDecorators": true,
9+
"declaration": true,
10+
"outDir": "../../.build/modules",
11+
"lib": ["es2015", "dom"]
12+
},
13+
"angularCompilerOptions": {}
14+
}

src/modules/tsconfig.json

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Directive, ElementRef, Renderer2 } from '@angular/core'
1+
// import { Directive, ElementRef, Renderer2 } from '@angular/core'
22

3-
// tslint:disable-next-line:no-class
4-
@Directive({
5-
selector: 'a[fngExternalLink]'
6-
})
7-
export class ExternalLinkDirective {
8-
constructor(el: ElementRef, rd: Renderer2) {
9-
const anchor = el.nativeElement as HTMLAnchorElement
10-
rd.setAttribute(anchor, 'target', '_blank')
11-
rd.setAttribute(anchor, 'rel', 'noopener')
12-
}
13-
}
3+
// // tslint:disable-next-line:no-class
4+
// @Directive({
5+
// selector: 'a[fngExternalLink]'
6+
// })
7+
// export class ExternalLinkDirective {
8+
// constructor(el: ElementRef, rd: Renderer2) {
9+
// const anchor = el.nativeElement as HTMLAnchorElement
10+
// rd.setAttribute(anchor, 'target', '_blank')
11+
// rd.setAttribute(anchor, 'rel', 'noopener')
12+
// }
13+
// }

src/modules/util/window.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export interface IWindowService {
99
// tslint:disable:no-this
1010
@Injectable()
1111
export class WindowService implements IWindowService {
12-
constructor(@Inject(WINDOW) private _window: Window) {}
12+
constructor(@Inject(WINDOW) private _window: any) {}
1313

1414
public window<T>(): Window & T {
1515
return this._window as Window & T

0 commit comments

Comments
 (0)