Skip to content

Commit

Permalink
adjusts
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima committed Jun 19, 2024
1 parent 6cb9049 commit dfbcc35
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .blueprint/generate-sample/command.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { existsSync, readdirSync } from 'node:fs';
import { getSamples } from './get-samples.mjs';
import { entitiesByType } from './support/index.mjs';
import { existsSync, readdirSync } from 'node:fs';

const updateSampleName = sample =>
sample.replace('ngx', 'ng').replace('ms-ng-eureka-oauth2-mongodb-caffeine', 'ms-ng-oauth2-mongodb-caffeine');
Expand Down
1 change: 0 additions & 1 deletion .blueprint/generate-sample/generator.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { readdir } from 'node:fs/promises';
import { readFileSync } from 'node:fs';
import BaseGenerator from 'generator-jhipster/generators/base';
import { entitiesByType } from './support/entities-by-type.mjs';

export default class extends BaseGenerator {
sampleName;
Expand Down
5 changes: 2 additions & 3 deletions generators/spring-boot/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ export default class extends BaseApplicationGenerator {
syncUserWithIdp: application.authenticationType === 'oauth2',
});

application.customizeTemplatePath = file => {
if (!file) return file;
application.customizeTemplatePaths.push(file => {
const { sourceFile, destinationFile } = file;
if (destinationFile.includes('package-info')) {
return undefined;
Expand All @@ -159,7 +158,7 @@ export default class extends BaseApplicationGenerator {
};
}
return { sourceFile, destinationFile };
};
});
},
async migration({ application, applicationDefaults }) {
const dockerContainersVersions = Object.fromEntries(
Expand Down
3 changes: 1 addition & 2 deletions test/app.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { expect, beforeAll, describe, it } from 'vitest';
import { defaultHelpers as helpers, runResult } from 'generator-jhipster/testing';
import { JAVA_DOCKER_DIR } from 'generator-jhipster';

import migration from '../generators/spring-boot/migration.cjs';

import {
applicationTypes,
authenticationTypes,
Expand All @@ -14,6 +12,7 @@ import {
buildToolTypes,
databaseTypes,
} from 'generator-jhipster/jdl';
import migration from '../generators/spring-boot/migration.cjs';

import expectedFiles from './utils/expected-files.js';

Expand Down

0 comments on commit dfbcc35

Please sign in to comment.