fix(@angular-devkit/build-angular): i18n app shell with Ivy

angular · Oct 30, 2019 · 588baa5 · 588baa5
1 parent 669abae
commit 588baa5
Show file tree

Hide file tree

Showing 6 changed files with 231 additions and 70 deletions.
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -11,7 +11,7 @@ import {
   createBuilder,
   targetFromTargetString,
 } from '@angular-devkit/architect';
-import { JsonObject, join, normalize, resolve, schema } from '@angular-devkit/core';
+import { JsonObject, join, normalize, resolve } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -27,11 +27,6 @@ async function _renderUniversal(
   browserResult: BrowserBuilderOutput,
   serverResult: ServerBuilderOutput,
 ): Promise<BrowserBuilderOutput> {
-  const browserIndexOutputPath = path.join(browserResult.outputPath || '', 'index.html');
-  const indexHtml = fs.readFileSync(browserIndexOutputPath, 'utf8');
-  const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult);
-  const root = context.workspaceRoot;
-
   // Get browser target options.
   const browserTarget = targetFromTargetString(options.browserTarget);
   const rawBrowserOptions = await context.getTargetOptions(browserTarget);
@@ -42,65 +37,72 @@ async function _renderUniversal(
   );
 
   // Initialize zone.js
+  const root = context.workspaceRoot;
   const zonePackage = require.resolve('zone.js', { paths: [root] });
   await import(zonePackage);
 
-  const {
-    AppServerModule,
-    AppServerModuleNgFactory,
-    renderModule,
-    renderModuleFactory,
-  } = await import(serverBundlePath);
-
-  let renderModuleFn: (module: unknown, options: {}) => Promise<string>;
-  let AppServerModuleDef: unknown;
-
-  if (renderModuleFactory && AppServerModuleNgFactory) {
-    renderModuleFn = renderModuleFactory;
-    AppServerModuleDef = AppServerModuleNgFactory;
-  } else if (renderModule && AppServerModule) {
-    renderModuleFn = renderModule;
-    AppServerModuleDef = AppServerModule;
-  } else {
-    throw new Error(`renderModule method and/or AppServerModule were not exported from: ${serverBundlePath}.`);
+  const host = new NodeJsSyncHost();
+  const projectName = context.target && context.target.project;
+  if (!projectName) {
+    throw new Error('The builder requires a target.');
   }
 
-  // Load platform server module renderer
-  const renderOpts = {
-    document: indexHtml,
-    url: options.route,
-  };
-
-  const html = await renderModuleFn(AppServerModuleDef, renderOpts);
-  // Overwrite the client index file.
-  const outputIndexPath = options.outputIndexPath
-    ? path.join(root, options.outputIndexPath)
-    : browserIndexOutputPath;
-
-  fs.writeFileSync(outputIndexPath, html);
-
-  if (browserOptions.serviceWorker) {
-    const host = new NodeJsSyncHost();
+  const projectMetadata = await context.getProjectMetadata(projectName);
+  const projectRoot = resolve(
+    normalize(root),
+    normalize((projectMetadata.root as string) || ''),
+  );
 
-    const projectName = context.target && context.target.project;
-    if (!projectName) {
-      throw new Error('The builder requires a target.');
+  for (const outputPath of browserResult.outputPaths) {
+    const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
+    const browserIndexOutputPath = path.join(outputPath, 'index.html');
+    const indexHtml = fs.readFileSync(browserIndexOutputPath, 'utf8');
+    const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult, localeDirectory);
+
+    const {
+      AppServerModule,
+      AppServerModuleNgFactory,
+      renderModule,
+      renderModuleFactory,
+    } = await import(serverBundlePath);
+
+    let renderModuleFn: (module: unknown, options: {}) => Promise<string>;
+    let AppServerModuleDef: unknown;
+
+    if (renderModuleFactory && AppServerModuleNgFactory) {
+      renderModuleFn = renderModuleFactory;
+      AppServerModuleDef = AppServerModuleNgFactory;
+    } else if (renderModule && AppServerModule) {
+      renderModuleFn = renderModule;
+      AppServerModuleDef = AppServerModule;
+    } else {
+      throw new Error(`renderModule method and/or AppServerModule were not exported from: ${serverBundlePath}.`);
     }
 
-    const projectMetadata = await context.getProjectMetadata(projectName);
-    const projectRoot = resolve(
-      normalize(context.workspaceRoot),
-      normalize((projectMetadata.root as string) || ''),
-    );
-
-    await augmentAppWithServiceWorker(
-      host,
-      normalize(root),
-      projectRoot,
-      join(normalize(root), browserOptions.outputPath),
-      browserOptions.baseHref || '/',
-      browserOptions.ngswConfigPath,
-    );
+    // Load platform server module renderer
+    const renderOpts = {
+      document: indexHtml,
+      url: options.route,
+    };
+
+    const html = await renderModuleFn(AppServerModuleDef, renderOpts);
+    // Overwrite the client index file.
+    const outputIndexPath = options.outputIndexPath
+      ? path.join(root, options.outputIndexPath)
+      : browserIndexOutputPath;
+
+    fs.writeFileSync(outputIndexPath, html);
+
+    if (browserOptions.serviceWorker) {
+      await augmentAppWithServiceWorker(
+        host,
+        normalize(root),
+        projectRoot,
+        normalize(outputPath),
+        browserOptions.baseHref || '/',
+        browserOptions.ngswConfigPath,
+      );
+    }
   }
 
   return browserResult;
@@ -110,11 +112,18 @@ async function _getServerModuleBundlePath(
   options: BuildWebpackAppShellSchema,
   context: BuilderContext,
   serverResult: ServerBuilderOutput,
+  browserLocaleDirectory: string,
 ) {
   if (options.appModuleBundle) {
     return path.join(context.workspaceRoot, options.appModuleBundle);
   } else {
-    const outputPath = serverResult.outputPath || '/';
+    const { baseOutputPath = '' } = serverResult;
+    const outputPath = path.join(baseOutputPath, browserLocaleDirectory);
+
+    if (!fs.existsSync(outputPath)) {
+      throw new Error(`Could not find server output directory: ${outputPath}.`);
+    }
+
     const files = fs.readdirSync(outputPath, 'utf8');
     const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?(?:bundle\.)?js$/;
     const maybeMain = files.filter(x => re.test(x))[0];
@@ -140,15 +149,17 @@ async function _appShellBuilder(
     watch: false,
     serviceWorker: false,
   });
-  const serverTargetRun = await context.scheduleTarget(serverTarget, {});
+  const serverTargetRun = await context.scheduleTarget(serverTarget, {
+    watch: false,
+  });
 
   try {
     const [browserResult, serverResult] = await Promise.all([
-      (browserTargetRun.result as {}) as BrowserBuilderOutput,
-      serverTargetRun.result,
+      browserTargetRun.result as unknown as BrowserBuilderOutput,
+      serverTargetRun.result as unknown as ServerBuilderOutput,
     ]);
 
-    if (browserResult.success === false || browserResult.outputPath === undefined) {
+    if (browserResult.success === false || browserResult.baseOutputPath === undefined) {
       return browserResult;
     } else if (serverResult.success === false) {
       return serverResult;

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -75,6 +75,11 @@ const cacheDownlevelPath = cachingDisabled ? undefined : findCachePath('angular-
 
 export type BrowserBuilderOutput = json.JsonObject &
   BuilderOutput & {
+    baseOutputPath: string;
+    outputPaths: string[];
+    /**
+     * @deprecated in version 9. Use 'outputPaths' instead.
+     */
     outputPath: string;
   };
 
@@ -228,6 +233,7 @@ export function buildWebpackBrowser(
   const host = new NodeJsSyncHost();
   const root = normalize(context.workspaceRoot);
   const baseOutputPath = path.resolve(context.workspaceRoot, options.outputPath);
+  let outputPaths: undefined | string[];
 
   // Check Angular version.
   assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
@@ -278,7 +284,7 @@ export function buildWebpackBrowser(
 
             return { success };
           } else if (success) {
-            const outputPaths = ensureOutputPaths(baseOutputPath, i18n);
+            outputPaths = ensureOutputPaths(baseOutputPath, i18n);
 
             let noModuleFiles: EmittedFiles[] | undefined;
             let moduleFiles: EmittedFiles[] | undefined;
@@ -699,8 +705,9 @@ export function buildWebpackBrowser(
           event =>
             ({
               ...event,
-              // If we use differential loading, both configs have the same outputs
+              baseOutputPath,
               outputPath: baseOutputPath,
+              outputPaths: outputPaths || [baseOutputPath],
             } as BrowserBuilderOutput),
         ),
       );

diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -32,7 +32,12 @@ import { Schema as ServerBuilderOptions } from './schema';
 
 // If success is true, outputPath should be set.
 export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
-  outputPath?: string;
+  baseOutputPath: string;
+  outputPaths: string[];
+  /**
+   * @deprecated in version 9. Use 'outputPaths' instead.
+   */
+  outputPath: string;
 };
 
 export { ServerBuilderOptions };
@@ -52,6 +57,7 @@ export function execute(
   const tsConfig = readTsconfig(options.tsConfig, root);
   const target = tsConfig.options.target || ScriptTarget.ES5;
   const baseOutputPath = path.resolve(root, options.outputPath);
+  let outputPaths: undefined | string[];
 
   return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
     concatMap(({ config, i18n }) => {
@@ -66,7 +72,7 @@ export function execute(
             throw new Error('Webpack stats build result is required.');
           }
 
-          const outputPaths = ensureOutputPaths(baseOutputPath, i18n);
+          outputPaths = ensureOutputPaths(baseOutputPath, i18n);
 
           const success = await i18nInlineEmittedFiles(
             context,
@@ -92,7 +98,9 @@ export function execute(
 
       return {
         ...output,
-        outputPath: path.resolve(root, options.outputPath),
+        baseOutputPath,
+        outputPath: baseOutputPath,
+        outputPaths: outputPaths || [baseOutputPath],
       } as ServerBuilderOutput;
     }),
   );

diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
@@ -76,8 +76,8 @@ export async function browserBuild(
   const output = (await run.result) as BrowserBuilderOutput;
   expect(output.success).toBe(true);
 
-  expect(output.outputPath).not.toBeUndefined();
-  const outputPath = normalize(output.outputPath);
+  expect(output.outputPaths[0]).not.toBeUndefined();
+  const outputPath = normalize(output.outputPaths[0]);
 
   const fileNames = await host.list(outputPath).toPromise();
   const files = fileNames.reduce((acc: { [name: string]: Promise<string> }, path) => {