Skip to content

Commit

Permalink
Merge pull request #22 from jhipster/generator-jhipster-8.6.0
Browse files Browse the repository at this point in the history
Update generator-jhipster to 8.6.0
  • Loading branch information
mshima authored Jun 25, 2024
2 parents b562fcd + 5029059 commit 3a82e5c
Show file tree
Hide file tree
Showing 10 changed files with 1,044 additions and 760 deletions.
35 changes: 0 additions & 35 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package-lock.json
.git

# blueprint rules:
**/templates/**/
generators/**/templates/**/
1 change: 1 addition & 0 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"written": true
}
},
"githubWorkflows": true,
"jhipsterVersion": "7.7.0",
"js": true,
"localBlueprint": false,
Expand Down
1 change: 1 addition & 0 deletions .yo-resolve
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.github/workflows/** skip
generators/** skip
README.md skip
cli/cli.cjs skip
15 changes: 15 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import globals from 'globals';
import prettierRecommended from 'eslint-plugin-prettier/recommended';
import jhipsterRecommended from 'generator-jhipster/eslint/recommended';

export default [
{
languageOptions: {
globals: {
...globals.node,
},
},
},
jhipsterRecommended,
prettierRecommended,
];
2 changes: 1 addition & 1 deletion generators/migrate/constants.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { dirname } from 'path';
import untildify from 'untildify';
import { fileURLToPath } from 'url';
import untildify from 'untildify';

export const V7_NODE = '16.20.2';

Expand Down
8 changes: 4 additions & 4 deletions generators/migrate/generator.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { setTimeout } from 'timers/promises';
import chalk from 'chalk';
import { readFile, rm, readdir, appendFile } from 'fs/promises';
import { join } from 'path';
import chalk from 'chalk';
import { transform } from 'p-transform';
import { globby } from 'globby';
import semver from 'semver';
import gitignore from 'parse-gitignore';
import { join } from 'path';
import latestVersion from 'latest-version';
import { loadFile } from 'mem-fs';
import { setModifiedFileState } from 'mem-fs-editor/state';
Expand All @@ -21,6 +21,8 @@ import {
} from 'generator-jhipster/generators/bootstrap/support';
import packageVersions from 'pkg-versions';

import { GENERATOR_JHIPSTER } from 'generator-jhipster';
import { GENERATOR_BOOTSTRAP } from 'generator-jhipster/generators';
import {
DEFAULT_CLI_OPTIONS,
DEFAULT_CLI_OPTIONS_V7,
Expand All @@ -37,9 +39,7 @@ import {
BASE_APPLICATION,
V7_NODE,
} from './constants.js';
import { GENERATOR_JHIPSTER } from 'generator-jhipster';
import command from './command.js';
import { GENERATOR_BOOTSTRAP } from 'generator-jhipster/generators';
import { normalizeBlueprintName } from './internal/blueprints.js';

export default class extends BaseGenerator {
Expand Down
2 changes: 1 addition & 1 deletion generators/migrate/generator.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { readFile } from 'fs/promises';
import assert from 'yeoman-assert';
import { beforeAll, describe, expect, it } from 'vitest';
import { readFile } from 'fs/promises';
import simpleGit from 'simple-git';
import { escapeRegExp } from 'lodash-es';

Expand Down
Loading

0 comments on commit 3a82e5c

Please sign in to comment.