Merge pull request #723 from driftyco/shake-dat-tree

Author: danbucholtz

config/optimization.config.js

@@ -0,0 +1,41 @@
+var path = require('path');
+var webpack = require('webpack');
+var ionicWebpackFactory = require(process.env.IONIC_WEBPACK_FACTORY);
+
+module.exports = {
+  entry: process.env.IONIC_APP_ENTRY_POINT,
+  output: {
+    path: '{{BUILD}}',
+    publicPath: 'build/',
+    filename: 'deptree.js',
+  },
+
+  resolve: {
+    extensions: ['.ts', '.js']
+  },
+
+  module: {
+    loaders: [
+      {
+        test: /\.ts$/,
+        loader: process.env.IONIC_WEBPACK_LOADER
+      },
+      {
+        test: /\.js$/,
+        loader: process.env.IONIC_OPTIMIZATION_LOADER
+      }
+    ]
+  },
+
+  plugins: [
+    ionicWebpackFactory.getIonicEnvironmentPlugin(),
+  ],
+
+  // Some libraries import Node modules but don't use them in the browser.
+  // Tell Webpack to provide empty mocks for them so importing them works.
+  node: {
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty'
+  }
+};

config/webpack.config.js

@@ -24,7 +24,6 @@ module.exports = {
         loader: 'json-loader'
       },
       {
-        //test: /\.(ts|ngfactory.js)$/,
         test: /\.ts$/,
         loader: process.env.IONIC_WEBPACK_LOADER
       }
@@ -33,8 +32,6 @@ module.exports = {
 
   plugins: [
     ionicWebpackFactory.getIonicEnvironmentPlugin(),
-    // ionicWebpackFactory.getNonIonicCommonChunksPlugin(),
-    // ionicWebpackFactory.getIonicCommonChunksPlugin()
   ],
 
   // Some libraries import Node modules but don't use them in the browser.

package.json

@@ -61,15 +61,16 @@
     "xml2js": "^0.4.17"
   },
   "devDependencies": {
-    "@angular/common": "2.4.5",
-    "@angular/compiler": "2.4.5",
-    "@angular/compiler-cli": "2.4.5",
-    "@angular/core": "2.4.5",
-    "@angular/forms": "2.4.5",
-    "@angular/http": "2.4.5",
-    "@angular/platform-browser": "2.4.5",
-    "@angular/platform-browser-dynamic": "2.4.5",
-    "@angular/platform-server": "2.4.5",
+    "@angular/common": "4.0.0-beta.6",
+    "@angular/compiler": "4.0.0-beta.6",
+    "@angular/compiler-cli": "4.0.0-beta.6",
+    "@angular/core": "4.0.0-beta.6",
+    "@angular/forms": "4.0.0-beta.6",
+    "@angular/http": "4.0.0-beta.6",
+    "@angular/platform-browser": "4.0.0-beta.6",
+    "@angular/platform-browser-dynamic": "4.0.0-beta.6",
+    "@angular/platform-server": "4.0.0-beta.6",
+    "@angular/tsc-wrapped": "4.0.0-beta.6",
     "@types/chalk": "^0.4.30",
     "@types/chokidar": "1.4.29",
     "@types/clean-css": "^3.4.29",
@@ -89,13 +90,12 @@
     "ionic-cz-conventional-changelog": "1.0.0",
     "jest": "^18.0.0",
     "mock-fs": "3.11.0",
-    "node-sass": "3.10.1",
     "rewire": "^2.5.2",
     "rimraf": "2.5.4",
     "rxjs": "5.0.0-beta.12",
     "tslint-ionic-rules": "0.0.8",
     "typescript": "~2.0.10",
-    "zone.js": "^0.6.26"
+    "zone.js": "^0.7.2"
   },
   "peerDependencies": {
     "@angular/core": "*",

src/aot/aot-compiler.ts

@@ -1,5 +1,5 @@
-import { mkdirpSync, readFileSync, writeFileSync } from 'fs-extra';
-import { basename, dirname, extname, join, normalize, relative, resolve } from 'path';
+import { readFileSync } from 'fs-extra';
+import { extname, normalize, resolve } from 'path';
 
 import 'reflect-metadata';
 import { CompilerOptions, createProgram, ParsedCommandLine, Program,  transpileModule, TranspileOptions, TranspileOutput } from 'typescript';
@@ -15,7 +15,6 @@ import { getFallbackMainContent, replaceBootstrap } from './utils';
 import { Logger } from '../logger/logger';
 import { printDiagnostics, clearDiagnostics, DiagnosticsType } from '../logger/logger-diagnostics';
 import { runTypeScriptDiagnostics } from '../logger/logger-typescript';
-import { isDebugMode } from '../util/config';
 import { BuildError } from '../util/errors';
 import { changeExtension } from '../util/helpers';
 import { BuildContext } from '../util/interfaces';
@@ -151,37 +150,19 @@ function transpileFiles(context: BuildContext, tsConfig: ParsedTsConfig, fileSys
     fileSystem.addVirtualFile(jsFilePath, transpileOutput.outputText);
     fileSystem.addVirtualFile(jsFilePath + '.map', transpileOutput.sourceMapText);
 
-    // write files to disk here if debug is enabled
-    if (isDebugMode()) {
-      writeNgcFilesToDisk(context, tsFile.path, tsFile.content, transpileOutput.outputText, transpileOutput.sourceMapText);
-    }
     Logger.debug(`[AotCompiler] transpileFiles: Transpiling file ${tsFile.path} ... DONE`);
   }
 }
 
 function transpileFileContent(fileName: string, sourceText: string, options: CompilerOptions): TranspileOutput {
-    const transpileOptions: TranspileOptions = {
-      compilerOptions: options,
-      fileName: fileName,
-      reportDiagnostics: true
-    };
-
-    return transpileModule(sourceText, transpileOptions);
-  }
+  const transpileOptions: TranspileOptions = {
+    compilerOptions: options,
+    fileName: fileName,
+    reportDiagnostics: true
+  };
 
-function writeNgcFilesToDisk(context: BuildContext, typescriptFilePath: string, typescriptFileContent: string, transpiledFileContent: string, sourcemapContent: string) {
-    const dirName = dirname(typescriptFilePath);
-    const relativePath = relative(process.cwd(), dirName);
-    const tmpPath = join(context.tmpDir, relativePath);
-    const fileName = basename(typescriptFilePath);
-    const fileToWrite = join(tmpPath, fileName);
-    const jsFileToWrite = changeExtension(fileToWrite, '.js');
-
-    mkdirpSync(tmpPath);
-    writeFileSync(fileToWrite, typescriptFileContent);
-    writeFileSync(jsFileToWrite, transpiledFileContent);
-    writeFileSync(jsFileToWrite + '.map', sourcemapContent);
-  }
+  return transpileModule(sourceText, transpileOptions);
+}
 
 export interface AotOptions {
   tsConfigPath: string;

src/aot/optimization.ts

@@ -40,11 +40,7 @@ function buildWorker(context: BuildContext) {
     return validateTsConfigSettings(tsConfigContents);
   })
   .then(() => {
-    return preprocess(context);
-  }).then(() => {
     return buildProject(context);
-  }).then(() => {
-    return postprocess(context);
   });
 }
 
@@ -107,6 +103,9 @@ function buildProject(context: BuildContext) {
   const compilePromise = (context.runAot) ? ngc(context) : transpile(context);
 
   return compilePromise
+    .then(() => {
+      return preprocess(context);
+    })
     .then(() => {
       return bundle(context);
     })
@@ -123,6 +122,9 @@ function buildProject(context: BuildContext) {
         copyPromise
       ]);
     })
+    .then(() => {
+      return postprocess(context);
+    })
     .then(() => {
       // kick off the tslint after everything else
       // nothing needs to wait on its completion unless bailing on lint error is enabled

src/build.ts

@@ -66,7 +66,7 @@ describe('clean css task', () => {
       spyOn(config, config.fillConfigDefaults.name).and.returnValue(cleanCssConfig);
       spyOn(helpers, helpers.readFileAsync.name).and.returnValue(Promise.resolve(fileContent));
       spyOn(helpers, helpers.writeFileAsync.name).and.returnValue(Promise.resolve());
-      spyOn(cleanCssFactory, 'getCleanCssInstance').and.returnValue({
+      spyOn(cleanCssFactory, cleanCssFactory.getCleanCssInstance.name).and.returnValue({
         minify: (content: string, cb: Function) => {
           cb(null, { styles: minifiedContent });
         }

src/cleancss.spec.ts

@@ -4,7 +4,7 @@ import * as config from './util/config';
 
 describe('copy task', () => {
   describe('copyConfigToWatchConfig', () => {
-    it('should do something', () => {
+    it('should convert to watch config format', () => {
       // arrange
       const context = { };
       const configFile = 'configFile';

src/copy.spec.ts

@@ -0,0 +1,56 @@
+import { Logger } from './logger/logger';
+import * as Constants from './util/constants';
+import { BuildError } from './util/errors';
+import { FileCache } from './util/file-cache';
+import { readFileAsync, setParsedDeepLinkConfig } from './util/helpers';
+import { BuildContext, ChangedFile, HydratedDeepLinkConfigEntry } from './util/interfaces';
+
+import { getDeepLinkData } from './deep-linking/util';
+
+
+export function deepLinking(context: BuildContext) {
+  const logger = new Logger(`deep links`);
+  return deepLinkingWorker(context).then((hydratedDeepLinkEntryList: HydratedDeepLinkConfigEntry[]) => {
+      setParsedDeepLinkConfig(hydratedDeepLinkEntryList);
+      logger.finish();
+    })
+    .catch((err: Error) => {
+      const error = new BuildError(err.message);
+      error.isFatal = true;
+      throw logger.fail(error);
+    });
+}
+
+
+function deepLinkingWorker(context: BuildContext) {
+  const appModulePath = process.env[Constants.ENV_APP_NG_MODULE_PATH];
+  return getAppNgModuleContent(appModulePath, context.fileCache).then((fileContent: string) => {
+    return extractDeepLinkData(appModulePath, fileContent, context.runAot);
+  });
+}
+
+function getAppNgModuleContent(filePath: string, fileCache: FileCache): Promise<string> {
+  const file = fileCache.get(filePath);
+  if (file) {
+    return Promise.resolve(file.content);
+  }
+  return readFileAsync(filePath).then((fileContent: string) => {
+    // cache it!
+    fileCache.set(filePath, { path: filePath, content: fileContent});
+    return fileContent;
+  });
+}
+
+export function deepLinkingUpdate(changedFiles: ChangedFile[], context: BuildContext) {
+  const appNgModuleChangedFiles = changedFiles.filter(changedFile => changedFile.filePath === process.env[Constants.ENV_APP_NG_MODULE_PATH]);
+  if (appNgModuleChangedFiles.length) {
+    const fileContent = context.fileCache.get(appNgModuleChangedFiles[0].filePath).content;
+    const hydratedDeepLinkEntries = extractDeepLinkData(appNgModuleChangedFiles[0].filePath, fileContent, context.runAot);
+    setParsedDeepLinkConfig(hydratedDeepLinkEntries);
+  }
+  return Promise.resolve();
+}
+
+function extractDeepLinkData(appNgModulePath: string, fileContent: string, isAot: boolean) {
+  return getDeepLinkData(appNgModulePath, fileContent, isAot);
+}

src/deep-linking.ts

@@ -0,0 +1,92 @@
+import * as optimization from './optimization';
+import * as decorators from './optimization/decorators';
+import * as treeshake from './optimization/treeshake';
+import * as helpers from './util/helpers';
+
+import { FileCache } from './util/file-cache';
+
+describe('optimization task', () => {
+  describe('processStatsImpl', () => {
+    it('should convert object graph to known module map', () => {
+      // arrange
+      const moduleOne = '/Users/dan/myModuleOne.js';
+      const moduleTwo = '/Users/dan/myModuleTwo.js';
+      const moduleThree = '/Users/dan/myModuleThree.js';
+      const moduleFour = '/Users/dan/myModuleFour.js';
+      const objectGraph: any = {
+        modules: [
+          {
+            identifier: moduleOne,
+            reasons: [
+              {
+                moduleIdentifier: moduleTwo
+              },
+              {
+                moduleIdentifier: moduleThree
+              }
+            ]
+          },
+          {
+            identifier: moduleTwo,
+            reasons: [
+              {
+                moduleIdentifier: moduleThree
+              }
+            ]
+          },
+          {
+            identifier: moduleThree,
+            reasons: [
+              {
+                moduleIdentifier: moduleOne
+              }
+            ]
+          },
+          {
+            identifier: moduleFour,
+            reasons: []
+          }
+        ]
+      };
+      // act
+      const result = optimization.processStatsImpl(objectGraph);
+
+      // assert
+      const setOne = result.get(moduleOne);
+      expect(setOne.has(moduleTwo)).toBeTruthy();
+      expect(setOne.has(moduleThree)).toBeTruthy();
+
+      const setTwo = result.get(moduleTwo);
+      expect(setTwo.has(moduleThree)).toBeTruthy();
+
+      const setThree = result.get(moduleThree);
+      expect(setThree.has(moduleOne)).toBeTruthy();
+
+      const setFour = result.get(moduleFour);
+      expect(setFour.size).toEqual(0);
+    });
+  });
+
+  describe('doOptimizations', () => {
+    it('should not run optimizations unless flags are set', () => {
+      // arrange
+      const fileCache = new FileCache();
+      fileCache.set('somePath', { path: 'somePath', content: 'someContent'});
+      const context = {
+        fileCache: fileCache
+      };
+
+      spyOn(helpers, helpers.getBooleanPropertyValue.name).and.returnValue(false);
+      spyOn(decorators, decorators.purgeDecorators.name);
+      spyOn(treeshake, treeshake.calculateUnusedComponents.name);
+
+      // act
+      const result = optimization.doOptimizations(context, null);
+
+      // assert
+      expect(result).toEqual(null);
+      expect(decorators.purgeDecorators).not.toHaveBeenCalled();
+      expect(treeshake.calculateUnusedComponents).not.toHaveBeenCalled();
+    });
+  });
+});