Make bundle location relative to webpack publicPath

izzi-bikun-kr · izzi-bikun-kr · commit 84e3e23655c6 · 2016-06-02T16:57:48.000-04:00
diff --git a/dist/manager.js b/dist/manager.js
diff --git a/dist/manager.js.map b/dist/manager.js.map
diff --git a/dist/server/build.js b/dist/server/build.js
@@ -63,8 +63,8 @@ var config = (0, _config2.default)('PRODUCTION', _webpackConfig2.default, config
 
 // Write both the storybook UI and IFRAME HTML files to destination path.
 var headHtml = (0, _utils.getHeadHtml)(configDir);
-_fs2.default.writeFileSync(_path2.default.resolve(outputDir, 'index.html'), (0, _index2.default)());
-_fs2.default.writeFileSync(_path2.default.resolve(outputDir, 'iframe.html'), (0, _iframe2.default)(headHtml));
+_fs2.default.writeFileSync(_path2.default.resolve(outputDir, 'index.html'), (0, _index2.default)(config.output.publicPath));
+_fs2.default.writeFileSync(_path2.default.resolve(outputDir, 'iframe.html'), (0, _iframe2.default)(headHtml, config.output.publicPath));
 
 // copy all static files
 if (_commander2.default.staticDir) {
diff --git a/dist/server/iframe.html.js b/dist/server/iframe.html.js
@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.default = function (headHtml) {
-  return "\n    <!DOCTYPE html>\n    <html>\n      <head>\n        <meta charset=\"utf-8\">\n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n        <script>\n          if (window.parent !== window) {\n            window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;\n          }\n        </script>\n        <title>React Storybook</title>\n        " + headHtml + "\n      </head>\n      <body>\n        <div id=\"root\"></div>\n        <script src=\"static/preview.bundle.js\"></script>\n      </body>\n    </html>\n  ";
+exports.default = function (headHtml, publicPath) {
+  return "\n    <!DOCTYPE html>\n    <html>\n      <head>\n        <meta charset=\"utf-8\">\n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n        <script>\n          if (window.parent !== window) {\n            window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;\n          }\n        </script>\n        <title>React Storybook</title>\n        " + headHtml + "\n      </head>\n      <body>\n        <div id=\"root\"></div>\n        <script src=\"" + publicPath + "preview.bundle.js\"></script>\n      </body>\n    </html>\n  ";
 };
diff --git a/dist/server/index.html.js b/dist/server/index.html.js
diff --git a/dist/server/middleware.js b/dist/server/middleware.js
@@ -19,12 +19,12 @@ exports.default = function (configDir) {
   router.use((0, _webpackHotMiddleware2.default)(compiler));
 
   router.get('/', function (req, res) {
-    res.send((0, _index2.default)());
+    res.send((0, _index2.default)(config.output.publicPath));
   });
 
   var headHtml = (0, _utils.getHeadHtml)(configDir);
   router.get('/iframe.html', function (req, res) {
-    res.send((0, _iframe2.default)(headHtml));
+    res.send((0, _iframe2.default)(headHtml, config.output.publicPath));
   });
 
   return router;
diff --git a/src/server/build.js b/src/server/build.js
@@ -35,8 +35,9 @@ const config = loadConfig('PRODUCTION', baseConfig, configDir);
 
 // Write both the storybook UI and IFRAME HTML files to destination path.
 const headHtml = getHeadHtml(configDir);
-fs.writeFileSync(path.resolve(outputDir, 'index.html'), getIndexHtml());
-fs.writeFileSync(path.resolve(outputDir, 'iframe.html'), getIframeHtml(headHtml));
+fs.writeFileSync(path.resolve(outputDir, 'index.html'), getIndexHtml(config.output.publicPath));
+fs.writeFileSync(path.resolve(outputDir, 'iframe.html'),
+    getIframeHtml(headHtml, config.output.publicPath));
 
 // copy all static files
 if (program.staticDir) {
diff --git a/src/server/iframe.html.js b/src/server/iframe.html.js
@@ -1,4 +1,4 @@
-export default function (headHtml) {
+export default function (headHtml, publicPath) {
   return `
     <!DOCTYPE html>
     <html>
@@ -15,7 +15,7 @@ export default function (headHtml) {
       </head>
       <body>
         <div id="root"></div>
-        <script src="static/preview.bundle.js"></script>
+        <script src="${publicPath}preview.bundle.js"></script>
       </body>
     </html>
   `;
diff --git a/src/server/index.html.js b/src/server/index.html.js
@@ -1,4 +1,4 @@
-export default function () {
+export default function (publicPath) {
   return `
     <!DOCTYPE html>
     <html>
@@ -38,7 +38,7 @@ export default function () {
       </head>
       <body style="margin: 0;">
         <div id="root"></div>
-        <script src="static/manager.bundle.js"></script>
+        <script src="${publicPath}manager.bundle.js"></script>
       </body>
     </html>
   `;
diff --git a/src/server/middleware.js b/src/server/middleware.js
@@ -23,12 +23,12 @@ export default function (configDir) {
   router.use(webpackHotMiddleware(compiler));
 
   router.get('/', function (req, res) {
-    res.send(getIndexHtml());
+    res.send(getIndexHtml(config.output.publicPath));
   });
 
   const headHtml = getHeadHtml(configDir);
   router.get('/iframe.html', function (req, res) {
-    res.send(getIframeHtml(headHtml));
+    res.send(getIframeHtml(headHtml, config.output.publicPath));
   });
 
   return router;
