Better options path resolution

Author: thenikso

lib/bundle.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const relative = require('./utils/relative-path');
 
 module.exports = (args) => new BbPromise((resolve, reject) => {
   const colors = require('colors/safe');
@@ -11,12 +12,14 @@ module.exports = (args) => new BbPromise((resolve, reject) => {
 
   const options = Object.assign(
     {
-      config: path.join(process.cwd(), './webpack.config.js'),
+      config: './webpack.config.js',
       watch: false,
     },
     args || {}
   );
 
+  options.config = relative(options.config);
+
   if (args.help) {
     console.log('  Use Webpack to create the output bundle.');
     console.log(`  ${colors.gray('config')}: The Webpack configuration file (${options.config})`);
@@ -26,7 +29,7 @@ module.exports = (args) => new BbPromise((resolve, reject) => {
 
   console.log(`  Using Webpack config at ${colors.gray(options.config)}`);
 
-  const config = require(options.config);
+  const config = require(path.join(process.cwd(), options.config));
   const bundler = webpack(config);
   let bundlerRunCount = 0;
 

lib/clean.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const relative = require('./utils/relative-path');
 
 module.exports = (args) => BbPromise.resolve(args).then(args => {
   const colors = require('colors/safe');
@@ -11,12 +12,15 @@ module.exports = (args) => BbPromise.resolve(args).then(args => {
 
   const options = Object.assign(
     {
-      package: path.join(process.cwd(), './package.json'),
-      outDir: path.join(process.cwd(), './dist'),
+      package: './package.json',
+      outDir: './dist',
     },
     args || {}
   );
 
+  options.package = relative(options.package);
+  options.outDir = relative(options.outDir);
+
   if (args.help) {
     console.log('  Removes dist files.');
     console.log(`  ${colors.gray('package')}: The npm package.json (${options.package})`);

lib/copy.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const relative = require('./utils/relative-path');
 
 module.exports = (args) => BbPromise.resolve(args).then(args => {
   const colors = require('colors/safe');
@@ -11,12 +12,15 @@ module.exports = (args) => BbPromise.resolve(args).then(args => {
 
   const options = Object.assign(
     {
-      package: path.join(process.cwd(), './package.json'),
-      outDir: path.join(process.cwd(), './dist'),
+      package: './package.json',
+      outDir: './dist',
     },
     args || {}
   );
 
+  options.package = relative(options.package);
+  options.outDir = relative(options.outDir);
+
   if (args.help) {
     console.log('  Copy package json in dist directory as well as static files.');
     console.log(`  ${colors.gray('package')}: The npm package.json (${options.package})`);

lib/image.js

@@ -11,6 +11,7 @@ module.exports = (args) => BbPromise.resolve(args)
     const tar = require('tar-fs');
     const Docker = require('dockerode');
     const JSONStream = require('JSONStream');
+    const relative = require('./utils/relative-path');
 
     console.log(colors.yellow('Image...'));
 
@@ -23,6 +24,9 @@ module.exports = (args) => BbPromise.resolve(args)
       args || {}
     );
 
+    options.package = relative(options.package);
+    options.outDir = relative(options.outDir);
+
     const pkg = fse.readJsonSync(options.package);
     if (!options.repo) {
       options.repo = pkg.name.replace('-', '/');

lib/serve.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const relative = require('./utils/relative-path');
 
 module.exports = (args) => BbPromise.resolve(args)
   .then(require('./build'))
@@ -23,6 +24,9 @@ module.exports = (args) => BbPromise.resolve(args)
       args || {}
     );
 
+    options.package = relative(options.package);
+    options.config = relative(options.config);
+
     if (options.devProxy === true) {
       options.devProxy = 5000;
     }
@@ -78,7 +82,7 @@ module.exports = (args) => BbPromise.resolve(args)
       // TODO a way to select a subconfig is needed
       const webpack = require('webpack');
       const webpackDevServer = require('webpack-dev-server');
-      const config = require(options.config);
+      const config = require(path.join(process.cwd(), options.config));
       const bundler = webpack(config);
       const proxyUrl = `http://localhost:${options.devProxy}`;
 

lib/utils/relative-path.js

@@ -0,0 +1,5 @@
+const path = require('path');
+
+module.exports = function (p) {
+  return path.relative(process.cwd(), p);
+};