javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): update to Angular 2.4.8

Browse Source 
* chore(angular): update to latest stable angular

* chore(deps): update app-scripts

* chore(deps): sw-toolbox

* chore(deps): bump to 1.1.1 app-scripts

* chore(deps): abc order sw-toolbox

* chore(deps): update to angular 2.4.8

* chore(build): pass appNgModule path to app-scripts, make run AoT instead of Prod when using --debug

pass appNgModule path to app-scripts, make run AoT instead of Prod when using --debug
This commit is contained in:
Justin Willis
2017-02-21 16:43:38 -06:00
committed by GitHub
parent 6ceec7ad4d
commit 555519da62
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
package.json
View File

@ -25,21 +25,21 @@
"link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link" "link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link"
}, },
"dependencies": { "dependencies": {
"@angular/common": "2.2.1", "@angular/common": "2.4.8",
"@angular/compiler": "2.2.1", "@angular/compiler": "2.4.8",
"@angular/compiler-cli": "2.2.1", "@angular/compiler-cli": "2.4.8",
"@angular/core": "2.2.1", "@angular/core": "2.4.8",
"@angular/forms": "2.2.1", "@angular/forms": "2.4.8",
"@angular/http": "2.2.1", "@angular/http": "2.4.8",
"@angular/platform-browser": "2.2.1", "@angular/platform-browser": "2.4.8",
"@angular/platform-browser-dynamic": "2.2.1", "@angular/platform-browser-dynamic": "2.4.8",
"@angular/platform-server": "2.2.1", "@angular/platform-server": "2.4.8",
"ionicons": "~3.0.0", "ionicons": "~3.0.0",
"rxjs": "5.0.0-beta.12", "rxjs": "5.1.1",
"zone.js": "~0.6.26" "zone.js": "~0.7.2"
}, },
"devDependencies": { "devDependencies": {
"@ionic/app-scripts": "1.0.0", "@ionic/app-scripts": "1.1.3",
"@ionic/commit-hooks": "1.0.3", "@ionic/commit-hooks": "1.0.3",
"@types/connect": "3.4.30", "@types/connect": "3.4.30",
"@types/del": "2.2.31", "@types/del": "2.2.31",
@ -120,6 +120,7 @@
"semver": "5.3.0", "semver": "5.3.0",
"serve-static": "1.11.1", "serve-static": "1.11.1",
"strip-function": "0.0.3", "strip-function": "0.0.3",
"sw-toolbox": "3.4.0",
"systemjs": "0.19.38", "systemjs": "0.19.38",
"through2": "2.0.1", "through2": "2.0.1",
"ts-node": "1.3.0", "ts-node": "1.3.0",
@ -139,4 +140,4 @@
"pre-push#master": [ "pre-push#master": [
"test" "test"
] ]
} }

3
scripts/gulp/tasks/demos.prod.ts
View File

@ -82,9 +82,10 @@ function buildTest(folderInfo: any) {
let sassConfigPath = 'scripts/demos/sass.config.js'; let sassConfigPath = 'scripts/demos/sass.config.js';
let appEntryPoint = `dist/demos/${folderInfo.componentName}/main.ts`; let appEntryPoint = `dist/demos/${folderInfo.componentName}/main.ts`;
let appNgModule = `dist/demos/${folderInfo.componentName}/app.module.ts`;
let distDir = `dist/demos/${folderInfo.componentName}/`; let distDir = `dist/demos/${folderInfo.componentName}/`;
return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, distDir); return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, appNgModule, distDir);
} }
function buildAllTests(done: Function) { function buildAllTests(done: Function) {

3
scripts/gulp/tasks/e2e.prod.ts
View File

@ -120,9 +120,10 @@ function buildTest(folderInfo: any) {
let sassConfigPath = 'scripts/e2e/sass.config.js'; let sassConfigPath = 'scripts/e2e/sass.config.js';
let appEntryPoint = `dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/main.ts`; 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}/`; 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) { function buildAllTests(done: Function) {

7
scripts/gulp/util.ts
View File

@ -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); console.log('Running ionic-app-scripts build with', folderInfo.componentName, '/', folderInfo.componentTest);
let tsConfig = distDir + 'tsconfig.json'; let tsConfig = distDir + 'tsconfig.json';
let scriptArgs = [ let scriptArgs = [
'build', 'build',
'--prod',
'--sass', sassConfigPath, '--sass', sassConfigPath,
'--appEntryPoint', appEntryPoint, '--appEntryPoint', appEntryPoint,
'--appNgModulePath', appNgModulePath,
'--srcDir', distDir, '--srcDir', distDir,
'--wwwDir', distDir, '--wwwDir', distDir,
'--tsconfig', tsConfig '--tsconfig', tsConfig
@ -194,6 +194,9 @@ export function runAppScripts(folderInfo: any, sassConfigPath: string, appEntryP
const debug: boolean = argv.debug; const debug: boolean = argv.debug;
if (debug) { if (debug) {
scriptArgs.push('--debug'); scriptArgs.push('--debug');
scriptArgs.push('--aot');
} else {
scriptArgs.push('--prod');
} }
try { try {