fix(@angular-devkit/build-optimizer): fix es5 detection for Angular 5 packages

Author: filipesilva

packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts

@@ -16,29 +16,29 @@ import { getWrapEnumsTransformer, testWrapEnums } from '../transforms/wrap-enums
 
 
 const whitelistedAngularModules = [
-  /[\\\/]node_modules[\\\/]@angular[\\\/]animations[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]common[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]compiler[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]core[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]forms[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]http[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]platform-browser-dynamic[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]platform-browser[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]platform-webworker-dynamic[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]platform-webworker[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]router[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]upgrade[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]material[\\\/]/,
-  /[\\\/]node_modules[\\\/]@angular[\\\/]cdk[\\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]animations[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]common[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]compiler[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]core[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]forms[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]http[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]platform-browser-dynamic[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]platform-browser[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]platform-webworker-dynamic[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]platform-webworker[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]router[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]upgrade[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]material[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]cdk[\\/]/,
 ];
 
 const es5AngularModules = [
   // Angular 4 packaging format has .es5.js as the extension.
-  /.es5.js$/, // Angular 4
+  /\.es5\.js$/, // Angular 4
   // Angular 5 has esm5 folders.
-  /[\\\/]node_modules[\\\/]@angular[\\\/][^\\/][\\\/]esm5[\\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/][^\\/]+[\\/]esm5[\\/]/,
   // All Angular versions have UMD with es5.
-  /.umd.js$/,
+  /\.umd\.js$/,
 ];
 
 export interface BuildOptimizerOptions {

packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts

@@ -17,7 +17,7 @@ describe('build-optimizer', () => {
   const decorators = 'Clazz.decorators = [ { type: Injectable } ];';
 
   describe('basic functionality', () => {
-    it('applies class-fold, scrub-file and prefix-functions', () => {
+    it('applies class-fold, scrub-file and prefix-functions to whitelisted es5 modules', () => {
       const input = tags.stripIndent`
         ${imports}
         var __extends = (this && this.__extends) || function (d, b) {
@@ -50,10 +50,19 @@ describe('build-optimizer', () => {
         var Clazz = /*@__PURE__*/ (function () { function Clazz() { } ${staticProperty} return Clazz; }());
       `;
 
-      const inputFilePath = '/node_modules/@angular/core/@angular/core.es5.js';
-      const boOutput = buildOptimizer({ content: input, inputFilePath });
-      expect(tags.oneLine`${boOutput.content}`).toEqual(output);
-      expect(boOutput.emitSkipped).toEqual(false);
+      // Check Angular 4/5 and unix/windows paths.
+      const inputPaths = [
+        '/node_modules/@angular/core/@angular/core.es5.js',
+        '/node_modules/@angular/core/esm5/core.js',
+        '\\node_modules\\@angular\\core\\@angular\\core.es5.js',
+        '\\node_modules\\@angular\\core\\esm5\\core.js',
+      ];
+
+      inputPaths.forEach((inputFilePath) => {
+        const boOutput = buildOptimizer({ content: input, inputFilePath });
+        expect(tags.oneLine`${boOutput.content}`).toEqual(output);
+        expect(boOutput.emitSkipped).toEqual(false);
+      });
     });
 
     it('doesn\'t process files without decorators/ctorParameters/outside Angular', () => {