From ef47387b0d074d666d47f597cef2df277d565ec8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 3 Jul 2020 13:21:41 +0200
Subject: [PATCH] fix(@angular-devkit/build-angular): remove non-global locale
 import warning

We have not yet deprecated the non-global locale data modules (e.g. `@angular/common/locales/fr`) so we should not be issuing warnings about developers using them.

We recently added warning suggesting that a "global" locale should be used instead, and the previous CommonJS/AMD warning about the format of these non-global modules are just confusing for the developer.

Reference: TOOL-1388
Closes: #18123
---
 .../plugins/common-js-usage-warn-plugin.ts    | 31 +++++++------------
 .../browser/specs/common-js-warning_spec.ts   |  6 ++--
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/common-js-usage-warn-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/common-js-usage-warn-plugin.ts
index 7b29299322cd..4b8d7cc1f310 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/common-js-usage-warn-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/common-js-usage-warn-plugin.ts
@@ -47,17 +47,17 @@ export class CommonJsUsageWarnPlugin {
           if (
             !rawRequest ||
             rawRequest.startsWith('.') ||
-            isAbsolute(rawRequest)
-          ) {
-            // Skip if module is absolute or relative.
-            continue;
-          }
-
-          if (
+            isAbsolute(rawRequest) ||
             this.allowedDepedencies.has(rawRequest) ||
-            this.allowedDepedencies.has(this.rawRequestToPackageName(rawRequest))
+            this.allowedDepedencies.has(this.rawRequestToPackageName(rawRequest)) ||
+            rawRequest.startsWith('@angular/common/locales/')
           ) {
-            // Skip as this module is allowed even if it's a CommonJS.
+          /**
+           * Skip when:
+           * - module is absolute or relative.
+           * - module is allowed even if it's a CommonJS.
+           * - module is a locale imported from '@angular/common'.
+           */
             continue;
           }
 
@@ -81,16 +81,9 @@ export class CommonJsUsageWarnPlugin {
             // And if the issuer request is not from 'webpack-dev-server', as 'webpack-dev-server'
             // will require CommonJS libraries for live reloading such as 'sockjs-node'.
             if (mainIssuer?.name === 'main' && !issuer?.userRequest?.includes('webpack-dev-server')) {
-              let warning = `${issuer?.userRequest} depends on '${rawRequest}'.`;
-
-              if (rawRequest.startsWith('@angular/common/locales')) {
-                warning += `\nWhen using the 'localize' option this import is not needed. ` +
-                  `Did you mean to import '${rawRequest.replace(/locales(\/extra)?\//, 'locales/global/')}'?\n` +
-                  'For more info see: https://angular.io/guide/i18n#import-global-variants-of-the-locale-data';
-              } else {
-                warning += ' CommonJS or AMD dependencies can cause optimization bailouts.\n' +
-                  'For more info see: https://angular.io/guide/build#configuring-commonjs-dependencies';
-              }
+              const warning = `${issuer?.userRequest} depends on '${rawRequest}'. ` +
+                'CommonJS or AMD dependencies can cause optimization bailouts.\n' +
+                'For more info see: https://angular.io/guide/build#configuring-commonjs-dependencies';
 
               // Avoid showing the same warning multiple times when in 'watch' mode.
               if (!this.shownWarnings.has(warning)) {
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts
index da10d226a481..52ac19d3f965 100644
--- a/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts
@@ -64,7 +64,7 @@ describe('Browser Builder commonjs warning', () => {
     await run.stop();
   });
 
-  it(`should show warning when importing non global '@angular/common/locale' data`, async () => {
+  it(`should not show warning when importing non global local data '@angular/common/locale/fr'`, async () => {
     // Add a Common JS dependency
     host.appendToFile('src/app/app.component.ts', `
       import '@angular/common/locales/fr';
@@ -74,9 +74,7 @@ describe('Browser Builder commonjs warning', () => {
     const output = await run.result;
     expect(output.success).toBe(true);
 
-    const logMsg = logs.join();
-    expect(logMsg).toMatch(/WARNING in.+app\.component\.ts depends on '@angular\/common\/locales\/fr'/);
-    expect(logMsg).toContain(`Did you mean to import '@angular/common/locales/global/fr'`);
+    expect(logs.join()).not.toContain('WARNING');
     await run.stop();
   });
 });