fix(@angular-devkit/build-optimizer): limit actions on webpack bundles

clydin · hansl · commit b2f69ee27fad · 2018-06-05T17:55:15.000-07:00
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
@@ -87,6 +87,16 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
     content = readFileSync(inputFilePath as string, 'UTF-8');
   }
 
+  if (!content) {
+    return {
+      content: null,
+      sourceMap: null,
+      emitSkipped: true,
+    };
+  }
+
+  const isWebpackBundle = content.indexOf('__webpack_require__') !== -1;
+
   // Determine which transforms to apply.
   const getTransforms = [];
 
@@ -119,7 +129,11 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
     getTransforms.unshift(getPrefixClassesTransformer);
   }
 
-  if (ignoreTest || testImportTslib(content)) {
+  // This transform introduces import/require() calls, but this won't work properly on libraries
+  // built with Webpack. These libraries use __webpack_require__() calls instead, which will break
+  // with a new import that wasn't part of it's original module list.
+  // We ignore this transform for such libraries.
+  if (!isWebpackBundle && (ignoreTest || testImportTslib(content))) {
     getTransforms.unshift(getImportTslibTransformer);
   }
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
@@ -11,13 +11,7 @@ import * as ts from 'typescript';
 export function testImportTslib(content: string) {
   const regex = /var (__extends|__decorate|__metadata|__param) = \(.*\r?\n(    .*\r?\n)*\};/;
 
-  // This transform introduces import/require() calls, but this won't work properly on libraries
-  // built with Webpack. These libraries use __webpack_require__() calls instead, which will break
-  // with a new import that wasn't part of it's original module list.
-  // We ignore this transform for such libraries.
-  const webpackRequireRegex = /__webpack_require__/;
-
-  return regex.test(content) && !webpackRequireRegex.test(content);
+  return regex.test(content);
 }
 
 export function getImportTslibTransformer(): ts.TransformerFactory<ts.SourceFile> {
@@ -35,8 +29,7 @@ export function getImportTslibTransformer(): ts.TransformerFactory<ts.SourceFile
           const declarations = node.declarationList.declarations;
 
           if (declarations.length === 1 && ts.isIdentifier(declarations[0].name)) {
-            // NOTE: the replace is unnecessary with TS2.5+; tests currently run with TS2.4
-            const name = (declarations[0].name as ts.Identifier).text.replace(/^___/, '__');
+            const name = (declarations[0].name as ts.Identifier).text;
 
             if (isHelperName(name)) {
               // TODO: maybe add a few more checks, like checking the first part of the assignment.
