fix(@angular-devkit/build-angular): minimum threshold

angular · Feb 19, 2019 · bb85edd · bb85edd
1 parent da2ab7e
commit bb85edd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
@@ -154,7 +154,7 @@ export function calculateBytes(
   let value = Number(matches[1]);
   switch (matches[2] && matches[2].toLowerCase()) {
     case '%':
-      value = baselineBytes * value / 100 * factor;
+      value = baselineBytes * value / 100;
       break;
     case 'kb':
       value *= 1024;
@@ -167,5 +167,9 @@ export function calculateBytes(
       break;
   }
 
-  return value + baselineBytes;
+  if (baselineBytes === 0) {
+    return value;
+  }
+
+  return baselineBytes + value * factor;
 }
diff --git a/...es/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts b/...es/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts
@@ -67,6 +67,10 @@ describe('bundle-calculator', () => {
     expect(calculateBytes('25.0gB')).toBe(25 * 1024 * 1024 * 1024);
   });
 
+  it ('converts a decimal with mb and baseline', () => {
+    expect(calculateBytes('3mb', '5mb', -1)).toBe(2 * 1024 * 1024);
+  });
+
   it ('converts a percentage with baseline', () => {
     expect(calculateBytes('20%', '1mb')).toBe(1024 * 1024 * 1.2);
     expect(calculateBytes('20%', '1mb', -1)).toBe(1024 * 1024 * 0.8);