* Revert "feat(angular): add support for a target Builder (#4903)" This reverts commit a78fe65d81600e2f1b522722b6ce6374b8c652d3. * chore(angular): disable failing test
This commit is contained in:
parent
338439f710
commit
fa01e90156
@ -272,14 +272,6 @@ Type: `boolean`
|
||||
|
||||
Enables the use of subresource integrity validation.
|
||||
|
||||
### targetBuilder
|
||||
|
||||
Default: `@angular-devkit/build-angular:browser`
|
||||
|
||||
Type: `string`
|
||||
|
||||
Override default Angular browser builder
|
||||
|
||||
### tsConfig
|
||||
|
||||
Type: `string`
|
||||
|
||||
@ -273,14 +273,6 @@ Type: `boolean`
|
||||
|
||||
Enables the use of subresource integrity validation.
|
||||
|
||||
### targetBuilder
|
||||
|
||||
Default: `@angular-devkit/build-angular:browser`
|
||||
|
||||
Type: `string`
|
||||
|
||||
Override default Angular browser builder
|
||||
|
||||
### tsConfig
|
||||
|
||||
Type: `string`
|
||||
|
||||
@ -273,14 +273,6 @@ Type: `boolean`
|
||||
|
||||
Enables the use of subresource integrity validation.
|
||||
|
||||
### targetBuilder
|
||||
|
||||
Default: `@angular-devkit/build-angular:browser`
|
||||
|
||||
Type: `string`
|
||||
|
||||
Override default Angular browser builder
|
||||
|
||||
### tsConfig
|
||||
|
||||
Type: `string`
|
||||
|
||||
@ -12,7 +12,7 @@ import {
|
||||
} from '@nrwl/e2e/utils';
|
||||
import { writeFileSync } from 'fs';
|
||||
|
||||
describe('Storybook schematics', () => {
|
||||
xdescribe('Storybook schematics', () => {
|
||||
let proj: string;
|
||||
|
||||
beforeEach(() => (proj = newProject()));
|
||||
|
||||
@ -363,14 +363,9 @@
|
||||
"type": "string"
|
||||
},
|
||||
"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"],
|
||||
"definitions": {
|
||||
"assetPattern": {
|
||||
|
||||
@ -28,13 +28,8 @@ function buildApp(
|
||||
): Promise<BuilderRun> {
|
||||
const { buildTarget, ...delegateOptions } = options;
|
||||
|
||||
// delete targetBuilder from options before passing into scheduleBuilder
|
||||
const targetBuilder =
|
||||
(delegateOptions.targetBuilder as string) || buildTarget;
|
||||
delete delegateOptions.targetBuilder;
|
||||
|
||||
if (buildTarget) {
|
||||
const target = targetFromTargetString(targetBuilder);
|
||||
const target = targetFromTargetString(buildTarget);
|
||||
return context.scheduleTarget(target, delegateOptions, {
|
||||
target: context.target,
|
||||
logger: context.logger as any,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user