From 1f3c4dcdfcd3bcb45836eab59058f6b5c35c959d Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Fri, 10 Mar 2017 19:25:46 +0000 Subject: [PATCH 1/3] Webpack verbose --- src/cli/commands.js | 5 +++++ src/cli/domain/package-components.js | 11 +++++------ src/cli/domain/package-server-script/index.js | 10 +++++++--- src/cli/facade/dev.js | 9 ++++++++- tasks/build.js | 8 ++++++-- test/unit/cli-domain-package-components.js | 6 +++++- 6 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/cli/commands.js b/src/cli/commands.js index 27ea8770b..ccc6f776c 100644 --- a/src/cli/commands.js +++ b/src/cli/commands.js @@ -19,6 +19,11 @@ module.exports = { boolean: true, description: 'Enables hot reloading. Note: when hot reloading is set to true, each request to the component will make the registry to create a new instance for the javascript closures to be loaded, while when false the instance will be recycled between components executions', default: true + }, + verbose: { + boolean: true, + description: 'Verbosity', + default: false } }, usage: 'Usage: $0 dev [port] [baseUrl] [options]' diff --git a/src/cli/domain/package-components.js b/src/cli/domain/package-components.js index a2e6390ee..2b18c6d69 100644 --- a/src/cli/domain/package-components.js +++ b/src/cli/domain/package-components.js @@ -12,12 +12,10 @@ var getUnixUtcTimestamp = require('../../utils/get-unix-utc-timestamp'); var validator = require('../../registry/domain/validators'); module.exports = function(){ - return function(componentPath, minify, callback){ + return function(options, callback){ - if(_.isFunction(minify)){ - callback = minify; - minify = true; - } + var componentPath = options.componentPath; + var minify = options.minify || true; var files = fs.readdirSync(componentPath), publishPath = path.join(componentPath, '_package'); @@ -72,7 +70,8 @@ module.exports = function(){ componentPath: componentPath, dependencies: component.dependencies, ocOptions: component.oc, - publishPath: publishPath + publishPath: publishPath, + verbose: options.verbose }, function(err, packagedServerScriptInfo){ if(err){ return cb(err); } diff --git a/src/cli/domain/package-server-script/index.js b/src/cli/domain/package-server-script/index.js index 63c39f12a..e3eb8413b 100644 --- a/src/cli/domain/package-server-script/index.js +++ b/src/cli/domain/package-server-script/index.js @@ -2,10 +2,13 @@ var fs = require('fs-extra'); var path = require('path'); -var hashBuilder = require('../../../utils/hash-builder'); + var bundle = require('./bundle'); +var hashBuilder = require('../../../utils/hash-builder'); + +var webpackDefault = { stats: 'errors-only' }; -var webpackDefaults = { +var webpackVerbose = { stats: { chunks: false, colors: true, @@ -17,9 +20,10 @@ var webpackDefaults = { module.exports = function packageServerScript(params, callback){ var fileName = 'server.js'; var publishPath = params.publishPath; + var webpackParams = params.verbose ? webpackVerbose : webpackDefault; var bundleParams = { - webpack: params.webpack || webpackDefaults, + webpack: params.webpack || webpackParams, dependencies: params.dependencies || {}, fileName: fileName, dataPath: path.join(params.componentPath, params.ocOptions.files.data) diff --git a/src/cli/facade/dev.js b/src/cli/facade/dev.js index 9ad615183..0c3c8e843 100644 --- a/src/cli/facade/dev.js +++ b/src/cli/facade/dev.js @@ -75,7 +75,14 @@ module.exports = function(dependencies){ log.warn(strings.messages.cli.PACKAGING_COMPONENTS, true); async.eachSeries(componentsDirs, function(dir, cb){ - local.package(dir, false, function(err){ + + var packageOptions = { + componentPath: dir, + minify: false, + verbose: opts.verbose + }; + + local.package(packageOptions, function(err){ if(!err){ i++; } cb(err); }); diff --git a/tasks/build.js b/tasks/build.js index c097f0216..dd82f7a98 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -41,9 +41,13 @@ module.exports = function(grunt){ fs.writeFileSync(path.join(__dirname, '../client/src/oc-client.min.js'), compressedCode); var Local = require('../src/cli/domain/local'), - local = new Local({ logger: { log: grunt.log.writeln }}); + local = new Local({ logger: { log: grunt.log.writeln }}), + packageOptions = { + componentPath: path.join(__dirname, clientComponentDir), + verbose: false + }; - local.package(path.join(__dirname, clientComponentDir), function(err, res){ + local.package(packageOptions, function(err, res){ grunt.log[!!err ? 'error' : 'ok'](!!err ? err : 'Client has been built and packaged'); done(); }); diff --git a/test/unit/cli-domain-package-components.js b/test/unit/cli-domain-package-components.js index 7938d20b6..7b0f31d4f 100644 --- a/test/unit/cli-domain-package-components.js +++ b/test/unit/cli-domain-package-components.js @@ -48,7 +48,11 @@ var initialise = function(){ }; var executePackaging = function(local, callback){ - return local('.', false, callback); + return local({ + componentPath: '.', + minify: false, + verbose: false + }, callback); }; describe('cli : domain : local', function(){ From 2b031b71a1fa8e154f6f329e9fc5a6543260a0db Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Fri, 10 Mar 2017 20:31:10 +0000 Subject: [PATCH 2/3] Little cleanup --- src/cli/domain/package-server-script/bundle/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cli/domain/package-server-script/bundle/index.js b/src/cli/domain/package-server-script/bundle/index.js index bfb183b24..485d31c5b 100644 --- a/src/cli/domain/package-server-script/bundle/index.js +++ b/src/cli/domain/package-server-script/bundle/index.js @@ -1,7 +1,6 @@ /*jshint camelcase:false */ 'use strict'; var webpackConfig = require('./config'); -var console = require('console'); var MemoryFS = require('memory-fs'); var webpack = require('webpack'); @@ -32,7 +31,11 @@ module.exports = function bundle(params, callBack) { warning = info.warnings.toString(); } - console.log(stats.toString(params.webpack.stats)); + var log = stats.toString(params.webpack.stats); + + if(!!log){ + console.log(log); + } var serverContentBundled = memoryFs.readFileSync('/build/server.js', 'UTF8'); callBack(warning, serverContentBundled); From 25e9e337e434acf43276bd9de36d864b00224310 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Sat, 11 Mar 2017 10:36:47 +0000 Subject: [PATCH 3/3] requested changes --- src/cli/domain/package-server-script/index.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/cli/domain/package-server-script/index.js b/src/cli/domain/package-server-script/index.js index e3eb8413b..36c97e12f 100644 --- a/src/cli/domain/package-server-script/index.js +++ b/src/cli/domain/package-server-script/index.js @@ -6,21 +6,10 @@ var path = require('path'); var bundle = require('./bundle'); var hashBuilder = require('../../../utils/hash-builder'); -var webpackDefault = { stats: 'errors-only' }; - -var webpackVerbose = { - stats: { - chunks: false, - colors: true, - version: false, - hash: false - } -}; - module.exports = function packageServerScript(params, callback){ var fileName = 'server.js'; var publishPath = params.publishPath; - var webpackParams = params.verbose ? webpackVerbose : webpackDefault; + var webpackParams = { stats: params.verbose ? 'verbose' : 'errors-only' }; var bundleParams = { webpack: params.webpack || webpackParams,