From 897ab203ab7b55aa0827a143748e9d97c1ede303 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 19 May 2017 16:25:37 -0500
Subject: [PATCH] fix(): change e2e.prod so that it copies the core files.

---
 scripts/gulp/tasks/e2e.prod.ts                  | 4 +++-
 scripts/gulp/util.ts                            | 4 ++--
 scripts/gulp/utils/app-scripts-worker-client.ts | 6 +++++-
 scripts/gulp/utils/interfaces.ts                | 2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/gulp/tasks/e2e.prod.ts b/scripts/gulp/tasks/e2e.prod.ts
index a6d9af39fa..1a3d26ab75 100644
--- a/scripts/gulp/tasks/e2e.prod.ts
+++ b/scripts/gulp/tasks/e2e.prod.ts
@@ -120,6 +120,8 @@ function buildTest(filePath: string) {
 
   const relativePathFromComponents = relative(dirname(SRC_COMPONENTS_ROOT), srcTestRoot);
   const distTestRoot = join(process.cwd(), 'dist', 'e2e', relativePathFromComponents);
+  const coreCompilerFilePath = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiler');
+  const coreDir = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiled-ionic-angular');
 
   const includeGlob = [ join(ionicAngularDir, '**', '*.ts')];
   const pathToWriteFile = join(distTestRoot, 'tsconfig.json');
@@ -133,7 +135,7 @@ function buildTest(filePath: string) {
   const appNgModulePath = join(dirname(appEntryPoint), 'app.module.ts');
   const distDir = join(distTestRoot, 'www');
 
-  return runAppScriptsBuild(appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, sassConfigPath, copyConfigPath, argv.dev).then(() => {
+  return runAppScriptsBuild(appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, coreCompilerFilePath, coreDir, sassConfigPath, copyConfigPath, argv.dev).then(() => {
     const end = Date.now();
     console.log(`${filePath} took a total of ${(end - start) / 1000} seconds to build`);
   }).catch((err) => {
diff --git a/scripts/gulp/util.ts b/scripts/gulp/util.ts
index 9457f11228..9305ea0085 100644
--- a/scripts/gulp/util.ts
+++ b/scripts/gulp/util.ts
@@ -249,10 +249,10 @@ export function runAppScriptsServe(testOrDemoName: string, appEntryPoint: string
   });
 }
 
-export function runAppScriptsBuild(appEntryPoint: string, appNgModulePath: string, srcDir: string, distDir: string, tsConfig: string, ionicAngularDir: string, sassConfigPath: string, copyConfigPath: string, isDev: boolean = false) {
+export function runAppScriptsBuild(appEntryPoint: string, appNgModulePath: string, srcDir: string, distDir: string, tsConfig: string, ionicAngularDir: string, coreCompilerFilePath: string, coreDir: string, sassConfigPath: string, copyConfigPath: string, isDev: boolean = false) {
   const pathToAppScripts = join(NODE_MODULES_ROOT, '.bin', 'ionic-app-scripts');
   const debug: boolean = argv.debug;
-  return runWorker(pathToAppScripts, debug, appEntryPoint, appNgModulePath, srcDir, distDir, tsConfig, ionicAngularDir, sassConfigPath, copyConfigPath, isDev);
+  return runWorker(pathToAppScripts, debug, appEntryPoint, appNgModulePath, srcDir, distDir, tsConfig, ionicAngularDir, coreCompilerFilePath, coreDir, sassConfigPath, copyConfigPath, isDev);
 }
 
 /** Resolves the path for a node package executable. */
diff --git a/scripts/gulp/utils/app-scripts-worker-client.ts b/scripts/gulp/utils/app-scripts-worker-client.ts
index c3b8dec195..48724793e2 100644
--- a/scripts/gulp/utils/app-scripts-worker-client.ts
+++ b/scripts/gulp/utils/app-scripts-worker-client.ts
@@ -3,7 +3,7 @@ import { dirname, join } from 'path';
 
 import { MessageToWorker, WorkerProcess } from './interfaces';
 
-export function runWorker(pathToAppScripts: string, debug: boolean, appEntryPoint: string, appNgModulePath: string, srcDir: string, distDir: string, tsConfig: string, ionicAngularDir: string, sassConfigPath: string, copyConfigPath: string, isDev: boolean) {
+export function runWorker(pathToAppScripts: string, debug: boolean, appEntryPoint: string, appNgModulePath: string, srcDir: string, distDir: string, tsConfig: string, ionicAngularDir: string, coreCompilerFilePath: string, coreDir: string, sassConfigPath: string, copyConfigPath: string, isDev: boolean) {
   return new Promise((resolve, reject) => {
 
     const msgToWorker: MessageToWorker = {
@@ -15,6 +15,8 @@ export function runWorker(pathToAppScripts: string, debug: boolean, appEntryPoin
       distDir: distDir,
       tsConfig: tsConfig,
       ionicAngularDir: ionicAngularDir,
+      coreCompilerFilePath: coreCompilerFilePath,
+      coreDir: coreDir,
       sassConfigPath: sassConfigPath,
       copyConfigPath: copyConfigPath,
       isDev: isDev
@@ -70,6 +72,8 @@ export function createWorker(msg: MessageToWorker): any {
       '--experimentalManualTreeshaking', 'false',
       '--experimentalPurgeDecorators', 'false',
       '--ionicAngularDir', msg.ionicAngularDir,
+      '--coreCompilerFilePath', msg.coreCompilerFilePath,
+      '--coreDir', msg.coreDir,
       '--sass', msg.sassConfigPath,
       '--copy', msg.copyConfigPath,
       '--enableLint', 'false',
diff --git a/scripts/gulp/utils/interfaces.ts b/scripts/gulp/utils/interfaces.ts
index 9af879f82a..5e5c78272c 100644
--- a/scripts/gulp/utils/interfaces.ts
+++ b/scripts/gulp/utils/interfaces.ts
@@ -13,6 +13,8 @@ export interface MessageToWorker {
   distDir: string;
   tsConfig: string;
   ionicAngularDir: string;
+  coreCompilerFilePath: string;
+  coreDir: string;
   sassConfigPath: string;
   copyConfigPath: string;
   isDev: boolean;