Skip to content

Commit

Permalink
fix #118
Browse files Browse the repository at this point in the history
  • Loading branch information
Angelo Manganiello committed Mar 26, 2020
1 parent 099858b commit 9cab2fd
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<a name="1.0.1"></a>
<a name="1.0.0"></a>
<a name="1.0.0-beta.3"></a>
<a name="1.0.0-beta.2"></a>
<a name="1.0.0-beta.1"></a>
<a name="1.0.0-alpha.3"></a>
<a name="1.0.0-alpha.2"></a>

# [1.0.1](https://github.com/jhipster/generator-jhipster-nodejs/tree/v1.0.1)

- https://github.com/jhipster/generator-jhipster-nodejs/issues/118 [issue #118](https://github.com/jhipster/generator-jhipster-nodejs/issues/118)

# [1.0.0](https://github.com/jhipster/generator-jhipster-nodejs/tree/v1.0.0)

- Copying node modules - support webpack bundle [issue #100](https://github.com/jhipster/generator-jhipster-nodejs/issues/100)
Expand Down
2 changes: 1 addition & 1 deletion ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ To contribute for the next featues, fork the repo and open a pull request regard
- [x] Unit tests for all generators and sonar quality with coverage
- [x] e2e tests for generated project
- [x] Added service generator (jhipster spring-service _name_ command)
- [ ] OAuth2 feature for Keycloack
- [x] OAuth2 feature for Keycloack

## To DO for next release

Expand Down
6 changes: 3 additions & 3 deletions generators/client/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ const clientFiles = {
{ file: 'angular/tsconfig-aot.json', renameTo: () => 'tsconfig-aot.json' },
{ file: 'angular/tsconfig.json', renameTo: () => 'tsconfig.json' },
{ file: 'angular/package.json', renameTo: () => 'package.json' },
{ file: 'angular/.eslintignore', renameTo: () => '.eslintignore' }
{ file: 'angular/eslintignore', renameTo: () => '.eslintignore' }
]
},
{
condition: generator => generator.clientFramework === 'react',
templates: [
{ file: 'react/tsconfig.json', renameTo: () => 'tsconfig.json' },
{ file: 'react/package.json', renameTo: () => 'package.json' },
{ file: 'react/.eslintrc.json', renameTo: () => '.eslintrc.json' },
{ file: 'react/.eslintignore', renameTo: () => '.eslintignore' }
{ file: 'react/eslintrc.json', renameTo: () => '.eslintrc.json' },
{ file: 'react/eslintignore', renameTo: () => '.eslintignore' }
]
}
],
Expand Down
15 changes: 12 additions & 3 deletions generators/server/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,18 @@ const serverFiles = {
'e2e/jest.e2e.config.json',
'test/admin/management.controller.spec.ts',
'nest-cli.json',
'.env',
'.server.eslintrc.json',
'.server.eslintignore',
{
file: 'env',
renameTo: () => '.env'
},
{
file: 'server.eslintrc.json',
renameTo: () => '.server.eslintrc.json'
},
{
file: 'server.eslintignore',
renameTo: () => '.server.eslintignore'
},
'package.json',
'tsconfig.json',
'README.md',
Expand Down
File renamed without changes.

0 comments on commit 9cab2fd

Please sign in to comment.