From 314934835827ef29ebaadb582f34b2dc1a597492 Mon Sep 17 00:00:00 2001 From: Kevin Gozali Date: Wed, 26 Jul 2017 11:39:07 -0700 Subject: [PATCH] ios: allow application/javascript and text/javascript for packager bundle mime type Summary: When loading bundle from packager, "application/javascript" and "text/javascript" both refer to JS, so let's allow both for now. Reviewed By: javache Differential Revision: D5499446 fbshipit-source-id: f0b42e2fe5dc043a68d2c8df6a9f81e6dd995b57 --- React/Base/RCTJavaScriptLoader.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/React/Base/RCTJavaScriptLoader.mm b/React/Base/RCTJavaScriptLoader.mm index f2598ad66..cbc686d91 100755 --- a/React/Base/RCTJavaScriptLoader.mm +++ b/React/Base/RCTJavaScriptLoader.mm @@ -246,11 +246,13 @@ static void attemptAsynchronousLoadOfBundleAtURL(NSURL *scriptURL, RCTSourceLoad // Validate that the packager actually returned javascript. NSString *contentType = headers[@"Content-Type"]; - if (![contentType isEqualToString:@"application/javascript"]) { + if (![contentType isEqualToString:@"application/javascript"] && + ![contentType isEqualToString:@"text/javascript"]) { + NSString *description = [NSString stringWithFormat:@"Expected Content-Type to be 'application/javascript' or 'text/javascript', but got '%@'.", contentType]; error = [NSError errorWithDomain:@"JSServer" code:NSURLErrorCannotParseResponse userInfo:@{ - NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Expected JavaScript, but got content type '%@'.", contentType], + NSLocalizedDescriptionKey: description, @"headers": headers, @"data": data }];