Skip to content

Commit edeea80

Browse files
committed
fix aot
1 parent a271e8c commit edeea80

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/demo-app/datepicker/moment-datepicker.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from '@angular/core';
2-
import {DateAdapter, MAT_DATE_LOCALE_PROVIDER, MD_DATE_FORMATS} from '@angular/material';
3-
import {MomentDateAdapter, MD_MOMENT_DATE_FORMATS} from '@angular/material-moment-adapter';
1+
import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
2+
import {DateAdapter, MAT_DATE_LOCALE, MD_DATE_FORMATS} from '@angular/material';
3+
import {MD_MOMENT_DATE_FORMATS, MomentDateAdapter} from '@angular/material-moment-adapter';
44
import * as moment from 'moment';
55

66

@@ -10,8 +10,7 @@ import * as moment from 'moment';
1010
templateUrl: 'moment-datepicker.html',
1111
changeDetection: ChangeDetectionStrategy.OnPush,
1212
providers: [
13-
MAT_DATE_LOCALE_PROVIDER,
14-
{provide: DateAdapter, useClass: MomentDateAdapter},
13+
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
1514
{provide: MD_DATE_FORMATS, useValue: MD_MOMENT_DATE_FORMATS},
1615
],
1716
})

src/material-moment-adapter/adapter/index.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {DateAdapter, MAT_DATE_LOCALE_PROVIDER, MD_DATE_FORMATS} from '@angular/material';
10+
import {
11+
DateAdapter,
12+
MAT_DATE_LOCALE,
13+
MAT_DATE_LOCALE_PROVIDER,
14+
MD_DATE_FORMATS
15+
} from '@angular/material';
1116
import {MomentDateAdapter} from './moment-date-adapter';
1217
import {MD_MOMENT_DATE_FORMATS} from './moment-date-formats';
1318

@@ -18,7 +23,7 @@ export * from './moment-date-formats';
1823
@NgModule({
1924
providers: [
2025
MAT_DATE_LOCALE_PROVIDER,
21-
{provide: DateAdapter, useClass: MomentDateAdapter}
26+
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}
2227
],
2328
})
2429
export class MomentDateModule {}

tools/gulp/tasks/aot.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const tsconfigFile = join(demoAppOut, 'tsconfig-aot.json');
1818
/** Builds the demo-app and material. To be able to run NGC, apply the metadata workaround. */
1919
task('aot:deps', sequenceTask(
2020
'build:devapp',
21-
['material:build-release', 'cdk:build-release'],
21+
['material:build-release', 'cdk:build-release', 'material-moment-adapter:build-release'],
2222
'aot:copy-release'
2323
));
2424

@@ -27,6 +27,8 @@ task('aot:deps', sequenceTask(
2727
task('aot:copy-release', () => {
2828
copySync(join(releasesDir, 'material'), join(demoAppOut, 'material'));
2929
copySync(join(releasesDir, 'cdk'), join(demoAppOut, 'cdk'));
30+
copySync(
31+
join(releasesDir, 'material-moment-adapter'), join(demoAppOut, 'material-moment-adapter'));
3032
});
3133

3234
/** Build the demo-app and a release to confirm that the library is AOT-compatible. */

0 commit comments

Comments
 (0)