diff --git a/package.json b/package.json index 19baa1efb0..ac9e4d2c5e 100644 --- a/package.json +++ b/package.json @@ -25,21 +25,21 @@ "link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link" }, "dependencies": { - "@angular/common": "2.2.1", - "@angular/compiler": "2.2.1", - "@angular/compiler-cli": "2.2.1", - "@angular/core": "2.2.1", - "@angular/forms": "2.2.1", - "@angular/http": "2.2.1", - "@angular/platform-browser": "2.2.1", - "@angular/platform-browser-dynamic": "2.2.1", - "@angular/platform-server": "2.2.1", + "@angular/common": "2.4.8", + "@angular/compiler": "2.4.8", + "@angular/compiler-cli": "2.4.8", + "@angular/core": "2.4.8", + "@angular/forms": "2.4.8", + "@angular/http": "2.4.8", + "@angular/platform-browser": "2.4.8", + "@angular/platform-browser-dynamic": "2.4.8", + "@angular/platform-server": "2.4.8", "ionicons": "~3.0.0", - "rxjs": "5.0.0-beta.12", - "zone.js": "~0.6.26" + "rxjs": "5.1.1", + "zone.js": "~0.7.2" }, "devDependencies": { - "@ionic/app-scripts": "1.0.0", + "@ionic/app-scripts": "1.1.3", "@ionic/commit-hooks": "1.0.3", "@types/connect": "3.4.30", "@types/del": "2.2.31", @@ -120,6 +120,7 @@ "semver": "5.3.0", "serve-static": "1.11.1", "strip-function": "0.0.3", + "sw-toolbox": "3.4.0", "systemjs": "0.19.38", "through2": "2.0.1", "ts-node": "1.3.0", @@ -139,4 +140,4 @@ "pre-push#master": [ "test" ] -} \ No newline at end of file +} diff --git a/scripts/gulp/tasks/demos.prod.ts b/scripts/gulp/tasks/demos.prod.ts index 0f8ca91de8..7f90b10731 100644 --- a/scripts/gulp/tasks/demos.prod.ts +++ b/scripts/gulp/tasks/demos.prod.ts @@ -82,9 +82,10 @@ function buildTest(folderInfo: any) { let sassConfigPath = 'scripts/demos/sass.config.js'; let appEntryPoint = `dist/demos/${folderInfo.componentName}/main.ts`; + let appNgModule = `dist/demos/${folderInfo.componentName}/app.module.ts`; let distDir = `dist/demos/${folderInfo.componentName}/`; - return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, distDir); + return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, appNgModule, distDir); } function buildAllTests(done: Function) { diff --git a/scripts/gulp/tasks/e2e.prod.ts b/scripts/gulp/tasks/e2e.prod.ts index d15be7057f..0d2da8b53e 100644 --- a/scripts/gulp/tasks/e2e.prod.ts +++ b/scripts/gulp/tasks/e2e.prod.ts @@ -120,9 +120,10 @@ function buildTest(folderInfo: any) { let sassConfigPath = 'scripts/e2e/sass.config.js'; let appEntryPoint = `dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/main.ts`; + let appNgModule = `dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app.module.ts`; let distDir = `dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/`; - return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, distDir); + return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, appNgModule, distDir); } function buildAllTests(done: Function) { diff --git a/scripts/gulp/util.ts b/scripts/gulp/util.ts index dc23233995..644855af1c 100644 --- a/scripts/gulp/util.ts +++ b/scripts/gulp/util.ts @@ -178,14 +178,14 @@ export function runWebpack(pathToWebpackConfig: string, done: Function) { }); } -export function runAppScripts(folderInfo: any, sassConfigPath: string, appEntryPoint: string, distDir: string) { +export function runAppScripts(folderInfo: any, sassConfigPath: string, appEntryPoint: string, appNgModulePath: string, distDir: string) { console.log('Running ionic-app-scripts build with', folderInfo.componentName, '/', folderInfo.componentTest); let tsConfig = distDir + 'tsconfig.json'; let scriptArgs = [ 'build', - '--prod', '--sass', sassConfigPath, '--appEntryPoint', appEntryPoint, + '--appNgModulePath', appNgModulePath, '--srcDir', distDir, '--wwwDir', distDir, '--tsconfig', tsConfig @@ -194,6 +194,9 @@ export function runAppScripts(folderInfo: any, sassConfigPath: string, appEntryP const debug: boolean = argv.debug; if (debug) { scriptArgs.push('--debug'); + scriptArgs.push('--aot'); + } else { + scriptArgs.push('--prod'); } try {