diff --git a/local-cli/server/util/attachHMRServer.js b/local-cli/server/util/attachHMRServer.js index ae3110296e4..9554f0ff090 100644 --- a/local-cli/server/util/attachHMRServer.js +++ b/local-cli/server/util/attachHMRServer.js @@ -19,7 +19,12 @@ function attachHMRServer({httpServer, path, packagerServer}) { return; } - // TODO(martinb): send HMR update + packagerServer.buildBundleForHMR({ + entryFile: filename, + // TODO(martinb): receive platform on query string when client connects + platform: 'ios', + }) + .then(bundle => activeWS.send(bundle)); }); const WebSocketServer = require('ws').Server; diff --git a/packager/react-packager/src/Bundler/index.js b/packager/react-packager/src/Bundler/index.js index 824331c492b..87e97d06142 100644 --- a/packager/react-packager/src/Bundler/index.js +++ b/packager/react-packager/src/Bundler/index.js @@ -277,6 +277,29 @@ class Bundler { }); } + bundleForHMR({ + entryFile, + platform, + }) { + return this.getDependencies(entryFile, /*isDev*/true, platform).then(response => { + const module = response.dependencies.filter(module => module.path === entryFile)[0]; + + return Promise.all([ + module.getName(), + this._transformer.loadFileAndTransform(path.resolve(entryFile)), + ]).then(([moduleName, transformedSource]) => { + return (` + __accept( + '${moduleName}', + function(global, require, module, exports) { + ${transformedSource.code} + } + ); + `); + }); + }); + } + invalidateFile(filePath) { this._transformer.invalidateFile(filePath); } diff --git a/packager/react-packager/src/Server/index.js b/packager/react-packager/src/Server/index.js index c2acd305c79..668d38782cb 100644 --- a/packager/react-packager/src/Server/index.js +++ b/packager/react-packager/src/Server/index.js @@ -112,6 +112,17 @@ const bundleOpts = declareOpts({ } }); +const hmrBundleOpts = declareOpts({ + entryFile: { + type: 'string', + required: true, + }, + platform: { + type: 'string', + required: true, + }, +}); + const dependencyOpts = declareOpts({ platform: { type: 'string', @@ -220,6 +231,17 @@ class Server { return this.buildBundle(options); } + buildBundleForHMR(options) { + return Promise.resolve().then(() => { + if (!options.platform) { + options.platform = getPlatformExtension(options.entryFile); + } + + const opts = hmrBundleOpts(options); + return this._bundler.bundleForHMR(opts); + }); + } + getDependencies(options) { return Promise.resolve().then(() => { if (!options.platform) {