docs: Fix a few typos (#43051)
There are small typos in: - aio/content/guide/universal.md - aio/content/guide/upgrade.md - aio/content/guide/workspace-config.md - dev-infra/ng-dev.js - integration/check-dependencies.js Fixes: - Should read `mergeable` rather than `mergable`. - Should read `upgradeable` rather than `upgradable`. - Should read `thresholds` rather than `threshholds`. - Should read `lease` rather than `leage`. - Should read `ignore` rather than `ingore`. - Should read `bootstrapping` rather than `bootstraping`. PR Close #43051
This commit is contained in:
Tim Gates
Andrew Kushnir
parent
596d533f97
commit
e3415e597e
|
|
@ -203,7 +203,7 @@ The important bit in the `server.ts` file is the `ngExpressEngine()` function.
|
|||
The `ngExpressEngine()` function is a wrapper around Universal's `renderModule()` function which turns a client's
|
||||
requests into server-rendered HTML pages. It accepts an object with the following properties:
|
||||
|
||||
* `bootstrap`: The root `NgModule` or `NgModule` factory to use for bootstraping the application when rendering on the server. For the example app, it is `AppServerModule`. It's the bridge between the Universal server-side renderer and the Angular application.
|
||||
* `bootstrap`: The root `NgModule` or `NgModule` factory to use for bootstrapping the application when rendering on the server. For the example app, it is `AppServerModule`. It's the bridge between the Universal server-side renderer and the Angular application.
|
||||
* `extraProviders`: This is optional and lets you specify dependency providers that apply only when rendering the application on the server. You can do this when your application needs information that can only be determined by the currently running server instance.
|
||||
|
||||
The `ngExpressEngine()` function returns a `Promise` callback that resolves to the rendered page.
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ The safest bet for ensuring compatibility is using the
|
|||
[component API](https://docs.angularjs.org/api/ng/type/angular.Module)
|
||||
introduced in AngularJS 1.5.
|
||||
|
||||
An example of an upgradable component is one that just has a template
|
||||
An example of an upgradeable component is one that just has a template
|
||||
and a controller:
|
||||
|
||||
<code-example path="upgrade-module/src/app/upgrade-static/hero-detail.component.ts" region="hero-detail" header="hero-detail.component.ts">
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ Some additional options can only be set through the configuration file, either b
|
|||
| `styles` | An array of style files to add to the global context of the project. Angular CLI supports CSS imports and all major CSS preprocessors: [sass/scss](https://sass-lang.com/) and [less](http://lesscss.org/). See more in [Styles and scripts configuration](#style-script-config) below. |
|
||||
| `stylePreprocessorOptions` | An object containing option-value pairs to pass to style preprocessors. See more in [Styles and scripts configuration](#style-script-config) below. |
|
||||
| `scripts` | An object containing JavaScript script files to add to the global context of the project. The scripts are loaded exactly as if you had added them in a `<script>` tag inside `index.html`. See more in [Styles and scripts configuration](#style-script-config) below. |
|
||||
| `budgets` | Default size-budget type and threshholds for all or parts of your application. You can configure the builder to report a warning or an error when the output reaches or exceeds a threshold size. See [Configure size budgets](guide/build#configure-size-budgets). (Not available in `test` section.) |
|
||||
| `budgets` | Default size-budget type and thresholds for all or parts of your application. You can configure the builder to report a warning or an error when the output reaches or exceeds a threshold size. See [Configure size budgets](guide/build#configure-size-budgets). (Not available in `test` section.) |
|
||||
| `fileReplacements` | An object containing files and their compile-time replacements. See more in [Configure target-specific file replacements](guide/build#configure-target-specific-file-replacements).|
|
||||
|
||||
{@a complex-config}
|
||||
|
|
|
|||
|
|
@ -3427,7 +3427,7 @@ function checkOutPullRequestLocally(prNumber, githubToken, opts = {}) {
|
|||
// never accidentally override upstream changes that have been pushed in the meanwhile.
|
||||
// See:
|
||||
// https://git-scm.com/docs/git-push#Documentation/git-push.txt---force-with-leaseltrefnamegtltexpectgt
|
||||
/** Flag for a force push with leage back to upstream. */
|
||||
/** Flag for a force push with lease back to upstream. */
|
||||
const forceWithLeaseFlag = `--force-with-lease=${headRefName}:${pr.headRefOid}`;
|
||||
// If the PR does not allow maintainers to modify it, exit as the rebased PR cannot
|
||||
// be pushed up.
|
||||
|
|
@ -3541,7 +3541,7 @@ function discoverNewConflictsForPr(newPrNumber, updatedAfter) {
|
|||
/* PRs which were found to be conflicting. */
|
||||
const conflicts = [];
|
||||
info(`Requesting pending PRs from Github`);
|
||||
/** List of PRs from github currently known as mergable. */
|
||||
/** List of PRs from github currently known as mergeable. */
|
||||
const allPendingPRs = (yield getPendingPrs(PR_SCHEMA$1, git)).map(processPr);
|
||||
/** The PR which is being checked against. */
|
||||
const requestedPr = allPendingPRs.find(pr => pr.number === newPrNumber);
|
||||
|
|
@ -3554,7 +3554,7 @@ function discoverNewConflictsForPr(newPrNumber, updatedAfter) {
|
|||
return (
|
||||
// PRs being merged into the same target branch as the requested PR
|
||||
pr.baseRef.name === requestedPr.baseRef.name &&
|
||||
// PRs which either have not been processed or are determined as mergable by Github
|
||||
// PRs which either have not been processed or are determined as mergeable by Github
|
||||
pr.mergeable !== 'CONFLICTING' &&
|
||||
// PRs updated after the provided date
|
||||
pr.updatedAt >= updatedAfter);
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ export async function checkOutPullRequestLocally(
|
|||
// never accidentally override upstream changes that have been pushed in the meanwhile.
|
||||
// See:
|
||||
// https://git-scm.com/docs/git-push#Documentation/git-push.txt---force-with-leaseltrefnamegtltexpectgt
|
||||
/** Flag for a force push with leage back to upstream. */
|
||||
/** Flag for a force push with lease back to upstream. */
|
||||
const forceWithLeaseFlag = `--force-with-lease=${headRefName}:${pr.headRefOid}`;
|
||||
|
||||
// If the PR does not allow maintainers to modify it, exit as the rebased PR cannot
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ export async function discoverNewConflictsForPr(newPrNumber: number, updatedAfte
|
|||
const conflicts: Array<PullRequest> = [];
|
||||
|
||||
info(`Requesting pending PRs from Github`);
|
||||
/** List of PRs from github currently known as mergable. */
|
||||
/** List of PRs from github currently known as mergeable. */
|
||||
const allPendingPRs = (await getPendingPrs(PR_SCHEMA, git)).map(processPr);
|
||||
/** The PR which is being checked against. */
|
||||
const requestedPr = allPendingPRs.find(pr => pr.number === newPrNumber);
|
||||
|
|
@ -85,7 +85,7 @@ export async function discoverNewConflictsForPr(newPrNumber: number, updatedAfte
|
|||
return (
|
||||
// PRs being merged into the same target branch as the requested PR
|
||||
pr.baseRef.name === requestedPr.baseRef.name &&
|
||||
// PRs which either have not been processed or are determined as mergable by Github
|
||||
// PRs which either have not been processed or are determined as mergeable by Github
|
||||
pr.mergeable !== 'CONFLICTING' &&
|
||||
// PRs updated after the provided date
|
||||
pr.updatedAt >= updatedAfter);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ const lockfilePath = `${projectDir}/yarn.lock`;
|
|||
console.log(`Checking dependencies for '${projectDir}'...`);
|
||||
|
||||
// Collect non-local dependencies (in `[name, version]` pairs).
|
||||
// (Also ingore `git+https:` dependencies, because checking them is not straight-forward.)
|
||||
// (Also ignore `git+https:` dependencies, because checking them is not straight-forward.)
|
||||
const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf8'));
|
||||
const deps = [
|
||||
...Object.entries(pkgJson.dependencies || {}),
|
||||
|
|
|
|||
Loading…
Reference in New Issue