Fix load bundle issues (#276)

integration_tests/__tests__/start.test.js

@@ -26,9 +26,6 @@ test('start command displays "Select platform" message', () => {
   writeFiles(TEMP_DIR, {
     'webpack.haul.js': '{}',
   });
-  writeFiles(path.resolve(TEMP_DIR, 'node_modules', 'react-native'), {
-    'package.json': JSON.stringify({ version: '0.47.1' }),
-  });
 
   const { stdout } = runHaulSync(TEMP_DIR, ['start']);
   expect(stripAnsi(stdout).trim()).toMatchSnapshot();

package.json

@@ -63,7 +63,6 @@
     "resolve": "^1.3.3",
     "resolve-from": "^4.0.0",
     "rxjs": "^5.4.2",
-    "semver": "^5.4.1",
     "source-map": "^0.5.6",
     "strip-ansi": "^3.0.1",
     "thread-loader": "^1.1.1",

src/__tests__/cliEntry.test.js

@@ -39,10 +39,6 @@ jest.mock('../commands/bundle', () => {
   };
 });
 
-jest.mock('../utils/getReactNativeVersion.js', () => {
-  return () => '0.47.1';
-});
-
 beforeEach(() => {
   // $FlowFixMe
   console.log = jest.fn();

src/server/index.js

@@ -27,6 +27,7 @@ const loggerMiddleware = require('./middleware/loggerMiddleware');
 const missingBundleMiddleware = require('./middleware/missingBundleMiddleware');
 const systraceMiddleware = require('./middleware/systraceMiddleware');
 const rawBodyMiddleware = require('./middleware/rawBodyMiddleware');
+const requestChangeMiddleware = require('./middleware/requestChangeMiddleware');
 
 const WebSocketServer = require('ws').Server;
 
@@ -89,6 +90,7 @@ function createServer(
     .use(openInEditorMiddleware())
     .use('/systrace', systraceMiddleware)
     .use(loggerMiddleware)
+    .use(requestChangeMiddleware)
     .use(webpackMiddleware)
     .use(missingBundleMiddleware);
 

src/server/middleware/requestChangeMiddleware.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright 2017-present, Callstack.
+ * All rights reserved.
+ *
+ * @flow
+ */
+
+/* 
+ * Changes the requested bundle name to `index.${platform}.bundle`
+ * To keep compatibility with all RN versions
+ */
+
+import type { $Request, $Response } from 'express';
+
+module.exports = function requestChangeMiddleware(
+  req: $Request,
+  res: $Response,
+  next: *
+) {
+  const { platform } = req.query;
+  if (platform) {
+    req.url = req.url.replace('index.bundle', `index.${platform}.bundle`);
+  }
+  next();
+};

src/utils/makeReactNativeConfig.js

@@ -8,12 +8,10 @@
 const webpack = require('webpack');
 const path = require('path');
 const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-const semver = require('semver');
 const haulProgressBar = require('./haulProgressBar');
 const AssetResolver = require('../resolvers/AssetResolver');
 const HasteResolver = require('../resolvers/HasteResolver');
 const moduleResolve = require('../utils/resolveModule');
-const getRNVersion = require('../utils/getReactNativeVersion');
 const getBabelConfig = require('./getBabelConfig');
 
 const PLATFORMS = ['ios', 'android'];
@@ -54,7 +52,6 @@ const getDefaultConfig = ({
   process.env.NODE_ENV = dev ? 'development' : 'production';
 
   // Getting Minor version
-  const rnVersion = getRNVersion(root);
   const platformProgressBar = haulProgressBar(platform);
   return {
     context: root,
@@ -68,9 +65,7 @@ const getDefaultConfig = ({
     devtool: bundle ? 'source-map' : 'eval-source-map',
     output: {
       path: path.join(root, 'dist'),
-      filename: semver.gte(rnVersion, '0.49.0')
-        ? `index.bundle`
-        : `index.${platform}.bundle`,
+      filename: `index.${platform}.bundle`,
       publicPath: `http://localhost:${port}/`,
     },
     module: {