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

chore(scripts): update build

Browse Source
This commit is contained in:
Adam Bradley
2017-05-02 12:53:32 -05:00
parent 193eafe1e9
commit 94e54eed98
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/gulp/tasks/core.ts
View File

@ -1,4 +1,4 @@
import { SRC_ROOT, DIST_BUILD_ROOT, PROJECT_ROOT } from '../constants'; import { PROJECT_ROOT } from '../constants';
import { task } from 'gulp'; import { task } from 'gulp';
import { accessSync } from 'fs'; import { accessSync } from 'fs';
import { join } from 'path'; import { join } from 'path';
@ -13,16 +13,18 @@ task('core.watch', (done) => {
}); });
function buildAngularBinding(skipBuildingCore: boolean, done: Function) { function buildAngularBinding(isDevAndWatch: boolean, done: Function) {
let hasRunDone = false;
const cwd = join(PROJECT_ROOT, '../ionic-core'); const cwd = join(PROJECT_ROOT, '../ionic-core');
const args = [ const args = [
'run', 'run',
'build.angular', 'build.angular'
SRC_ROOT,
DIST_BUILD_ROOT,
skipBuildingCore ? 'skip-core' : 'do-not-skip-core'
]; ];
if (isDevAndWatch) {
args.push('--', 'dev', 'watch');
}
try { try {
accessSync(cwd); accessSync(cwd);
} catch (e) { } catch (e) {
@ -35,6 +37,10 @@ function buildAngularBinding(skipBuildingCore: boolean, done: Function) {
ls.stdout.on('data', (data) => { ls.stdout.on('data', (data) => {
console.log(data.toString().trim()); console.log(data.toString().trim());
if (!hasRunDone && data.toString().trim().indexOf('compile, done') > -1) {
hasRunDone = true;
done();
}
}); });
ls.stderr.on('data', (data) => { ls.stderr.on('data', (data) => {

4
scripts/gulp/tasks/e2e.dev.ts
View File

@ -23,8 +23,8 @@ task('e2e.watch', ['e2e.prepare', 'core.watch'], (done: Function) => {
function serveTest(folderInfo: any) { function serveTest(folderInfo: any) {
const testOrDemoName = folderInfo.componentName + '/' + folderInfo.componentTest; const testOrDemoName = folderInfo.componentName + '/' + folderInfo.componentTest;
const ionicAngularDir = join(PROJECT_ROOT, 'src'); const ionicAngularDir = join(PROJECT_ROOT, 'src');
const coreCompilerFilePath = join(PROJECT_ROOT, 'dist', 'ionic-angular', 'compiler'); const coreCompilerFilePath = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiler');
const coreDir = join(PROJECT_ROOT, 'dist', 'ionic-angular'); const coreDir = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiled-ionic-angular');
const srcTestRoot = join(PROJECT_ROOT, 'src', 'components', folderInfo.componentName, 'test', folderInfo.componentTest); const srcTestRoot = join(PROJECT_ROOT, 'src', 'components', folderInfo.componentName, 'test', folderInfo.componentTest);
const distTestRoot = join(PROJECT_ROOT, 'dist', 'e2e', 'components', folderInfo.componentName, 'test', folderInfo.componentTest); const distTestRoot = join(PROJECT_ROOT, 'dist', 'e2e', 'components', folderInfo.componentName, 'test', folderInfo.componentTest);
const includeGlob = [ join(ionicAngularDir, '**', '*.ts')]; const includeGlob = [ join(ionicAngularDir, '**', '*.ts')];