From 7c304a1c1c3826d77eb8f3c8bf8f3ee2e671d42d Mon Sep 17 00:00:00 2001 From: Muhammed Thanish Date: Mon, 6 Jun 2016 13:25:06 +0530 Subject: [PATCH] Support multiple static dirs --- dist/server/build.js | 16 +++++++++------- dist/server/index.js | 17 ++++++++++------- dist/server/utils.js | 5 +++++ src/server/build.js | 18 ++++++++++-------- src/server/index.js | 16 +++++++++------- src/server/utils.js | 4 ++++ 6 files changed, 47 insertions(+), 29 deletions(-) diff --git a/dist/server/build.js b/dist/server/build.js index 04f3cbaa4b8..62bf755dfa5 100644 --- a/dist/server/build.js +++ b/dist/server/build.js @@ -50,7 +50,7 @@ process.env.NODE_ENV = 'production'; // avoid ESLint errors var logger = console; -_commander2.default.version(_package2.default.version).option('-s, --static-dir [dir-name]', 'Directory where to load static files from').option('-o, --output-dir [dir-name]', 'Directory where to store built files').option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from').parse(process.argv); +_commander2.default.version(_package2.default.version).option('-s, --static-dir ', 'Directory where to load static files from', _utils.parseList).option('-o, --output-dir [dir-name]', 'Directory where to store built files').option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from').parse(process.argv); // Build the webpack configuration using the `baseConfig` // custom `.babelrc` file and `webpack.config.js` files @@ -74,12 +74,14 @@ _fs2.default.writeFileSync(_path2.default.resolve(outputDir, 'iframe.html'), (0, // copy all static files if (_commander2.default.staticDir) { - if (!_fs2.default.existsSync(_commander2.default.staticDir)) { - logger.error('Error: no such directory to load static files: ' + _commander2.default.staticDir); - process.exit(-1); - } - logger.log('=> Copying static files from: ' + _commander2.default.staticDir); - _shelljs2.default.cp('-r', _commander2.default.staticDir + '/', outputDir); + _commander2.default.staticDir.forEach(function (dir) { + if (!_fs2.default.existsSync(dir)) { + logger.error('Error: no such directory to load static files: ' + dir); + process.exit(-1); + } + logger.log('=> Copying static files from: ' + dir); + _shelljs2.default.cp('-r', dir + '/', outputDir); + }); } // compile all resources with webpack and write them to the disk. diff --git a/dist/server/index.js b/dist/server/index.js index 878df799781..a4ee8cc1b7a 100755 --- a/dist/server/index.js +++ b/dist/server/index.js @@ -25,11 +25,13 @@ var _package = require('../../package.json'); var _package2 = _interopRequireDefault(_package); +var _utils = require('./utils'); + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var logger = console; -_commander2.default.version(_package2.default.version).option('-p, --port [number]', 'Port to run Storybook (Required)', parseInt).option('-h, --host [string]', 'Host to run Storybook').option('-s, --static-dir [dir-name]', 'Directory where to load static files from').option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from').parse(process.argv); +_commander2.default.version(_package2.default.version).option('-p, --port [number]', 'Port to run Storybook (Required)', parseInt).option('-h, --host [string]', 'Host to run Storybook').option('-s, --static-dir ', 'Directory where to load static files from', _utils.parseList).option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from').parse(process.argv); if (!_commander2.default.port) { logger.error('Error: port to run Storybook is required!\n'); @@ -47,14 +49,15 @@ if (_commander2.default.host) { var app = (0, _express2.default)(); if (_commander2.default.staticDir) { - var staticPath = _path2.default.resolve(_commander2.default.staticDir); - if (_fs2.default.existsSync(staticPath)) { + _commander2.default.staticDir.forEach(function (dir) { + var staticPath = _path2.default.resolve(dir); + if (!_fs2.default.existsSync(staticPath)) { + logger.error('Error: no such directory to load static files: ' + staticPath); + process.exit(-1); + } logger.log('=> Loading static files from: ' + staticPath + ' .'); app.use(_express2.default.static(staticPath, { index: false })); - } else { - logger.error('Error: no such directory to load static files: ' + staticPath); - process.exit(-1); - } + }); } // Build the webpack configuration using the `baseConfig` diff --git a/dist/server/utils.js b/dist/server/utils.js index 0d676f9437c..f212d415d28 100644 --- a/dist/server/utils.js +++ b/dist/server/utils.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.parseList = parseList; exports.getHeadHtml = getHeadHtml; var _path = require('path'); @@ -15,6 +16,10 @@ var _fs2 = _interopRequireDefault(_fs); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +function parseList(str) { + return str.split(','); +} + function getHeadHtml(configDirPath) { var headHtmlPath = _path2.default.resolve(configDirPath, 'head.html'); var headHtml = ''; diff --git a/src/server/build.js b/src/server/build.js index 6645efa9a8c..d987f9b0424 100644 --- a/src/server/build.js +++ b/src/server/build.js @@ -12,14 +12,14 @@ import baseConfig from './webpack.config.prod'; import loadConfig from './config'; import getIndexHtml from './index.html'; import getIframeHtml from './iframe.html'; -import { getHeadHtml } from './utils'; +import { getHeadHtml, parseList } from './utils'; // avoid ESLint errors const logger = console; program .version(packageJson.version) - .option('-s, --static-dir [dir-name]', 'Directory where to load static files from') + .option('-s, --static-dir ', 'Directory where to load static files from', parseList) .option('-o, --output-dir [dir-name]', 'Directory where to store built files') .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from') .parse(process.argv); @@ -46,12 +46,14 @@ fs.writeFileSync(path.resolve(outputDir, 'iframe.html'), getIframeHtml(headHtml, // copy all static files if (program.staticDir) { - if (!fs.existsSync(program.staticDir)) { - logger.error(`Error: no such directory to load static files: ${program.staticDir}`); - process.exit(-1); - } - logger.log(`=> Copying static files from: ${program.staticDir}`); - shelljs.cp('-r', `${program.staticDir}/`, outputDir); + program.staticDir.forEach(dir => { + if (!fs.existsSync(dir)) { + logger.error(`Error: no such directory to load static files: ${dir}`); + process.exit(-1); + } + logger.log(`=> Copying static files from: ${dir}`); + shelljs.cp('-r', `${dir}/`, outputDir); + }); } // compile all resources with webpack and write them to the disk. diff --git a/src/server/index.js b/src/server/index.js index e1e6de04027..1eb46ef6420 100755 --- a/src/server/index.js +++ b/src/server/index.js @@ -6,6 +6,7 @@ import path from 'path'; import fs from 'fs'; import storybook from './middleware'; import packageJson from '../../package.json'; +import { parseList } from './utils'; const logger = console; @@ -13,7 +14,7 @@ program .version(packageJson.version) .option('-p, --port [number]', 'Port to run Storybook (Required)', parseInt) .option('-h, --host [string]', 'Host to run Storybook') - .option('-s, --static-dir [dir-name]', 'Directory where to load static files from') + .option('-s, --static-dir ', 'Directory where to load static files from', parseList) .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from') .parse(process.argv); @@ -33,14 +34,15 @@ if (program.host) { const app = express(); if (program.staticDir) { - const staticPath = path.resolve(program.staticDir); - if (fs.existsSync(staticPath)) { + program.staticDir.forEach(dir => { + const staticPath = path.resolve(dir); + if (!fs.existsSync(staticPath)) { + logger.error(`Error: no such directory to load static files: ${staticPath}`); + process.exit(-1); + } logger.log(`=> Loading static files from: ${staticPath} .`); app.use(express.static(staticPath, { index: false })); - } else { - logger.error(`Error: no such directory to load static files: ${staticPath}`); - process.exit(-1); - } + }); } // Build the webpack configuration using the `baseConfig` diff --git a/src/server/utils.js b/src/server/utils.js index 27d275d5bc1..816727ba2d5 100644 --- a/src/server/utils.js +++ b/src/server/utils.js @@ -1,6 +1,10 @@ import path from 'path'; import fs from 'fs'; +export function parseList(str) { + return str.split(','); +} + export function getHeadHtml(configDirPath) { const headHtmlPath = path.resolve(configDirPath, 'head.html'); let headHtml = '';