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

Merge branch 'master' into v4

Browse Source 
# Conflicts:
#	.scss-lint.yml
#	README.md
#	scripts/gulp/tasks/e2e.dev.ts
#	scripts/gulp/util.ts
#	src/components/action-sheet/action-sheet-component.ts
#	src/components/card/card.ios.scss
#	src/components/card/card.md.scss
#	src/components/card/card.wp.scss
#	src/components/card/test/map/main.html
#	src/components/card/test/social/main.html
#	src/components/slides/slides.scss
#	src/components/slides/slides.ts
#	src/components/toggle/toggle.ios.scss
#	src/components/toggle/toggle.ts
#	src/themes/ionic.mixins.scss
This commit is contained in:
Brandy Carney
2017-06-12 13:33:33 -04:00
parent 11f48cba26 3e0d43e7dc
commit 4cd5834cfd
195 changed files with 2991 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/gulp/util.ts
View File

@ -79,7 +79,9 @@ export function createTempTsConfig(includeGlob: string[], target: string, module
config.compilerOptions = Object.assign(config.compilerOptions, overrideCompileOptions);
}
// TS represents paths internally with '/' and expects the tsconfig path to be in this format
let json = JSON.stringify(config, null, 2);
json = json.replace(/\\\\/g, '/');
const dirToCreate = dirname(pathToWriteFile);
ensureDirSync(dirToCreate);
@ -238,9 +240,11 @@ export function runAppScriptsServe(testOrDemoName: string, appEntryPoint: string
}
return new Promise((resolve, reject) => {
const args = ['./node_modules/.bin/ionic-app-scripts'].concat(scriptArgs);
console.log(`node ${args.join(' ')}`);
const spawnedCommand = spawn('node', args, {stdio: 'inherit'});
let pathToAppScripts = join(NODE_MODULES_ROOT, '.bin', 'ionic-app-scripts');
pathToAppScripts = process.platform === 'win32' ? pathToAppScripts + '.cmd' : pathToAppScripts;
const spawnedCommand = spawn(pathToAppScripts, scriptArgs, {stdio: 'inherit'});
console.log(`${pathToAppScripts} ${scriptArgs.join(' ')}`);
spawnedCommand.on('close', (code: number) => {
if (code === 0) {