fix(@angular-devkit/build-optimizer): fix relative pure imports

filipesilva · hansl · commit bef1b5830ab6 · 2018-06-05T17:55:15.000-07:00
diff --git a/packages/angular_devkit/build_optimizer/src/purify/purify.ts b/packages/angular_devkit/build_optimizer/src/purify/purify.ts
@@ -19,7 +19,12 @@ export interface Insert {
 
 export function purifyReplacements(content: string) {
 
-  const pureImportMatches = getMatches(content, importCommentRegex, 1).join('|');
+  const pureImportMatches = getMatches(content, importCommentRegex, 1)
+    // Remove dots at the start of matches.
+    // Older versions of Purify added dots for relative imports.
+    .map(match => match.replace(/^\.+/, ''))
+    .join('|');
+
   if (!pureImportMatches) {
     return [];
   }
diff --git a/packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts b/packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts
@@ -31,12 +31,32 @@ describe('purify', () => {
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__);
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_zone_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_zone_js__);
       /** PURE_IMPORTS_START rxjs_Subject,zone_js PURE_IMPORTS_END */
-    `;
+      `;
     const output = tags.stripIndent`
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__ = /*@__PURE__*/__webpack_require__("rlar");
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject___default = /*@__PURE__*/__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__);
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_zone_js___default = /*@__PURE__*/__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_zone_js__);
       /** PURE_IMPORTS_START rxjs_Subject,zone_js PURE_IMPORTS_END */
+      `;
+
+    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  // Older versions of Purify added dots for relative imports. We should be backwards compatible.
+  it('finds old matches that started with dots', () => {
+    const input = tags.stripIndent`
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_root__ = __webpack_require__(13);
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = __webpack_require__(67);
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(45);
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(71);
+      /** PURE_IMPORTS_START ._util_root,._util_toSubscriber,.._symbol_observable,._util_pipe PURE_IMPORTS_END */
+    `;
+    const output = tags.stripIndent`
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_root__ = /*@__PURE__*/__webpack_require__(13);
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = /*@__PURE__*/__webpack_require__(67);
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = /*@__PURE__*/__webpack_require__(45);
+      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = /*@__PURE__*/__webpack_require__(71);
+      /** PURE_IMPORTS_START ._util_root,._util_toSubscriber,.._symbol_observable,._util_pipe PURE_IMPORTS_END */
     `;
 
     expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -101,9 +101,12 @@ export function findPureImports(parentNode: ts.Node): string[] {
     if (node.kind === ts.SyntaxKind.ImportDeclaration
       && (node as ts.ImportDeclaration).importClause) {
 
-      // Save the path of the import transformed into snake case
+      // Save the path of the import transformed into snake case and remove relative paths.
       const moduleSpecifier = (node as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral;
-      pureImports.push(moduleSpecifier.text.replace(/[\/@\-]/g, '_'));
+      const pureImport = moduleSpecifier.text
+        .replace(/[\/@\-]/g, '_')
+        .replace(/^\.+/, '');
+      pureImports.push(pureImport);
     }
 
     ts.forEachChild(node, cb);
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
@@ -21,10 +21,12 @@ describe('prefix-functions', () => {
     it('adds import list', () => {
       const input = tags.stripIndent`
         import { Injectable } from '@angular/core';
+        import { Something } from './relative/pure_import';
         var foo = Injectable;
+        var bar = Something;
       `;
       const output = tags.stripIndent`
-        /** PURE_IMPORTS_START _angular_core PURE_IMPORTS_END */
+        /** PURE_IMPORTS_START _angular_core,_relative_pure_import PURE_IMPORTS_END */
         ${input}
       `;
 
