diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap index fd20c85e92f0..0d81629621a4 100644 --- a/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap +++ b/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap @@ -103,12 +103,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -128,7 +128,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -149,7 +149,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -294,12 +294,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -319,7 +319,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -339,7 +339,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -366,7 +366,7 @@ jhipster: test: - CMD - cqlsh - - '-e' + - -e - describe keyspaces interval: 5s timeout: 25s @@ -547,12 +547,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -572,7 +572,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -592,7 +592,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -612,7 +612,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -633,7 +633,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -666,7 +666,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:9200/_cluster/health?wait_for_status=green&timeout=10s interval: 5s timeout: 10s @@ -685,7 +685,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -699,11 +699,11 @@ jhipster: test: - CMD - echo - - '''db.runCommand("ping").ok''' - - '|' + - "'db.runCommand(\\"ping\\").ok'" + - "|" - mongo - localhost:27017/test - - '--quiet' + - --quiet interval: 5s timeout: 5s retries: 10 @@ -722,7 +722,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -742,8 +742,8 @@ jhipster: test: - CMD - /usr/local/bin/healthcheck.sh - - '--connect' - - '--innodb_initialized' + - --connect + - --innodb_initialized interval: 5s timeout: 5s retries: 10 @@ -928,12 +928,12 @@ jhipster: - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -955,7 +955,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -978,7 +978,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1000,7 +1000,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -1024,7 +1024,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1059,7 +1059,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:9200/_cluster/health?wait_for_status=green&timeout=10s interval: 5s timeout: 10s @@ -1083,7 +1083,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1103,7 +1103,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8091/ui/index.html interval: 5s timeout: 5s @@ -1126,7 +1126,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1148,8 +1148,8 @@ jhipster: test: - CMD - /usr/local/bin/healthcheck.sh - - '--connect' - - '--innodb_initialized' + - --connect + - --innodb_initialized interval: 5s timeout: 5s retries: 10 @@ -1357,12 +1357,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -1382,7 +1382,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -1402,7 +1402,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1422,7 +1422,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -1443,7 +1443,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1476,7 +1476,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:9200/_cluster/health?wait_for_status=green&timeout=10s interval: 5s timeout: 10s @@ -1495,7 +1495,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1692,12 +1692,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -1717,7 +1717,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -1737,7 +1737,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1757,7 +1757,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -1778,7 +1778,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1811,7 +1811,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:9200/_cluster/health?wait_for_status=green&timeout=10s interval: 5s timeout: 10s @@ -1832,7 +1832,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1850,7 +1850,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8091/ui/index.html interval: 5s timeout: 5s @@ -1870,7 +1870,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -1890,8 +1890,8 @@ jhipster: test: - CMD - /usr/local/bin/healthcheck.sh - - '--connect' - - '--innodb_initialized' + - --connect + - --innodb_initialized interval: 5s timeout: 5s retries: 10 @@ -2017,12 +2017,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -2042,7 +2042,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2062,7 +2062,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -2082,7 +2082,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2209,12 +2209,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -2234,7 +2234,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2254,7 +2254,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -2274,7 +2274,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2426,12 +2426,12 @@ management: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -2451,7 +2451,7 @@ management: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2471,7 +2471,7 @@ management: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -2491,7 +2491,7 @@ management: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2707,12 +2707,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -2732,7 +2732,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2752,7 +2752,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -2772,7 +2772,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2864,12 +2864,12 @@ Launch all your infrastructure by running: \`docker compose up -d\`. - SPRING_LIQUIBASE_URL=jdbc:mysql://samplemysql-mysql:3306/samplemysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_ELASTICSEARCH_URIS=http://samplemysql-elasticsearch:9200 ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -2891,7 +2891,7 @@ Launch all your infrastructure by running: \`docker compose up -d\`. test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -2906,7 +2906,7 @@ Launch all your infrastructure by running: \`docker compose up -d\`. test: - CMD - curl - - '-f' + - -f - http://localhost:9200/_cluster/health?wait_for_status=green&timeout=10s interval: 5s timeout: 10s @@ -3003,7 +3003,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -3023,7 +3023,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -3132,12 +3132,12 @@ jhipster: - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s @@ -3157,7 +3157,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -3269,7 +3269,7 @@ jhipster: test: - CMD - curl - - '-f' + - -f - http://localhost:8081/management/health interval: 5s timeout: 5s @@ -3289,7 +3289,7 @@ jhipster: test: - CMD - mysql - - '-e' + - -e - SHOW DATABASES; interval: 5s timeout: 5s @@ -3378,12 +3378,12 @@ Launch all your infrastructure by running: \`docker compose up -d\`. - SPRING_DATASOURCE_URL=jdbc:oracle:thin:@oracle-mono-oracle:1521:oracle-mono - SPRING_LIQUIBASE_URL=jdbc:oracle:thin:@oracle-mono-oracle:1521:oracle-mono ports: - - '8080:8080' + - 8080:8080 healthcheck: test: - CMD - curl - - '-f' + - -f - http://localhost:8080/management/health interval: 5s timeout: 5s diff --git a/generators/docker-compose/generator.js b/generators/docker-compose/generator.js index 8e85d37a75b6..db57011c602f 100644 --- a/generators/docker-compose/generator.js +++ b/generators/docker-compose/generator.js @@ -19,7 +19,7 @@ import { existsSync } from 'fs'; import pathjs from 'path'; import chalk from 'chalk'; -import jsyaml from 'js-yaml'; +import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'; import normalize from 'normalize-path'; import { defaults } from 'lodash-es'; @@ -173,7 +173,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { const parentConfiguration = {}; const path = this.destinationPath(workspaces.directoryPath, appConfig.appFolder); // Add application configuration - const yaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/app.yml`)); + const yaml = parseYaml(this.fs.read(`${path}/src/main/docker/app.yml`)); const yamlConfig = yaml.services.app; if (yamlConfig.depends_on) { yamlConfig.depends_on = Object.fromEntries( @@ -252,7 +252,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { if (appConfig.databaseTypeAny && !appConfig.prodDatabaseTypeOracle) { const database = appConfig.databaseTypeSql ? appConfig.prodDatabaseType : appConfig.databaseType; const relativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`)); - const databaseYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}.yml`)); + const databaseYaml = parseYaml(this.fs.read(`${path}/src/main/docker/${database}.yml`)); const databaseServiceName = `${lowercaseBaseName}-${database}`; let databaseYamlConfig = databaseYaml.services[database]; // Don't export database ports @@ -260,7 +260,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { if (appConfig.databaseTypeCassandra) { // migration service config - const cassandraMigrationYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`)); + const cassandraMigrationYaml = parseYaml(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`)); const cassandraMigrationConfig = cassandraMigrationYaml.services[`${database}-migration`]; cassandraMigrationConfig.build.context = relativePath; const cqlFilesRelativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`)); @@ -274,7 +274,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { } if (appConfig.clusteredDb) { - const clusterDbYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}-cluster.yml`)); + const clusterDbYaml = parseYaml(this.fs.read(`${path}/src/main/docker/${database}-cluster.yml`)); const dbNodeConfig = clusterDbYaml.services[`${database}-node`]; dbNodeConfig.build.context = relativePath; databaseYamlConfig = clusterDbYaml.services[database]; @@ -293,14 +293,14 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { if (appConfig.searchEngineElasticsearch) { // Add search engine configuration const searchEngine = appConfig.searchEngine; - const searchEngineYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${searchEngine}.yml`)); + const searchEngineYaml = parseYaml(this.fs.read(`${path}/src/main/docker/${searchEngine}.yml`)); const searchEngineConfig = searchEngineYaml.services[searchEngine]; delete searchEngineConfig.ports; parentConfiguration[`${lowercaseBaseName}-${searchEngine}`] = searchEngineConfig; } // Add Memcached support if (appConfig.cacheProviderMemcached) { - const memcachedYaml = jsyaml.load(this.readDestination(`${path}/src/main/docker/memcached.yml`)); + const memcachedYaml = parseYaml(this.readDestination(`${path}/src/main/docker/memcached.yml`)); const memcachedConfig = memcachedYaml.services.memcached; delete memcachedConfig.ports; parentConfiguration[`${lowercaseBaseName}-memcached`] = memcachedConfig; @@ -308,7 +308,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { // Add Redis support if (appConfig.cacheProviderRedis) { - const redisYaml = jsyaml.load(this.readDestination(`${path}/src/main/docker/redis.yml`)); + const redisYaml = parseYaml(this.readDestination(`${path}/src/main/docker/redis.yml`)); const redisConfig = redisYaml.services.redis; delete redisConfig.ports; parentConfiguration[`${lowercaseBaseName}-redis`] = redisConfig; @@ -317,7 +317,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator { deployment.authenticationType = appConfig.authenticationType; // Dump the file - let yamlString = jsyaml.dump(parentConfiguration, { indent: 2, lineWidth: -1 }); + let yamlString = stringifyYaml(parentConfiguration, { indent: 2, lineWidth: 0 }); // Add extra indentation for each lines const yamlArray = yamlString.split('\n'); diff --git a/jdl/utils/objects/logger.ts b/jdl/utils/objects/logger.ts index ffead6fba929..52088cf12a5f 100644 --- a/jdl/utils/objects/logger.ts +++ b/jdl/utils/objects/logger.ts @@ -16,16 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { createJHipsterLogger } from '../../../generators/base/support/logger.js'; -import { createLogger, format, transports } from 'winston'; +const logger = createJHipsterLogger({ namespace: 'jhipster:jdl' }); -const { Console } = transports; -const { printf, combine } = format; - -const myFormat = printf(info => `${info.level}: ${info.message}`); - -export default createLogger({ - transports: [new Console()], - format: combine(myFormat), - handleExceptions: true, -}); +export default { + info: (message: string) => logger.verboseInfo(message), + error: (message: string) => logger.error(message), + warn: (message: string) => logger.warn(message), + debug: (message: string) => logger.debug(message), +}; diff --git a/package-lock.json b/package-lock.json index 4072d83a926b..894bd0a0be23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", - "@types/lodash": "4.17.6", + "@types/lodash-es": "4.17.12", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -24,7 +24,6 @@ "chalk": "5.3.0", "chevrotain": "11.0.3", "commander": "12.1.0", - "conf": "13.0.1", "debug": "4.3.6", "didyoumean": "1.2.2", "dockerfile-ast": "0.6.1", @@ -39,7 +38,6 @@ "globals": "15.9.0", "isbinaryfile": "5.0.2", "java-lint": "0.3.0", - "js-yaml": "4.1.0", "latest-version": "9.0.0", "lodash-es": "4.17.21", "mem-fs": "4.1.0", @@ -62,7 +60,6 @@ "type-fest": "4.25.0", "typescript": "5.4.5", "typescript-eslint": "8.2.0", - "winston": "3.14.2", "yaml": "2.5.0", "yeoman-environment": "4.4.1", "yeoman-generator": "7.3.2" @@ -778,26 +775,6 @@ "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==", "license": "Apache-2.0" }, - "node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", - "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", - "license": "MIT", - "dependencies": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, "node_modules/@esbuild/aix-ppc64": { "version": "0.19.12", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", @@ -3239,12 +3216,6 @@ "@types/node": "*" } }, - "node_modules/@types/triple-beam": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", - "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "license": "MIT" - }, "node_modules/@types/vinyl": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz", @@ -3715,39 +3686,6 @@ "node": ">=8" } }, - "node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", - "license": "MIT", - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -4000,15 +3938,6 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "license": "MIT" }, - "node_modules/atomically": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/atomically/-/atomically-2.0.3.tgz", - "integrity": "sha512-kU6FmrwZ3Lx7/7y3hPS5QnbJfaohcIul5fGqf7ok+4KklIEk9tJ0C2IQPdacSbVUWv6zVHXEBWoWd6NrVMT7Cw==", - "dependencies": { - "stubborn-fs": "^1.2.5", - "when-exit": "^2.1.1" - } - }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -4766,16 +4695,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -4791,16 +4710,6 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "license": "MIT" }, - "node_modules/color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "license": "MIT", - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, "node_modules/colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", @@ -4810,16 +4719,6 @@ "node": ">=0.1.90" } }, - "node_modules/colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "license": "MIT", - "dependencies": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -4859,29 +4758,6 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "license": "MIT" }, - "node_modules/conf": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/conf/-/conf-13.0.1.tgz", - "integrity": "sha512-l9Uwc9eOnz39oADzGO2cSBDi7siv8lwO+31ocQ2nOJijnDiW3pxqm9VV10DPYUO28wW83DjABoUqY1nfHRR2hQ==", - "license": "MIT", - "dependencies": { - "ajv": "^8.16.0", - "ajv-formats": "^3.0.1", - "atomically": "^2.0.3", - "debounce-fn": "^6.0.0", - "dot-prop": "^9.0.0", - "env-paths": "^3.0.0", - "json-schema-typed": "^8.0.1", - "semver": "^7.6.2", - "uint8array-extras": "^1.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/config-chain": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", @@ -5075,21 +4951,6 @@ "node": ">=12.20" } }, - "node_modules/debounce-fn": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-6.0.0.tgz", - "integrity": "sha512-rBMW+F2TXryBwB54Q0d8drNEI+TfoS9JpNTAoVpukbWEhjXQq4rySFYLaqXMFXwdv61Zb2OHtj5bviSoimqxRQ==", - "license": "MIT", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/debug": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", @@ -5381,21 +5242,6 @@ "node": ">=0.10.0" } }, - "node_modules/dot-prop": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-9.0.0.tgz", - "integrity": "sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==", - "license": "MIT", - "dependencies": { - "type-fest": "^4.18.2" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/dot-properties": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dot-properties/-/dot-properties-1.0.1.tgz", @@ -5502,12 +5348,6 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "license": "MIT" }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "license": "MIT" - }, "node_modules/encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", @@ -6621,12 +6461,6 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "license": "MIT" }, - "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", - "license": "MIT" - }, "node_modules/fast-xml-parser": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", @@ -6668,12 +6502,6 @@ "bser": "2.1.1" } }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "license": "MIT" - }, "node_modules/figures": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz", @@ -6836,12 +6664,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "license": "MIT" - }, "node_modules/follow-redirects": { "version": "1.15.6", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", @@ -9107,18 +8929,6 @@ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", "license": "(AFL-2.1 OR BSD-3-Clause)" }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "license": "MIT" - }, - "node_modules/json-schema-typed": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.1.tgz", - "integrity": "sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==", - "license": "BSD-2-Clause" - }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -9207,12 +9017,6 @@ "graceful-fs": "^4.1.9" } }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "license": "MIT" - }, "node_modules/ky": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ky/-/ky-1.6.0.tgz", @@ -9350,23 +9154,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/logform": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz", - "integrity": "sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==", - "license": "MIT", - "dependencies": { - "@colors/colors": "1.6.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -9687,18 +9474,6 @@ "node": ">=6" } }, - "node_modules/mimic-function": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", - "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/mimic-response": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", @@ -10828,15 +10603,6 @@ "wrappy": "1" } }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "license": "MIT", - "dependencies": { - "fn.name": "1.x.x" - } - }, "node_modules/onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", @@ -12180,15 +11946,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/requizzle": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz", @@ -12434,15 +12191,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safe-stable-stringify": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", - "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", - "license": "MIT", - "engines": { - "node": ">=10" - } - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -12587,21 +12335,6 @@ "url": "https://github.com/steveukx/git-js?sponsor=1" } }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, - "node_modules/simple-swizzle/node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "license": "MIT" - }, "node_modules/sinon": { "version": "18.0.0", "resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.0.tgz", @@ -12785,15 +12518,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", @@ -13046,11 +12770,6 @@ "url": "https://github.com/sponsors/Borewit" } }, - "node_modules/stubborn-fs": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.5.tgz", - "integrity": "sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==" - }, "node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -13305,12 +13024,6 @@ "b4a": "^1.6.4" } }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "license": "MIT" - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -13403,15 +13116,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", - "license": "MIT", - "engines": { - "node": ">= 14.0.0" - } - }, "node_modules/ts-api-utils": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", @@ -13626,18 +13330,6 @@ "dev": true, "license": "MIT" }, - "node_modules/uint8array-extras": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.4.0.tgz", - "integrity": "sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -13919,11 +13611,6 @@ "webidl-conversions": "^3.0.0" } }, - "node_modules/when-exit": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/when-exit/-/when-exit-2.1.3.tgz", - "integrity": "sha512-uVieSTccFIr/SFQdFWN/fFaQYmV37OKtuaGphMAzi4DmmUlrvRBJW5WSLkHyjNQY/ePJMz3LoiX9R3yy1Su6Hw==" - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -14088,82 +13775,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/winston": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", - "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.6.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.7.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.1.tgz", - "integrity": "sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA==", - "license": "MIT", - "dependencies": { - "logform": "^2.6.1", - "readable-stream": "^3.6.2", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/winston/node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/winston/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/package.json b/package.json index 120714b73437..4f4c0b5eb5a4 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", - "@types/lodash": "4.17.6", + "@types/lodash-es": "4.17.12", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -132,7 +132,6 @@ "chalk": "5.3.0", "chevrotain": "11.0.3", "commander": "12.1.0", - "conf": "13.0.1", "debug": "4.3.6", "didyoumean": "1.2.2", "dockerfile-ast": "0.6.1", @@ -147,7 +146,6 @@ "globals": "15.9.0", "isbinaryfile": "5.0.2", "java-lint": "0.3.0", - "js-yaml": "4.1.0", "latest-version": "9.0.0", "lodash-es": "4.17.21", "mem-fs": "4.1.0", @@ -170,7 +168,6 @@ "type-fest": "4.25.0", "typescript": "5.4.5", "typescript-eslint": "8.2.0", - "winston": "3.14.2", "yaml": "2.5.0", "yeoman-environment": "4.4.1", "yeoman-generator": "7.3.2" @@ -219,6 +216,9 @@ "overrides": { "eslint-plugin-import": { "eslint": "$eslint" + }, + "ejs-lint": { + "ejs": "$ejs" } } }