Skip to content

Commit

Permalink
Update prettier and let it fix the files
Browse files Browse the repository at this point in the history
  • Loading branch information
abmaonline committed Jun 8, 2020
1 parent f13c022 commit ccb7191
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 24 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/vinyl": "^2.0.4",
"husky": "^1.3.1",
"precise-commits": "^1.0.2",
"prettier": "1.16.4",
"prettier": "1.18.2",
"tslint": "^6.1.2",
"tslint-config-prettier": "1.18.0",
"typescript": "^3.9.5"
Expand Down
26 changes: 6 additions & 20 deletions src/bs-wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -752,18 +752,12 @@ export function create(args: IWrapperConfig): Promise<void> {
if (!tracerEnabled) {
// TODO move path to constant for reuse in call getting json
console.log(
chalk`[{blue ${
instance.name
}}] {cyan Apache Sling Log Tracer is not enabled, so errors from compiling and minifying Less and Javascript by AEM cannot be shown. To enable it, go to [{yellow ${
instance.server
}/system/console/configMgr/org.apache.sling.tracer.internal.LogTracer}] and turn on both 'Enabled' and 'Recording Servlet Enabled'. No restart of aemfed needed}.`
chalk`[{blue ${instance.name}}] {cyan Apache Sling Log Tracer is not enabled, so errors from compiling and minifying Less and Javascript by AEM cannot be shown. To enable it, go to [{yellow ${instance.server}/system/console/configMgr/org.apache.sling.tracer.internal.LogTracer}] and turn on both 'Enabled' and 'Recording Servlet Enabled'. No restart of aemfed needed}.`
);
}
} else {
console.log(
chalk`[{blue ${
instance.name
}}] {cyan Apache Sling Log Tracer config was not found}.`
chalk`[{blue ${instance.name}}] {cyan Apache Sling Log Tracer config was not found}.`
);
}
return instance;
Expand All @@ -774,18 +768,14 @@ export function create(args: IWrapperConfig): Promise<void> {
? `too old (version ${tracerBundle.version})`
: `not installed`;
console.error(
chalk`[{blue ${
instance.name
}}] {cyan Apache Sling Log Tracer bundle is ${reason}. At least version 1.0.0 is needed for aemfed to intercept AEM error messages. AEM 6.2 and before can install and run 1.0.2 or newer, see the 'Updating Sling Log Tracer' section in the README for instructions}.`
chalk`[{blue ${instance.name}}] {cyan Apache Sling Log Tracer bundle is ${reason}. At least version 1.0.0 is needed for aemfed to intercept AEM error messages. AEM 6.2 and before can install and run 1.0.2 or newer, see the 'Updating Sling Log Tracer' section in the README for instructions}.`
);
return instance;
}
})
.catch(err => {
console.error(
chalk`[{blue ${
instance.name
}}] [{red ERROR}] Something went wrong:`,
chalk`[{blue ${instance.name}}] [{red ERROR}] Something went wrong:`,
err
);
})
Expand Down Expand Up @@ -1022,9 +1012,7 @@ export function reload(host: string, inputList: string[]): void {
// TODO wait with next push/update until this is done
if (specialPaths.length > 0) {
console.log(
chalk`[{blue ${
instance.name
}}] Special paths were changed, so rebuild clientlib tree`
chalk`[{blue ${instance.name}}] Special paths were changed, so rebuild clientlib tree`
);

// Something changed in the structure, so rebuild all clientlib stuff
Expand Down Expand Up @@ -1052,9 +1040,7 @@ export function reload(host: string, inputList: string[]): void {
})
.catch(reason => {
console.log(
chalk`[{blue ${
instance.name
}}] [{red ERROR}] Rebuild rejected: ${reason}`
chalk`[{blue ${instance.name}}] [{red ERROR}] Rebuild rejected: ${reason}`
);
});
}
Expand Down

0 comments on commit ccb7191

Please sign in to comment.