feat(optimization): purge decorators enabled by default

purge decorators enabled by default

Author: danbucholtz

package.json

@@ -41,6 +41,7 @@
     "fs-extra": "2.0.0",
     "glob": "^7.1.1",
     "json-loader": "0.5.4",
+    "magic-string": "^0.19.0",
     "node-sass": "4.5.0",
     "os-name": "2.0.1",
     "postcss": "5.2.11",

src/declarations.d.ts

@@ -1,5 +1,6 @@
 declare module 'autoprefixer';
 declare module 'cross-spawn';
+declare module 'magic-string';
 declare module 'mime-types';
 declare module 'proxyquire';
 declare module 'os-name';

src/optimization.spec.ts

@@ -18,15 +18,15 @@ describe('optimization task', () => {
       };
 
       spyOn(helpers, helpers.getBooleanPropertyValue.name).and.returnValue(false);
-      spyOn(decorators, decorators.purgeDecorators.name);
+      spyOn(decorators, decorators.purgeStaticFieldDecorators.name);
       spyOn(treeshake, treeshake.calculateUnusedComponents.name);
 
       // act
       const result = optimization.doOptimizations(context, new Map());
 
       // assert
       expect(result).toBeTruthy();
-      expect(decorators.purgeDecorators).not.toHaveBeenCalled();
+      expect(decorators.purgeStaticFieldDecorators).not.toHaveBeenCalled();
       expect(treeshake.calculateUnusedComponents).not.toHaveBeenCalled();
     });
   });

src/optimization.ts

@@ -1,12 +1,15 @@
-import { extname, join } from 'path';
+import { extname } from 'path';
+
+import * as MagicString from 'magic-string';
+
 import { Logger } from './logger/logger';
 import { fillConfigDefaults, getUserConfigFile, replacePathVars } from './util/config';
 import * as Constants from './util/constants';
 import { BuildError } from './util/errors';
-import { getBooleanPropertyValue, webpackStatsToDependencyMap, printDependencyMap } from './util/helpers';
+import { getBooleanPropertyValue, getStringPropertyValue, webpackStatsToDependencyMap, printDependencyMap } from './util/helpers';
 import { BuildContext, TaskInfo } from './util/interfaces';
 import { runWebpackFullBuild, WebpackConfig } from './webpack';
-import { purgeDecorators } from './optimization/decorators';
+import { purgeStaticFieldDecorators } from './optimization/decorators';
 import { getAppModuleNgFactoryPath, calculateUnusedComponents, purgeUnusedImportsAndExportsFromIndex, purgeComponentNgFactoryImportAndUsage, purgeProviderControllerImportAndUsage, purgeProviderClassNameFromIonicModuleForRoot } from './optimization/treeshake';
 
 export function optimization(context: BuildContext, configFile: string) {
@@ -50,7 +53,7 @@ export function purgeGeneratedFiles(context: BuildContext, fileNameSuffix: strin
 export function doOptimizations(context: BuildContext, dependencyMap: Map<string, Set<string>>) {
   // remove decorators
   const modifiedMap = new Map(dependencyMap);
-  if (getBooleanPropertyValue(Constants.ENV_EXPERIMENTAL_PURGE_DECORATORS)) {
+  if (getBooleanPropertyValue(Constants.ENV_PURGE_DECORATORS)) {
     removeDecorators(context);
   }
 
@@ -70,15 +73,18 @@ export function doOptimizations(context: BuildContext, dependencyMap: Map<string
 }
 
 function optimizationEnabled() {
-  const purgeDecorators = getBooleanPropertyValue(Constants.ENV_EXPERIMENTAL_PURGE_DECORATORS);
+  const purgeDecorators = getBooleanPropertyValue(Constants.ENV_PURGE_DECORATORS);
   const manualTreeshaking = getBooleanPropertyValue(Constants.ENV_EXPERIMENTAL_MANUAL_TREESHAKING);
   return purgeDecorators || manualTreeshaking;
 }
 
 function removeDecorators(context: BuildContext) {
   const jsFiles = context.fileCache.getAll().filter(file => extname(file.path) === '.js');
   jsFiles.forEach(jsFile => {
-    jsFile.content = purgeDecorators(jsFile.path, jsFile.content);
+    let magicString = new MagicString(jsFile.content);
+    magicString = purgeStaticFieldDecorators(jsFile.path, jsFile.content, getStringPropertyValue(Constants.ENV_VAR_IONIC_ANGULAR_DIR), getStringPropertyValue(Constants.ENV_VAR_AT_ANGULAR_DIR), context.srcDir, magicString);
+    jsFile.content = magicString.toString();
+    // jsFile.content = removeTSickleClosureDeclarations(jsFile.path, jsFile.content, getStringPropertyValue(Constants.ENV_VAR_IONIC_ANGULAR_DIR), context.srcDir);
   });
 }