Skip to content

Commit

Permalink
Merge pull request #27064 from Tcharl/typescript-lint
Browse files Browse the repository at this point in the history
lint fix
  • Loading branch information
Tcharl authored Aug 26, 2024
2 parents 1962f10 + 5840d81 commit f98e675
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion generators/base-core/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
now = control.reproducibleLiquibaseTimestamp;
} else {
// Create a new counter
const newCreationTimestamp = creationTimestamp ?? this.config.get('creationTimestamp');
const newCreationTimestamp: string = (creationTimestamp as string) ?? this.config.get('creationTimestamp');
now = newCreationTimestamp ? new Date(newCreationTimestamp) : now;
now.setMilliseconds(0);
}
Expand Down
2 changes: 1 addition & 1 deletion generators/javascript/generators/bootstrap/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
}
if (packageJsonNodeEngine) {
this.packageJson.set('engines', {
...(this.packageJson.get('engines') ?? {}),
...((this.packageJson.get('engines') as object) ?? {}),
node: typeof packageJsonNodeEngine === 'string' ? packageJsonNodeEngine : packageJson.engines.node,
});
}
Expand Down

0 comments on commit f98e675

Please sign in to comment.