feat(@angular-devkit/build-optimizer): support es2015 modules

Author: filipesilva

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

@@ -16,20 +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
+  // Angular 5 has esm5 folders.
+  /[\\\/]node_modules[\\\/]@angular[\\\/][^\\/][\\\/]esm5[\\\/]/,
+  // All Angular versions have UMD with es5.
+  /.umd.js$/,
 ];
 
 export interface BuildOptimizerOptions {
@@ -70,9 +79,10 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
 
   if (inputFilePath
     && whitelistedAngularModules.some((re) => re.test(inputFilePath))
+    && es5AngularModules.some((re) => re.test(inputFilePath))
   ) {
     getTransforms.push(
-      // getPrefixFunctionsTransformer is rather dangerous, apply only to known pure modules.
+      // getPrefixFunctionsTransformer is rather dangerous, apply only to known pure es5 modules.
       // It will mark both `require()` calls and `console.log(stuff)` as pure.
       // We only apply it to whitelisted modules, since we know they are safe.
       // getPrefixFunctionsTransformer needs to be before getFoldFileTransformer.

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

@@ -66,6 +66,24 @@ describe('build-optimizer', () => {
       expect(boOutput.content).toBeFalsy();
       expect(boOutput.emitSkipped).toEqual(true);
     });
+
+    it('supports es2015 modules', () => {
+      // prefix-functions would add PURE_IMPORTS_START and PURE to the super call.
+      // This test ensures it isn't applied to es2015 modules.
+      const output = oneLine`
+        import { Injectable } from '@angular/core';
+        class Clazz extends BaseClazz { constructor(e) { super(e); } }
+      `;
+      const input = stripIndent`
+        ${output}
+        Clazz.ctorParameters = () => [ { type: Injectable } ];
+      `;
+
+      const inputFilePath = '/node_modules/@angular/core/@angular/core.js';
+      const boOutput = buildOptimizer({ content: input, inputFilePath });
+      expect(oneLine`${boOutput.content}`).toEqual(output);
+      expect(boOutput.emitSkipped).toEqual(false);
+    });
   });
 
 

packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts

@@ -226,7 +226,9 @@ function isCtorParamsAssignmentExpression(exprStmt: ts.ExpressionStatement): boo
   if (expr.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
     return false;
   }
-  if (expr.right.kind !== ts.SyntaxKind.FunctionExpression) {
+  if (expr.right.kind !== ts.SyntaxKind.FunctionExpression
+    && expr.right.kind !== ts.SyntaxKind.ArrowFunction
+  ) {
     return false;
   }
 

packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts

@@ -173,6 +173,20 @@ describe('scrub-file', () => {
       expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
     });
 
+
+    fit('removes top-level Angular constructor parameters in es2015', () => {
+      const output = stripIndent`
+        class Clazz extends BaseClazz { constructor(e) { super(e); } }
+      `;
+      const input = stripIndent`
+        ${output}
+        Clazz.ctorParameters = () => [ { type: Injectable } ];
+      `;
+
+      expect(testScrubFile(input)).toBeTruthy();
+      expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    });
+
     it('removes nested constructor parameters', () => {
       const output = stripIndent`
         import { Injector } from '@angular/core';