0e3d8e4a6 feat(@schematics/angular): add packageManager option

Author: Angular Builds

package.json

@@ -1,20 +1,20 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.900.0-next.15+17.341b18d",
+  "version": "0.900.0-next.15+22.0e3d8e4",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#341b18d8a",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#341b18d8a",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#341b18d8a",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#341b18d8a",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0e3d8e4a6",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#0e3d8e4a6",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#0e3d8e4a6",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0e3d8e4a6",
     "@babel/core": "7.6.4",
     "@babel/generator": "7.6.4",
     "@babel/preset-env": "7.6.3",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#341b18d8a",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#0e3d8e4a6",
     "ajv": "6.10.2",
     "autoprefixer": "9.6.5",
     "browserslist": "4.7.2",
@@ -44,6 +44,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "3.1.0",
     "regenerator-runtime": "0.13.3",
+    "rimraf": "3.0.0",
     "rollup": "1.25.2",
     "rxjs": "6.5.3",
     "sass": "1.23.1",

src/browser/index.d.ts

@@ -14,16 +14,21 @@ import { Observable } from 'rxjs';
 import * as webpack from 'webpack';
 import { IndexHtmlTransform } from '../angular-cli-files/utilities/index-file/write-index-html';
 import { ExecutionTransformer } from '../transforms';
+import { I18nOptions } from '../utils/i18n-options';
 import { Schema as BrowserBuilderSchema } from './schema';
 export declare type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
     outputPath: string;
 };
 export declare function createBrowserLoggingCallback(verbose: boolean, logger: logging.LoggerApi): WebpackLoggingCallback;
-export declare function buildBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, host?: virtualFs.Host<fs.Stats>): Promise<{
+interface ConfigFromContextReturn {
     config: webpack.Configuration;
     projectRoot: string;
     projectSourceRoot?: string;
+}
+export declare function buildBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, host: virtualFs.Host<fs.Stats>, i18n: boolean): Promise<ConfigFromContextReturn & {
+    i18n: I18nOptions;
 }>;
+export declare function buildBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, host?: virtualFs.Host<fs.Stats>): Promise<ConfigFromContextReturn>;
 export declare function buildWebpackBrowser(options: BrowserBuilderSchema, context: BuilderContext, transforms?: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
     logging?: WebpackLoggingCallback;

src/browser/index.js

@@ -12,7 +12,6 @@ const build_webpack_1 = require("@angular-devkit/build-webpack");
 const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
 const fs = require("fs");
-const os = require("os");
 const path = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -24,15 +23,14 @@ const read_tsconfig_1 = require("../angular-cli-files/utilities/read-tsconfig");
 const service_worker_1 = require("../angular-cli-files/utilities/service-worker");
 const stats_1 = require("../angular-cli-files/utilities/stats");
 const utils_1 = require("../utils");
+const action_executor_1 = require("../utils/action-executor");
 const cache_path_1 = require("../utils/cache-path");
 const copy_assets_1 = require("../utils/copy-assets");
 const environment_options_1 = require("../utils/environment-options");
 const i18n_inlining_1 = require("../utils/i18n-inlining");
-const i18n_options_1 = require("../utils/i18n-options");
-const load_translations_1 = require("../utils/load-translations");
+const output_paths_1 = require("../utils/output-paths");
 const version_1 = require("../utils/version");
 const webpack_browser_config_1 = require("../utils/webpack-browser-config");
-const action_executor_1 = require("./action-executor");
 const cacheDownlevelPath = environment_options_1.cachingDisabled ? undefined : cache_path_1.findCachePath('angular-build-dl');
 function createBrowserLoggingCallback(verbose, logger) {
     return (stats, config) => {
@@ -53,16 +51,20 @@ function createBrowserLoggingCallback(verbose, logger) {
     };
 }
 exports.createBrowserLoggingCallback = createBrowserLoggingCallback;
-async function buildBrowserWebpackConfigFromContext(options, context, host = new node_1.NodeJsSyncHost()) {
-    return webpack_browser_config_1.generateBrowserWebpackConfigFromContext(options, context, wco => [
+async function buildBrowserWebpackConfigFromContext(options, context, host = new node_1.NodeJsSyncHost(), i18n = false) {
+    const webpackPartialGenerator = (wco) => [
         webpack_configs_1.getCommonConfig(wco),
         webpack_configs_1.getBrowserConfig(wco),
         webpack_configs_1.getStylesConfig(wco),
         webpack_configs_1.getStatsConfig(wco),
         getAnalyticsConfig(wco, context),
         getCompilerConfig(wco),
         wco.buildOptions.webWorkerTsConfig ? webpack_configs_1.getWorkerConfig(wco) : {},
-    ], host);
+    ];
+    if (i18n) {
+        return webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, host);
+    }
+    return webpack_browser_config_1.generateBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, host);
 }
 exports.buildBrowserWebpackConfigFromContext = buildBrowserWebpackConfigFromContext;
 function getAnalyticsConfig(wco, context) {
@@ -88,66 +90,14 @@ function getCompilerConfig(wco) {
     return {};
 }
 async function initialize(options, context, host, webpackConfigurationTransform) {
-    if (!context.target) {
-        throw new Error('The builder requires a target.');
-    }
-    const tsConfig = read_tsconfig_1.readTsconfig(options.tsConfig, context.workspaceRoot);
-    const usingIvy = tsConfig.options.enableIvy !== false;
-    const metadata = await context.getProjectMetadata(context.target);
-    const projectRoot = path.join(context.workspaceRoot, metadata.root || '');
-    const i18n = i18n_options_1.createI18nOptions(metadata, options.localize);
-    // Until 11.0, support deprecated i18n options when not using new localize option
-    // i18nFormat is automatically calculated
-    if (options.localize === undefined && usingIvy) {
-        i18n_options_1.mergeDeprecatedI18nOptions(i18n, options.i18nLocale, options.i18nFile);
-    }
-    else if (options.localize !== undefined && !usingIvy) {
-        options.localize = undefined;
-        context.logger.warn(`Option 'localize' is not supported with View Engine.`);
-    }
-    if (i18n.shouldInline) {
-        // Load locales
-        const loader = await load_translations_1.createTranslationLoader();
-        const usedFormats = new Set();
-        for (const [locale, desc] of Object.entries(i18n.locales)) {
-            if (i18n.inlineLocales.has(locale)) {
-                const result = loader(path.join(projectRoot, desc.file));
-                usedFormats.add(result.format);
-                if (usedFormats.size > 1 && tsConfig.options.enableI18nLegacyMessageIdFormat !== false) {
-                    // This limitation is only for legacy message id support (defaults to true as of 9.0)
-                    throw new Error('Localization currently only supports using one type of translation file format for the entire application.');
-                }
-                desc.format = result.format;
-                desc.translation = result.translation;
-            }
-        }
-        // Legacy message id's require the format of the translations
-        if (usedFormats.size > 0) {
-            options.i18nFormat = [...usedFormats][0];
-        }
-    }
     const originalOutputPath = options.outputPath;
-    // If inlining store the output in a temporary location to facilitate post-processing
-    if (i18n.shouldInline) {
-        options.outputPath = fs.mkdtempSync(path.join(fs.realpathSync(os.tmpdir()), 'angular-cli-'));
-    }
-    const { config, projectSourceRoot } = await buildBrowserWebpackConfigFromContext(options, context, host);
-    if (i18n.shouldInline) {
-        // Remove localize "polyfill"
-        if (!config.resolve) {
-            config.resolve = {};
-        }
-        if (!config.resolve.alias) {
-            config.resolve.alias = {};
-        }
-        config.resolve.alias['@angular/localize/init'] = require.resolve('./empty.js');
-    }
+    const { config, projectRoot, projectSourceRoot, i18n } = await buildBrowserWebpackConfigFromContext(options, context, host, true);
     let transformedConfig;
     if (webpackConfigurationTransform) {
         transformedConfig = await webpackConfigurationTransform(config);
     }
     if (options.deleteOutputPath) {
-        await utils_1.deleteOutputDir(core_1.normalize(context.workspaceRoot), core_1.normalize(originalOutputPath), host).toPromise();
+        utils_1.deleteOutputDir(context.workspaceRoot, originalOutputPath);
     }
     return { config: transformedConfig || config, projectRoot, projectSourceRoot, i18n };
 }
@@ -198,14 +148,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                 return { success };
             }
             else if (success) {
-                const outputPaths = i18n.shouldInline && !i18n.flatOutput
-                    ? [...i18n.inlineLocales].map(l => path.join(baseOutputPath, l))
-                    : [baseOutputPath];
-                for (const outputPath of outputPaths) {
-                    if (!fs.existsSync(outputPath)) {
-                        fs.mkdirSync(outputPath, { recursive: true });
-                    }
-                }
+                const outputPaths = output_paths_1.ensureOutputPaths(baseOutputPath, i18n);
                 let noModuleFiles;
                 let moduleFiles;
                 let files;
@@ -214,7 +157,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     moduleFiles = emittedFiles;
                     files = moduleFiles.filter(x => x.extension === '.css' || (x.name && scriptsEntryPointName.includes(x.name)));
                     if (i18n.shouldInline) {
-                        const success = await i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, 
+                        const success = await i18n_inlining_1.i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, 
                         // tslint:disable-next-line: no-non-null-assertion
                         webpackStats.outputPath, target <= typescript_1.ScriptTarget.ES5, options.i18nMissingTranslation);
                         if (!success) {
@@ -417,14 +360,6 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     }
                     finally {
                         executor.stop();
-                        if (i18n.shouldInline) {
-                            try {
-                                // Remove temporary directory used for i18n processing
-                                // tslint:disable-next-line: no-non-null-assertion
-                                await host.delete(core_1.normalize(webpackStats.outputPath)).toPromise();
-                            }
-                            catch (_b) { }
-                        }
                     }
                     // Copy assets
                     if (options.assets) {
@@ -488,7 +423,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
                     noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
                     if (i18n.shouldInline) {
-                        const success = await i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, 
+                        const success = await i18n_inlining_1.i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, 
                         // tslint:disable-next-line: no-non-null-assertion
                         webpackStats.outputPath, target <= typescript_1.ScriptTarget.ES5, options.i18nMissingTranslation);
                         if (!success) {
@@ -542,45 +477,6 @@ function generateIndex(baseOutputPath, options, root, files, noModuleFiles, modu
         lang: options.i18nLocale,
     }).toPromise();
 }
-async function i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, emittedPath, es5, missingTranslation) {
-    const executor = new action_executor_1.BundleActionExecutor({ i18n });
-    let hasErrors = false;
-    try {
-        const { options, originalFiles: processedFiles } = i18n_inlining_1.emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, baseOutputPath, es5, missingTranslation);
-        for await (const result of executor.inlineAll(options)) {
-            for (const diagnostic of result.diagnostics) {
-                if (diagnostic.type === 'error') {
-                    hasErrors = true;
-                    context.logger.error(diagnostic.message);
-                }
-                else {
-                    context.logger.warn(diagnostic.message);
-                }
-            }
-        }
-        // Copy any non-processed files into the output locations
-        await copy_assets_1.copyAssets([
-            {
-                glob: '**/*',
-                input: emittedPath,
-                output: '',
-                ignore: [...processedFiles].map(f => path.relative(emittedPath, f)),
-            },
-        ], outputPaths, '');
-    }
-    catch (err) {
-        context.logger.error('Localized bundle generation failed: ' + err.message);
-        return false;
-    }
-    finally {
-        executor.stop();
-    }
-    context.logger.info(`Localized bundle generation ${hasErrors ? 'failed' : 'complete'}.`);
-    if (hasErrors) {
-        return false;
-    }
-    return true;
-}
 function mapErrorToMessage(error) {
     if (error instanceof Error) {
         return error.message;

src/server/index.js

@@ -9,29 +9,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const architect_1 = require("@angular-devkit/architect");
 const build_webpack_1 = require("@angular-devkit/build-webpack");
-const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
 const path = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const typescript_1 = require("typescript");
 const webpack_configs_1 = require("../angular-cli-files/models/webpack-configs");
+const read_tsconfig_1 = require("../angular-cli-files/utilities/read-tsconfig");
 const utils_1 = require("../utils");
+const i18n_inlining_1 = require("../utils/i18n-inlining");
+const output_paths_1 = require("../utils/output-paths");
 const version_1 = require("../utils/version");
 const webpack_browser_config_1 = require("../utils/webpack-browser-config");
 function execute(options, context, transforms = {}) {
     const host = new node_1.NodeJsSyncHost();
     const root = context.workspaceRoot;
     // Check Angular version.
     version_1.assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
-    return rxjs_1.from(buildServerWebpackConfig(options, context)).pipe(operators_1.concatMap(async (v) => transforms.webpackConfiguration ? transforms.webpackConfiguration(v) : v), operators_1.concatMap(v => {
-        if (options.deleteOutputPath) {
-            return utils_1.deleteOutputDir(core_1.normalize(root), core_1.normalize(options.outputPath), host).pipe(operators_1.map(() => v));
-        }
-        else {
-            return rxjs_1.of(v);
-        }
-    }), operators_1.concatMap(webpackConfig => build_webpack_1.runWebpack(webpackConfig, context)), operators_1.map(output => {
-        if (output.success === false) {
+    const tsConfig = read_tsconfig_1.readTsconfig(options.tsConfig, context.workspaceRoot);
+    const target = tsConfig.options.target || typescript_1.ScriptTarget.ES5;
+    const baseOutputPath = path.resolve(context.workspaceRoot, options.outputPath);
+    return rxjs_1.from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(operators_1.concatMap(({ config, i18n }) => {
+        return build_webpack_1.runWebpack(config, context).pipe(operators_1.concatMap(async (output) => {
+            const { emittedFiles = [], webpackStats } = output;
+            if (!output.success || !i18n.shouldInline) {
+                return output;
+            }
+            if (!webpackStats) {
+                throw new Error('Webpack stats build result is required.');
+            }
+            const outputPaths = output_paths_1.ensureOutputPaths(baseOutputPath, i18n);
+            const success = await i18n_inlining_1.i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, [], 
+            // tslint:disable-next-line: no-non-null-assertion
+            webpackStats.outputPath, target <= typescript_1.ScriptTarget.ES5, options.i18nMissingTranslation);
+            return { output, success };
+        }));
+    }), operators_1.map(output => {
+        if (!output.success) {
             return output;
         }
         return {
@@ -42,14 +56,9 @@ function execute(options, context, transforms = {}) {
 }
 exports.execute = execute;
 exports.default = architect_1.createBuilder(execute);
-function getCompilerConfig(wco) {
-    if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-        return wco.buildOptions.aot ? webpack_configs_1.getAotConfig(wco) : webpack_configs_1.getNonAotConfig(wco);
-    }
-    return {};
-}
-async function buildServerWebpackConfig(options, context) {
-    const { config } = await webpack_browser_config_1.generateBrowserWebpackConfigFromContext({
+async function initialize(options, context, host, webpackConfigurationTransform) {
+    const originalOutputPath = options.outputPath;
+    const { config, i18n } = await webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext({
         ...options,
         buildOptimizer: false,
         aot: true,
@@ -59,7 +68,14 @@ async function buildServerWebpackConfig(options, context) {
         webpack_configs_1.getServerConfig(wco),
         webpack_configs_1.getStylesConfig(wco),
         webpack_configs_1.getStatsConfig(wco),
-        getCompilerConfig(wco),
+        webpack_configs_1.getAotConfig(wco),
     ]);
-    return config;
+    let transformedConfig;
+    if (webpackConfigurationTransform) {
+        transformedConfig = await webpackConfigurationTransform(config);
+    }
+    if (options.deleteOutputPath) {
+        utils_1.deleteOutputDir(context.workspaceRoot, originalOutputPath);
+    }
+    return { config: transformedConfig || config, i18n };
 }

src/browser/action-cache.d.ts src/utils/action-cache.d.tssrc/browser/action-cache.d.ts renamed to src/utils/action-cache.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as fs from 'fs';
-import { ProcessBundleOptions, ProcessBundleResult } from '../utils/process-bundle';
+import { ProcessBundleOptions, ProcessBundleResult } from './process-bundle';
 export interface CacheEntry {
     path: string;
     size: number;

src/browser/action-cache.js src/utils/action-cache.jssrc/browser/action-cache.js renamed to src/utils/action-cache.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const crypto_1 = require("crypto");
 const fs = require("fs");
-const copy_file_1 = require("../utils/copy-file");
-const environment_options_1 = require("../utils/environment-options");
+const copy_file_1 = require("./copy-file");
+const environment_options_1 = require("./environment-options");
 const cacache = require('cacache');
 const packageVersion = require('../../package.json').version;
 class BundleActionCache {