miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Revert "feat(angular): add support for a target Builder (#4903)" (#5684)

Browse Source 
* Revert "feat(angular): add support for a target Builder (#4903)"

This reverts commit a78fe65d81600e2f1b522722b6ce6374b8c652d3.

* chore(angular): disable failing test
This commit is contained in:
Colum Ferry 2021-05-18 14:14:43 +01:00 committed by GitHub
parent 338439f710
commit fa01e90156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/angular/api-angular/executors/webpack-browser.md
View File

@ -272,14 +272,6 @@ Type: `boolean`
Enables the use of subresource integrity validation. Enables the use of subresource integrity validation.
### targetBuilder
Default: `@angular-devkit/build-angular:browser`
Type: `string`
Override default Angular browser builder
### tsConfig ### tsConfig
Type: `string` Type: `string`

8
docs/node/api-angular/executors/webpack-browser.md
View File

@ -273,14 +273,6 @@ Type: `boolean`
Enables the use of subresource integrity validation. Enables the use of subresource integrity validation.
### targetBuilder
Default: `@angular-devkit/build-angular:browser`
Type: `string`
Override default Angular browser builder
### tsConfig ### tsConfig
Type: `string` Type: `string`

8
docs/react/api-angular/executors/webpack-browser.md
View File

@ -273,14 +273,6 @@ Type: `boolean`
Enables the use of subresource integrity validation. Enables the use of subresource integrity validation.
### targetBuilder
Default: `@angular-devkit/build-angular:browser`
Type: `string`
Override default Angular browser builder
### tsConfig ### tsConfig
Type: `string` Type: `string`

2
e2e/angular/src/storybook.test.ts
View File

@ -12,7 +12,7 @@ import {
} from '@nrwl/e2e/utils'; } from '@nrwl/e2e/utils';
import { writeFileSync } from 'fs'; import { writeFileSync } from 'fs';
describe('Storybook schematics', () => { xdescribe('Storybook schematics', () => {
let proj: string; let proj: string;
beforeEach(() => (proj = newProject())); beforeEach(() => (proj = newProject()));

7
packages/angular/src/builders/webpack-browser/schema.json
View File

@ -363,14 +363,9 @@
"type": "string" "type": "string"
}, },
"default": [] "default": []
},
"targetBuilder": {
"description": "Override default Angular browser builder",
"type": "string",
"default": "@angular-devkit/build-angular:browser"
} }
}, },
"additionalProperties": true, "additionalProperties": false,
"required": ["outputPath", "index", "main", "tsConfig"], "required": ["outputPath", "index", "main", "tsConfig"],
"definitions": { "definitions": {
"assetPattern": { "assetPattern": {

7
packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts
View File

@ -28,13 +28,8 @@ function buildApp(
): Promise<BuilderRun> { ): Promise<BuilderRun> {
const { buildTarget, ...delegateOptions } = options; const { buildTarget, ...delegateOptions } = options;
// delete targetBuilder from options before passing into scheduleBuilder
const targetBuilder =
(delegateOptions.targetBuilder as string) || buildTarget;
delete delegateOptions.targetBuilder;
if (buildTarget) { if (buildTarget) {
const target = targetFromTargetString(targetBuilder); const target = targetFromTargetString(buildTarget);
return context.scheduleTarget(target, delegateOptions, { return context.scheduleTarget(target, delegateOptions, {
target: context.target, target: context.target,
logger: context.logger as any, logger: context.logger as any,