Skip to content

Commit

Permalink
Merge pull request #27175 from mshima/command
Browse files Browse the repository at this point in the history
move command utils to an exclusive folder
  • Loading branch information
DanielFran authored Sep 4, 2024
2 parents 1833022 + 9619e31 commit 691ee92
Show file tree
Hide file tree
Showing 62 changed files with 396 additions and 375 deletions.
2 changes: 1 addition & 1 deletion .blueprint/code-workspace/command.mts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { type JHipsterCommandDefinition } from '../../generators/base/api.js';
import { type JHipsterCommandDefinition } from '../../lib/command/index.js';

const command: JHipsterCommandDefinition = {
arguments: {},
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/from-issue/command.mts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { JHipsterCommandDefinition } from '../../generators/base/api.js';
import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
import { GENERATOR_APP, GENERATOR_WORKSPACES } from '../../generators/generator-list.js';
import { parseIssue } from '../../testing/github.js';

Expand Down
2 changes: 1 addition & 1 deletion .blueprint/generate-generator/command.mts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { JHipsterCommandDefinition } from '../../generators/base/api.js';
import type { JHipsterCommandDefinition } from '../../lib/command/index.js';

const command: JHipsterCommandDefinition = {
configs: {
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/generate-sample/command.mts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import { join } from 'node:path';
import process from 'node:process';
import { defaultSamplesFolder } from '../constants.js';
import { JHipsterCommandDefinition } from '../../generators/base/api.js';
import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
import { GENERATOR_APP, GENERATOR_WORKSPACES } from '../../generators/generator-list.js';

const command: JHipsterCommandDefinition = {
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/update-vscode/command.mts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { type JHipsterCommandDefinition } from '../../generators/base/api.js';
import { type JHipsterCommandDefinition } from '../../lib/command/index.js';

const command: JHipsterCommandDefinition = {
arguments: {},
Expand Down
2 changes: 1 addition & 1 deletion cli/jhipster-command.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import chalk from 'chalk';
import { Command, Option } from 'commander';
import { kebabCase } from 'lodash-es';
import { convertConfigToOption } from '../lib/internal/index.js';
import { convertConfigToOption } from '../lib/command/index.js';

export default class JHipsterCommand extends Command {
createCommand(name) {
Expand Down
2 changes: 1 addition & 1 deletion cli/program.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { packageJson } from '../lib/index.js';
import { packageNameToNamespace } from '../generators/base/support/index.js';
import command from '../generators/base/command.js';
import { GENERATOR_APP, GENERATOR_BOOTSTRAP, GENERATOR_JDL } from '../generators/generator-list.js';
import { extractArgumentsFromConfigs } from '../generators/base/internal/command.js';
import { extractArgumentsFromConfigs } from '../lib/command/index.js';
import logo from './logo.mjs';
import EnvironmentBuilder from './environment-builder.mjs';
import SUB_GENERATORS from './commands.mjs';
Expand Down
2 changes: 1 addition & 1 deletion generators/angular/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { JHipsterCommandDefinition } from '../base/api.js';
import type { JHipsterCommandDefinition } from '../../lib/command/index.js';

const command: JHipsterCommandDefinition = {
options: {},
Expand Down
2 changes: 1 addition & 1 deletion generators/app/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { JHipsterCommandDefinition } from '../base/api.js';
import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
import {
GENERATOR_BOOTSTRAP,
GENERATOR_BOOTSTRAP_APPLICATION_BASE,
Expand Down
15 changes: 9 additions & 6 deletions generators/base-core/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,29 @@ import type {
CascatedEditFileCallback,
EditFileCallback,
EditFileOptions,
JHipsterArguments,
JHipsterCommandDefinition,
JHipsterConfigs,
JHipsterGeneratorFeatures,
JHipsterGeneratorOptions,
JHipsterOptions,
ValidationResult,
WriteFileOptions,
} from '../base/api.js';
import {
type JHipsterArguments,
type JHipsterCommandDefinition,
type JHipsterConfigs,
type JHipsterOptions,
convertConfigToOption,
} from '../../lib/command/index.js';
import { packageJson } from '../../lib/index.js';
import { type BaseApplication, CommonClientServerApplication } from '../base-application/types.js';
import { GENERATOR_BOOTSTRAP } from '../generator-list.js';
import NeedleApi from '../needle-api.js';
import command from '../base/command.js';
import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
import { convertConfigToOption, loadConfig } from '../../lib/internal/index.js';
import { loadConfig } from '../../lib/internal/index.js';
import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
import { dockerPlaceholderGenerator } from '../docker/utils.js';
import { getConfigWithDefaults } from '../../jdl/index.js';
import { extractArgumentsFromConfigs } from '../base/internal/command.js';
import { extractArgumentsFromConfigs } from '../../lib/command/index.js';

const {
INITIALIZING,
Expand Down
2 changes: 1 addition & 1 deletion generators/base-workspaces/command.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { JHipsterCommandDefinition } from '../base/api.js';
import type { JHipsterCommandDefinition } from '../../lib/command/index.js';

const command: JHipsterCommandDefinition = {
options: {},
Expand Down
Loading

0 comments on commit 691ee92

Please sign in to comment.