-
Notifications
You must be signed in to change notification settings - Fork 12k
feat(@angular/cli): use architect #9883
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,293 +1,44 @@ | ||
| import { Command, Option, CommandScope } from '../models/command'; | ||
| import { CliConfig } from '../models/config'; | ||
| import { BuildOptions } from '../models/build-options'; | ||
| import { ArchitectCommand } from '../models/architect-command'; | ||
| import { Option, CommandScope } from '../models/command'; | ||
| import { Version } from '../upgrade/version'; | ||
| import { oneLine } from 'common-tags'; | ||
| import { getAppFromConfig } from '../utilities/app-utils'; | ||
| import { join } from 'path'; | ||
| import { RenderUniversalTaskOptions } from '../tasks/render-universal'; | ||
|
|
||
| const SilentError = require('silent-error'); | ||
|
|
||
| const config = CliConfig.fromProject() || CliConfig.fromGlobal(); | ||
| const buildConfigDefaults = config.getPaths('defaults.build', [ | ||
| 'sourcemaps', 'baseHref', 'progress', 'poll', 'deleteOutputPath', 'preserveSymlinks', | ||
| 'showCircularDependencies', 'commonChunk', 'namedChunks' | ||
| ]); | ||
|
|
||
| // defaults for BuildOptions | ||
| export const baseBuildCommandOptions: Option[] = [ | ||
| { | ||
| name: 'target', | ||
| type: String, | ||
| default: 'development', | ||
| // TODO: re-add support for `--prod` | ||
| aliases: ['t'], | ||
| description: 'Defines the build target.' | ||
| }, | ||
| { | ||
| name: 'environment', | ||
| type: String, | ||
| aliases: ['e'], | ||
| description: 'Defines the build environment.' | ||
| }, | ||
| { | ||
| name: 'output-path', | ||
| type: 'Path', | ||
| aliases: ['op'], | ||
| description: 'Path where output will be placed.' | ||
| }, | ||
| { | ||
| name: 'aot', | ||
| type: Boolean, | ||
| description: 'Build using Ahead of Time compilation.' | ||
| }, | ||
| { | ||
| name: 'sourcemaps', | ||
| type: Boolean, | ||
| aliases: ['sm', 'sourcemap'], | ||
| description: 'Output sourcemaps.', | ||
| default: buildConfigDefaults['sourcemaps'] | ||
| }, | ||
| { | ||
| name: 'vendor-chunk', | ||
| type: Boolean, | ||
| aliases: ['vc'], | ||
| description: 'Use a separate bundle containing only vendor libraries.' | ||
| }, | ||
| { | ||
| name: 'common-chunk', | ||
| type: Boolean, | ||
| default: buildConfigDefaults['commonChunk'], | ||
| aliases: ['cc'], | ||
| description: 'Use a separate bundle containing code used across multiple bundles.' | ||
| }, | ||
| { | ||
| name: 'base-href', | ||
| type: String, | ||
| aliases: ['bh'], | ||
| description: 'Base url for the application being built.', | ||
| default: buildConfigDefaults['baseHref'] | ||
| }, | ||
| { | ||
| name: 'deploy-url', | ||
| type: String, | ||
| aliases: ['d'], | ||
| description: 'URL where files will be deployed.' | ||
| }, | ||
| { | ||
| name: 'verbose', | ||
| type: Boolean, | ||
| default: false, | ||
| aliases: ['v'], | ||
| description: 'Adds more details to output logging.' | ||
| }, | ||
| { | ||
| name: 'progress', | ||
| type: Boolean, | ||
| aliases: ['pr'], | ||
| description: 'Log progress to the console while building.', | ||
| default: typeof buildConfigDefaults['progress'] !== 'undefined' | ||
| ? buildConfigDefaults['progress'] | ||
| : process.stdout.isTTY === true | ||
| }, | ||
| { | ||
| name: 'i18n-file', | ||
| type: String, | ||
| description: 'Localization file to use for i18n.' | ||
| }, | ||
| { | ||
| name: 'i18n-format', | ||
| type: String, | ||
| description: 'Format of the localization file specified with --i18n-file.' | ||
| }, | ||
| { | ||
| name: 'locale', | ||
| type: String, | ||
| description: 'Locale to use for i18n.' | ||
| }, | ||
| { | ||
| name: 'missing-translation', | ||
| type: String, | ||
| description: 'How to handle missing translations for i18n.' | ||
| }, | ||
| { | ||
| name: 'extract-css', | ||
| type: Boolean, | ||
| aliases: ['ec'], | ||
| description: 'Extract css from global styles onto css files instead of js ones.' | ||
| }, | ||
| { | ||
| name: 'watch', | ||
| type: Boolean, | ||
| default: false, | ||
| aliases: ['w'], | ||
| description: 'Run build when files change.' | ||
| }, | ||
| { | ||
| name: 'output-hashing', | ||
| type: String, | ||
| values: ['none', 'all', 'media', 'bundles'], | ||
| description: 'Define the output filename cache-busting hashing mode.', | ||
| aliases: ['oh'] | ||
| }, | ||
| { | ||
| name: 'poll', | ||
| type: Number, | ||
| description: 'Enable and define the file watching poll time period (milliseconds).', | ||
| default: buildConfigDefaults['poll'] | ||
| }, | ||
| { | ||
| name: 'app', | ||
| type: String, | ||
| aliases: ['a'], | ||
| description: 'Specifies app name or index to use.' | ||
| }, | ||
| { | ||
| name: 'delete-output-path', | ||
| type: Boolean, | ||
| aliases: ['dop'], | ||
| description: 'Delete output path before build.', | ||
| default: buildConfigDefaults['deleteOutputPath'], | ||
| }, | ||
| { | ||
| name: 'preserve-symlinks', | ||
| type: Boolean, | ||
| description: 'Do not use the real path when resolving modules.', | ||
| default: buildConfigDefaults['preserveSymlinks'] | ||
| }, | ||
| { | ||
| name: 'extract-licenses', | ||
| type: Boolean, | ||
| description: 'Extract all licenses in a separate file, in the case of production builds only.' | ||
| }, | ||
| { | ||
| name: 'show-circular-dependencies', | ||
| type: Boolean, | ||
| aliases: ['scd'], | ||
| description: 'Show circular dependency warnings on builds.', | ||
| default: buildConfigDefaults['showCircularDependencies'] | ||
| }, | ||
| { | ||
| name: 'build-optimizer', | ||
| type: Boolean, | ||
| description: 'Enables @angular-devkit/build-optimizer optimizations when using `--aot`.' | ||
| }, | ||
| { | ||
| name: 'named-chunks', | ||
| type: Boolean, | ||
| aliases: ['nc'], | ||
| description: 'Use file name for lazy loaded chunks.', | ||
| default: buildConfigDefaults['namedChunks'] | ||
| }, | ||
| { | ||
| name: 'subresource-integrity', | ||
| type: Boolean, | ||
| default: false, | ||
| aliases: ['sri'], | ||
| description: 'Enables the use of subresource integrity validation.' | ||
| }, | ||
| { | ||
| name: 'bundle-dependencies', | ||
| type: ['none', 'all'], | ||
| default: 'none', | ||
| description: 'Available on server platform only. Which external dependencies to bundle into ' | ||
| + 'the module. By default, all of node_modules will be kept as requires.' | ||
| }, | ||
| { | ||
| name: 'service-worker', | ||
| type: Boolean, | ||
| default: true, | ||
| aliases: ['sw'], | ||
| description: 'Generates a service worker config for production builds, if the app has ' | ||
| + 'service worker enabled.' | ||
| }, | ||
| { | ||
| name: 'skip-app-shell', | ||
| type: Boolean, | ||
| description: 'Flag to prevent building an app shell', | ||
| default: false | ||
| } | ||
| ]; | ||
|
|
||
| export interface BuildTaskOptions extends BuildOptions { | ||
| statsJson?: boolean; | ||
| export interface Options { | ||
| app?: string; | ||
| configuration?: string; | ||
| prod: boolean; | ||
| } | ||
|
|
||
| export default class BuildCommand extends Command { | ||
| export default class BuildCommand extends ArchitectCommand { | ||
| public readonly name = 'build'; | ||
| public readonly target = 'browser'; | ||
| public readonly description = | ||
| 'Builds your app and places it into the output path (dist/ by default).'; | ||
| public static aliases = ['b']; | ||
| public scope = CommandScope.inProject; | ||
| public arguments: string[]; | ||
| public options = baseBuildCommandOptions.concat([ | ||
| { | ||
| name: 'stats-json', | ||
| type: Boolean, | ||
| default: false, | ||
| description: oneLine`Generates a \`stats.json\` file which can be analyzed using tools | ||
| such as: \`webpack-bundle-analyzer\` or https://webpack.github.io/analyse.` | ||
| } | ||
| ]); | ||
| public arguments: string[] = ['app']; | ||
| public options: Option[] = [ | ||
| this.prodOption, | ||
| this.configurationOption | ||
| ]; | ||
|
|
||
| public validate(_options: BuildTaskOptions) { | ||
| public validate(_options: Options) { | ||
| Version.assertAngularVersionIs2_3_1OrHigher(this.project.root); | ||
| Version.assertTypescriptVersion(this.project.root); | ||
| return true; | ||
| } | ||
|
|
||
| public async run(options: BuildTaskOptions) { | ||
| // Add trailing slash if missing to prevent https://github.com/angular/angular-cli/issues/7295 | ||
| if (options.deployUrl && options.deployUrl.substr(-1) !== '/') { | ||
| options.deployUrl += '/'; | ||
| } | ||
|
|
||
| const BuildTask = require('../tasks/build').default; | ||
|
|
||
| const buildTask = new BuildTask({ | ||
| project: this.project, | ||
| ui: this.ui, | ||
| }); | ||
|
|
||
| const clientApp = getAppFromConfig(options.app); | ||
|
|
||
| const doAppShell = options.target === 'production' && | ||
| (options.aot === undefined || options.aot === true) && | ||
| !options.skipAppShell; | ||
|
|
||
| let serverApp: any = null; | ||
| if (clientApp.appShell && doAppShell) { | ||
| serverApp = getAppFromConfig(clientApp.appShell.app); | ||
| if (serverApp.platform !== 'server') { | ||
| throw new SilentError(`Shell app's platform is not "server"`); | ||
| } | ||
| } | ||
|
|
||
| const buildTaskResult = await buildTask.run(options); | ||
| if (!clientApp.appShell || !doAppShell) { | ||
| return buildTaskResult; | ||
| public async run(options: Options) { | ||
| let configuration = options.configuration; | ||
| if (!configuration && options.prod) { | ||
| configuration = 'production'; | ||
| } | ||
|
|
||
| const serverOptions = { | ||
| ...options, | ||
| app: clientApp.appShell.app | ||
| }; | ||
| await buildTask.run(serverOptions); | ||
|
|
||
| const RenderUniversalTask = require('../tasks/render-universal').default; | ||
|
|
||
| const renderUniversalTask = new RenderUniversalTask({ | ||
| project: this.project, | ||
| ui: this.ui, | ||
| const overrides = {...options}; | ||
| delete overrides.app; | ||
| delete overrides.prod; | ||
| return this.runArchitect({ | ||
| app: options.app, | ||
| configuration, | ||
| overrides | ||
| }); | ||
| const renderUniversalOptions: RenderUniversalTaskOptions = { | ||
| inputIndexPath: join(this.project.root, clientApp.outDir, clientApp.index), | ||
| route: clientApp.appShell.route, | ||
| serverOutDir: join(this.project.root, serverApp.outDir), | ||
| outputIndexPath: join(this.project.root, clientApp.outDir, clientApp.index) | ||
| }; | ||
|
|
||
| return await renderUniversalTask.run(renderUniversalOptions); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
project?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to be changed this week, but can be after this PR.