From fddbe881b4c8317b3c9bae251a3e4dce16f55f08 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 2 Dec 2020 15:27:37 +0300 Subject: [PATCH] chore: update workspace-models.ts --- .../src/utils/angular/workspace-models.ts | 200 +++++++++--------- 1 file changed, 104 insertions(+), 96 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts b/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts index c03a857d43..d4e050d317 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts @@ -5,72 +5,70 @@ * 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 { experimental } from '@angular-devkit/core'; - export enum ProjectType { - Application = 'application', - Library = 'library', + Application = 'application', + Library = 'library', } export enum Builders { - AppShell = '@angular-devkit/build-angular:app-shell', - Server = '@angular-devkit/build-angular:server', - Browser = '@angular-devkit/build-angular:browser', - Karma = '@angular-devkit/build-angular:karma', - TsLint = '@angular-devkit/build-angular:tslint', - NgPackagr = '@angular-devkit/build-ng-packagr:build', - DevServer = '@angular-devkit/build-angular:dev-server', - ExtractI18n = '@angular-devkit/build-angular:extract-i18n', - Protractor = '@angular-devkit/build-angular:protractor', + AppShell = '@angular-devkit/build-angular:app-shell', + Server = '@angular-devkit/build-angular:server', + Browser = '@angular-devkit/build-angular:browser', + Karma = '@angular-devkit/build-angular:karma', + TsLint = '@angular-devkit/build-angular:tslint', + DeprecatedNgPackagr = '@angular-devkit/build-ng-packagr:build', + NgPackagr = '@angular-devkit/build-angular:ng-packagr', + DevServer = '@angular-devkit/build-angular:dev-server', + ExtractI18n = '@angular-devkit/build-angular:extract-i18n', + Protractor = '@angular-devkit/build-angular:protractor', } export interface FileReplacements { - replace: string; - with: string; + replace: string; + with: string; } export interface BrowserBuilderBaseOptions { - main: string; - tsConfig: string; - fileReplacements?: FileReplacements[]; - outputPath?: string; - index?: string; - polyfills: string; - assets?: (object|string)[]; - styles?: (object|string)[]; - scripts?: (object|string)[]; - sourceMap?: boolean; + main: string; + tsConfig: string; + fileReplacements?: FileReplacements[]; + outputPath?: string; + index?: string; + polyfills: string; + assets?: (object | string)[]; + styles?: (object | string)[]; + scripts?: (object | string)[]; + sourceMap?: boolean; } export type OutputHashing = 'all' | 'media' | 'none' | 'bundles'; export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions { - serviceWorker?: boolean; - optimization?: boolean; - outputHashing?: OutputHashing; - resourcesOutputPath?: string; - extractCss?: boolean; - namedChunks?: boolean; - aot?: boolean; - extractLicenses?: boolean; - vendorChunk?: boolean; - buildOptimizer?: boolean; - ngswConfigPath?: string; - budgets?: { - type: string; - maximumWarning?: string; - maximumError?: string; - }[]; - webWorkerTsConfig?: string; + serviceWorker?: boolean; + optimization?: boolean; + outputHashing?: OutputHashing; + resourcesOutputPath?: string; + extractCss?: boolean; + namedChunks?: boolean; + aot?: boolean; + extractLicenses?: boolean; + vendorChunk?: boolean; + buildOptimizer?: boolean; + ngswConfigPath?: string; + budgets?: { + type: string; + maximumWarning?: string; + maximumError?: string; + }[]; + webWorkerTsConfig?: string; } export interface ServeBuilderOptions { - browserTarget: string; + browserTarget: string; } export interface LibraryBuilderOptions { - tsConfig: string; - project: string; + tsConfig: string; + project: string; } export interface ServerBuilderOptions { @@ -82,45 +80,47 @@ export interface ServerBuilderOptions { scripts?: boolean; styles?: boolean; }; - sourceMap?: boolean | { - scripts?: boolean; - styles?: boolean; - hidden?: boolean; - vendor?: boolean; - }; + sourceMap?: + | boolean + | { + scripts?: boolean; + styles?: boolean; + hidden?: boolean; + vendor?: boolean; + }; } export interface AppShellBuilderOptions { - browserTarget: string; - serverTarget: string; - route: string; + browserTarget: string; + serverTarget: string; + route: string; } export interface TestBuilderOptions extends Partial { - karmaConfig: string; + karmaConfig: string; } export interface LintBuilderOptions { - tsConfig: string[] | string; - exclude?: string[]; + tsConfig: string[] | string; + exclude?: string[]; } export interface ExtractI18nOptions { - browserTarget: string; + browserTarget: string; } export interface E2EOptions { - protractorConfig: string; - devServerTarget: string; + protractorConfig: string; + devServerTarget: string; } export interface BuilderTarget { - builder: TBuilder; - options: TOptions; - configurations?: { - production: Partial; - [key: string]: Partial; - }; + builder: TBuilder; + options: TOptions; + configurations?: { + production: Partial; + [key: string]: Partial; + }; } export type LibraryBuilderTarget = BuilderTarget; @@ -133,39 +133,47 @@ export type ServeBuilderTarget = BuilderTarget; export type E2EBuilderTarget = BuilderTarget; -export interface WorkspaceSchema extends experimental.workspace.WorkspaceSchema { - projects: { - [key: string]: WorkspaceProject; - }; +export interface WorkspaceSchema { + version: 1; + defaultProject?: string; + cli?: { warnings?: Record }; + projects: { + [key: string]: WorkspaceProject; + }; } -export interface WorkspaceProject - extends experimental.workspace.WorkspaceProject { - /** - * Project type. - */ - projectType: ProjectType; +export interface WorkspaceProject { + /** + * Project type. + */ + projectType: ProjectType; + + root: string; + sourceRoot: string; + prefix: string; + + cli?: { warnings?: Record }; - /** - * Tool options. - */ - architect?: WorkspaceTargets; - /** - * Tool options. - */ - targets?: WorkspaceTargets; + /** + * Tool options. + */ + architect?: WorkspaceTargets; + /** + * Tool options. + */ + targets?: WorkspaceTargets; } export interface WorkspaceTargets { - build?: TProjectType extends ProjectType.Library ? LibraryBuilderTarget : BrowserBuilderTarget; - server?: ServerBuilderTarget; - lint?: LintBuilderTarget; - test?: TestBuilderTarget; - serve?: ServeBuilderTarget; - e2e?: E2EBuilderTarget; - 'app-shell'?: AppShellBuilderTarget; - 'extract-i18n'?: ExtractI18nBuilderTarget; - // TODO(hans): change this any to unknown when google3 supports TypeScript 3.0. - // tslint:disable-next-line:no-any - [key: string]: any; + build?: TProjectType extends ProjectType.Library ? LibraryBuilderTarget : BrowserBuilderTarget; + server?: ServerBuilderTarget; + lint?: LintBuilderTarget; + test?: TestBuilderTarget; + serve?: ServeBuilderTarget; + e2e?: E2EBuilderTarget; + 'app-shell'?: AppShellBuilderTarget; + 'extract-i18n'?: ExtractI18nBuilderTarget; + // TODO(hans): change this any to unknown when google3 supports TypeScript 3.0. + // tslint:disable-next-line:no-any + [key: string]: any; }