javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 11:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(): update for e2e to use ionic core components.

Browse Source
This commit is contained in:
Josh Thomas
2017-06-30 13:38:37 -05:00
parent dd8b5a5bb5
commit 4802fbd477
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/ionic-angular/package.json
View File

@ -23,7 +23,8 @@
"test": "gulp validate", "test": "gulp validate",
"test:generators": "jasmine-node ./tooling/spec", "test:generators": "jasmine-node ./tooling/spec",
"link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link", "link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link",
"link.stencil": "npm link @stencil/core" "link.stencil": "npm link @stencil/core",
"build.stencil": "stencil build"
}, },
"dependencies": { "dependencies": {
"@angular/common": "4.1.3", "@angular/common": "4.1.3",

5
packages/ionic-angular/scripts/gulp/tasks/e2e.dev.ts
View File

@ -1,5 +1,6 @@
import { dirname, join } from 'path'; import { dirname, join } from 'path';
import { readFileSync } from 'fs'; import { readFileSync } from 'fs';
import { spawnSync } from 'child_process';
import { task } from 'gulp'; import { task } from 'gulp';
@ -24,13 +25,15 @@ function serveTest(folderInfo: any) {
const testOrDemoName = join(folderInfo.componentName, folderInfo.componentTest); const testOrDemoName = join(folderInfo.componentName, folderInfo.componentTest);
const ionicAngularDir = join(PROJECT_ROOT, 'src'); const ionicAngularDir = join(PROJECT_ROOT, 'src');
const coreCompilerFilePath = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiler'); const coreCompilerFilePath = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiler');
const coreDir = join(PROJECT_ROOT, '..', 'ionic-core', 'dist', 'compiled-ionic-angular'); const coreDir = join(PROJECT_ROOT, 'dist', 'core');
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')];
const pathToWriteFile = join(distTestRoot, 'tsconfig.json'); const pathToWriteFile = join(distTestRoot, 'tsconfig.json');
const pathToReadFile = join(PROJECT_ROOT, 'tsconfig.json'); const pathToReadFile = join(PROJECT_ROOT, 'tsconfig.json');
spawnSync('npm', ['run', 'build.stencil']);
createTempTsConfig(includeGlob, ES_2015, ES_2015, pathToReadFile, pathToWriteFile, { removeComments: true}); createTempTsConfig(includeGlob, ES_2015, ES_2015, pathToReadFile, pathToWriteFile, { removeComments: true});
const sassConfigPath = join('scripts', 'e2e', 'sass.config.js'); const sassConfigPath = join('scripts', 'e2e', 'sass.config.js');

2
packages/ionic-angular/stencil.config.js
View File

@ -1,5 +1,5 @@
exports.config = { exports.config = {
dest: 'dist', dest: 'dist/core',
collections: [ collections: [
'@ionic/core' '@ionic/core'
] ]