Skip to content

Fixes schema and docs #12053

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 2 commits into from
Sep 6, 2018
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
2 changes: 1 addition & 1 deletion packages/angular/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Scaffold | Usage



angular-cli will add reference to `components`, `directives` and `pipes` automatically in the `app.module.ts`. If you need to add this references to another custom module, follow this steps:
angular-cli will add reference to `components`, `directives` and `pipes` automatically in the `app.module.ts`. If you need to add this references to another custom module, follow these steps:

1. `ng g module new-module` to create a new module
2. call `ng g component new-module/new-component`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export interface BrowserBuilderSchema {
/**
* Replace files with other files in the build.
*/
fileReplacements: FileReplacements[];
fileReplacements: FileReplacement[];

/**
* Path where output will be placed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {

// Extracting i18n uses the browser target webpack config with some specific options.
const webpackConfig = this.buildWebpackConfig(root, projectRoot, {
...browserOptions,
// todo: remove this casting when 'CurrentFileReplacement' is changed to 'FileReplacement'
...(browserOptions as NormalizedBrowserBuilderSchema),
optimization: false,
i18nLocale: options.i18nLocale,
i18nFormat: options.i18nFormat,
Expand Down
11 changes: 7 additions & 4 deletions packages/angular_devkit/build_angular/src/server/schema.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { FileReplacement } from '../browser/schema';

export interface BuildWebpackServerSchema {
/**
* The name of the TypeScript configuration file.
Expand Down Expand Up @@ -80,7 +83,7 @@ export interface BuildWebpackServerSchema {
/**
* Replace files with other files in the build.
*/
fileReplacements: FileReplacements[];
fileReplacements: FileReplacement[];
/**
* Define the output filename cache-busting hashing mode.
*/
Expand Down Expand Up @@ -125,9 +128,9 @@ export interface BuildWebpackServerSchema {
* Run build when files change.
*/
watch?: boolean;
/**
* Enable and define the file watching poll time period in milliseconds.
*/
/**
* Enable and define the file watching poll time period in milliseconds.
*/
poll?: number;
}

Expand Down