fix(serve): add flag to indicate to serve for a cordova app

ionic-team · Nov 30, 2016 · 93782e7 · 93782e7
1 parent a0c3f5d
commit 93782e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/dev-server/http-server.ts b/src/dev-server/http-server.ts
@@ -99,6 +99,10 @@ function servePlatformResource(req: express.Request, res: express.Response, next
   const userAgent = req.header('user-agent');
   let resourcePath = config.wwwDir;
 
+  if (!config.isCordovaServe) {
+    return next();
+  }
+
   if (isUserAgentIOS(userAgent)) {
     resourcePath = path.join(config.rootDir, IOS_PLATFORM_PATH);
   } else if (isUserAgentAndroid(userAgent)) {

diff --git a/src/dev-server/serve-config.ts b/src/dev-server/serve-config.ts
@@ -6,6 +6,7 @@ export interface ServeConfig {
   rootDir: string;
   wwwDir: string;
   buildDir: string;
+  isCordovaServe: boolean;
   launchBrowser: boolean;
   launchLab: boolean;
   browserToLaunch: string;

diff --git a/src/serve.ts b/src/serve.ts
@@ -23,6 +23,7 @@ export function serve(context?: BuildContext) {
     rootDir: context.rootDir,
     wwwDir: context.wwwDir,
     buildDir: context.buildDir,
+    isCordovaServe: isCordovaServe(context),
     launchBrowser: launchBrowser(context),
     launchLab: launchLab(context),
     browserToLaunch: browserToLaunch(context),
@@ -99,6 +100,10 @@ function useServerLogs(context: BuildContext) {
   return hasConfigValue(context, '--serverlogs', '-s', 'ionic_serverlogs', false);
 }
 
+function isCordovaServe(context: BuildContext) {
+  return hasConfigValue(context, '--iscordovaserve', '-z', 'ionic_cordova_serve', false);
+}
+
 function launchBrowser(context: BuildContext) {
   return !hasConfigValue(context, '--nobrowser', '-b', 'ionic_launch_browser', false);
 }