Skip to content

Commit 1fc0311

Browse files
Merge pull request #1282 from qbikez/logging
Minor logging improvements
2 parents 8d15c19 + b718b1b commit 1fc0311

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

src/cli/domain/handle-dependencies/install-compiler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function installCompiler(
1616
): void {
1717
const { compilerPath, componentPath, dependency, logger } = options;
1818

19-
logger.warn(strings.messages.cli.INSTALLING_DEPS(dependency), true);
19+
logger.warn(strings.messages.cli.INSTALLING_DEPS(dependency, componentPath));
2020

2121
const npmOptions = {
2222
dependency,

src/cli/domain/handle-dependencies/install-missing-dependencies.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,22 @@ export default function installMissingDependencies(
1717
return callback(null);
1818
}
1919

20-
logger.warn(strings.messages.cli.INSTALLING_DEPS(missing.join(', ')), true);
20+
const installPath = path.resolve('.');
21+
22+
logger.warn(strings.messages.cli.INSTALLING_DEPS(missing.join(', '), installPath));
2123

2224
const npmOptions = {
2325
dependencies: missing,
24-
installPath: path.resolve('.'),
26+
installPath,
2527
save: false,
26-
silent: true,
28+
silent: false,
2729
usePrefix: true
2830
};
2931

3032
npm.installDependencies(npmOptions, err => {
3133
if (err || getMissingDependencies(dependencies).length) {
3234
logger.err('FAIL');
35+
if (err) logger.err(`${err}`);
3336
return callback(strings.errors.cli.DEPENDENCIES_INSTALL_FAIL);
3437
}
3538

src/cli/facade/dev.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@ const dev =
7777

7878
if (!packaging) {
7979
packaging = true;
80-
logger.warn(cliMessages.PACKAGING_COMPONENTS, true);
80+
logger.warn(cliMessages.PACKAGING_COMPONENTS, false);
8181

8282
async.eachSeries(
8383
componentsDirs,
8484
(dir, cb) => {
85+
logger.warn(cliMessages.PACKAGING(dir), false);
8586
const packageOptions = {
8687
componentPath: dir,
8788
minify: false,

src/resources/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ export default {
250250
HELP_HINT: 'Hint: Run -h with any command to show the help',
251251
HOT_RELOADING_DISABLED:
252252
'OC dev is running with hot reloading disabled so changes will be ignored',
253-
INSTALLING_DEPS: (dependencies: string): string =>
254-
`Trying to install missing modules: ${dependencies}\nIf you aren't connected to the internet, or npm isn't configured then this step will fail...`,
253+
INSTALLING_DEPS: (dependencies: string, installPath: string): string =>
254+
`Trying to install missing modules: ${dependencies} into ${installPath}/node_modules.\nIf you aren't connected to the internet, or npm isn't configured then this step will fail...`,
255255
LINKING_DEPENDENCIES: (dependencies: string): string =>
256256
`Trying to link missing modules: ${dependencies}\nThe missing dependencies will be linked to component dependencies`,
257257
MOCKED_PLUGIN: (name: string, value: string): string =>

test/unit/cli-domain-handle-dependencies-install-missing-dependencies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('cli : domain : handle-dependencies : install-missing-dependencies', ()
8282
dependencies: ['[email protected]', 'underscore@latest'],
8383
installPath: '/path/to/oc-running',
8484
save: false,
85-
silent: true,
85+
silent: false,
8686
usePrefix: true
8787
});
8888
});

0 commit comments

Comments
 (0)