-
Notifications
You must be signed in to change notification settings - Fork 12k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(@angular-devkit/build-optimizer): use TypeScript 3.6
Fixes: #17320
- Loading branch information
Showing
5 changed files
with
86 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,74 @@ | ||
| import { getGlobalVariable } from '../../utils/env'; | ||
| import { replaceInFile } from '../../utils/fs'; | ||
| import { ng, silentNpm } from '../../utils/process'; | ||
| import { updateJsonFile } from '../../utils/project'; | ||
|
|
||
| const snapshots = require('../../ng-snapshot/package.json'); | ||
|
|
||
| export default async function () { | ||
| await ng('add', '@angular/material'); | ||
|
|
||
| const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots']; | ||
| if (isSnapshotBuild) { | ||
| await updateJsonFile('package.json', packageJson => { | ||
| const dependencies = packageJson['dependencies']; | ||
| // Angular material adds dependencies on other Angular packages | ||
| // Iterate over all of the packages to update them to the snapshot version. | ||
| for (const [name, version] of Object.entries(snapshots.dependencies)) { | ||
| if (name in dependencies) { | ||
| dependencies[name] = version; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| await ng('add', '@angular/material'); | ||
|
|
||
| const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots']; | ||
| if (isSnapshotBuild) { | ||
| await updateJsonFile('package.json', (packageJson) => { | ||
| const dependencies = packageJson['dependencies']; | ||
| // Angular material adds dependencies on other Angular packages | ||
| // Iterate over all of the packages to update them to the snapshot version. | ||
| for (const [name, version] of Object.entries(snapshots.dependencies)) { | ||
| if (name in dependencies) { | ||
| dependencies[name] = version; | ||
| } | ||
| } | ||
|
|
||
| dependencies['@angular/material-moment-adapter'] = | ||
| snapshots.dependencies['@angular/material-moment-adapter']; | ||
| }); | ||
|
|
||
| await silentNpm('install'); | ||
| await ng('build', '--prod'); | ||
| } else { | ||
| await silentNpm('install', '@angular/material-moment-adapter'); | ||
| } | ||
|
|
||
| await silentNpm('install', 'moment'); | ||
|
|
||
| await ng('build', '--prod'); | ||
|
|
||
| // Ensure moment adapter works (uses unique importing mechanism for moment) | ||
| // Issue: https://github.com/angular/angular-cli/issues/17320 | ||
| await replaceInFile( | ||
| 'src/app/app.module.ts', | ||
| `import { AppComponent } from './app.component';`, | ||
| ` | ||
| import { AppComponent } from './app.component'; | ||
| import { | ||
| MomentDateAdapter, | ||
| MAT_MOMENT_DATE_FORMATS | ||
| } from '@angular/material-moment-adapter'; | ||
| import { | ||
| DateAdapter, | ||
| MAT_DATE_LOCALE, | ||
| MAT_DATE_FORMATS | ||
| } from '@angular/material/core'; | ||
| `, | ||
| ); | ||
|
|
||
| await replaceInFile( | ||
| 'src/app/app.module.ts', | ||
| `providers: []`, | ||
| ` | ||
| providers: [ | ||
| { | ||
| provide: DateAdapter, | ||
| useClass: MomentDateAdapter, | ||
| deps: [MAT_DATE_LOCALE] | ||
| }, | ||
| { | ||
| provide: MAT_DATE_FORMATS, | ||
| useValue: MAT_MOMENT_DATE_FORMATS | ||
| } | ||
| ] | ||
| `, | ||
| ); | ||
|
|
||
| await ng('e2e', '--prod'); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters