Skip to content

Commit f5a9b94

Browse files
edosreckiedosrecki
committed
chore: Revert "move to ESM and upgrade deps"
This reverts commit 0a305ea.
1 parent dfb8ce7 commit f5a9b94

29 files changed

+1014
-1618
lines changed

‎package-lock.json‎

Lines changed: 903 additions & 1505 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "google-cloud-sql",
33
"version": "1.7.1",
44
"description": "Connect to private Google Cloud SQL instance through Cloud SQL Auth Proxy running in GKE cluster.",
5-
"type": "module",
65
"license": "UNLICENSED",
76
"author": "Dinko Osrecki <[email protected]>",
87
"homepage": "https://github.com/edosrecki/google-cloud-sql-cli",
@@ -29,36 +28,36 @@
2928
"prettify-package-json": "prettier-package-json --write"
3029
},
3130
"dependencies": {
32-
"boxen": "7.0.0",
33-
"chalk": "5.1.2",
34-
"commander": "9.4.1",
31+
"boxen": "5.1.2",
32+
"chalk": "4.1.2",
33+
"commander": "8.3.0",
3534
"conf": "10.2.0",
36-
"exit-hook": "3.1.2",
35+
"exit-hook": "2.2.1",
3736
"fuse.js": "6.6.2",
38-
"inquirer": "9.1.4",
39-
"inquirer-autocomplete-prompt": "3.0.0",
37+
"inquirer": "8.2.5",
38+
"inquirer-autocomplete-prompt": "1.4.0",
4039
"lodash": "4.17.21",
4140
"memoizee": "0.4.15",
4241
"shelljs": "0.8.5",
43-
"update-notifier": "6.0.2"
42+
"update-notifier": "5.1.0"
4443
},
4544
"devDependencies": {
4645
"@semantic-release/changelog": "6.0.1",
4746
"@semantic-release/exec": "6.0.3",
4847
"@semantic-release/git": "10.0.1",
4948
"@tsconfig/node18": "1.0.1",
50-
"@types/inquirer": "9.0.2",
51-
"@types/inquirer-autocomplete-prompt": "3.0.0",
49+
"@types/inquirer": "8.2.4",
50+
"@types/inquirer-autocomplete-prompt": "1.3.5",
5251
"@types/lodash": "4.14.187",
5352
"@types/memoizee": "0.4.8",
5453
"@types/node": "18.11.9",
5554
"@types/shelljs": "0.8.11",
56-
"@types/update-notifier": "6.0.1",
55+
"@types/update-notifier": "5.1.0",
5756
"@typescript-eslint/eslint-plugin": "5.42.0",
5857
"@typescript-eslint/parser": "5.42.0",
5958
"eslint": "8.26.0",
6059
"eslint-config-prettier": "8.5.0",
61-
"husky": "8.0.1",
60+
"husky": "7.0.4",
6261
"pkg": "5.8.0",
6362
"prettier-package-json": "2.7.0",
6463
"rimraf": "3.0.2",

‎src/commands/configurations/create.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import chalk from 'chalk'
1+
import { bold, green, red } from 'chalk'
22
import inquirer from 'inquirer'
33
import autocomplete from 'inquirer-autocomplete-prompt'
4-
import { saveConfiguration } from '../../lib/configurations/index.js'
5-
import { ConfigurationCreateAnswers } from '../../lib/types.js'
6-
import { configurationNamePrompt } from './prompts/configuration-name.js'
7-
import { confirmationPrompt } from './prompts/confirmation.js'
8-
import { googleCloudProjectPrompt } from './prompts/google-cloud-project.js'
9-
import { googleCloudSqlInstancePrompt } from './prompts/google-cloud-sql-instance.js'
10-
import { kubernetesContextPrompt } from './prompts/kubernetes-context.js'
11-
import { kubernetesNamespacePrompt } from './prompts/kubernetes-namespace.js'
12-
import { kubernetesServiceAccountPrompt } from './prompts/kubernetes-service-account.js'
13-
import { localPortPrompt } from './prompts/local-port.js'
4+
import { saveConfiguration } from '../../lib/configurations'
5+
import { ConfigurationCreateAnswers } from '../../lib/types'
6+
import { configurationNamePrompt } from './prompts/configuration-name'
7+
import { confirmationPrompt } from './prompts/confirmation'
8+
import { googleCloudProjectPrompt } from './prompts/google-cloud-project'
9+
import { googleCloudSqlInstancePrompt } from './prompts/google-cloud-sql-instance'
10+
import { kubernetesContextPrompt } from './prompts/kubernetes-context'
11+
import { kubernetesNamespacePrompt } from './prompts/kubernetes-namespace'
12+
import { kubernetesServiceAccountPrompt } from './prompts/kubernetes-service-account'
13+
import { localPortPrompt } from './prompts/local-port'
1414

1515
export const createConfiguration = async () => {
1616
inquirer.registerPrompt('autocomplete', autocomplete)
@@ -29,8 +29,8 @@ export const createConfiguration = async () => {
2929
if (answers.confirmation) {
3030
saveConfiguration(answers)
3131

32-
console.log(chalk.green(`Saved configuration '${chalk.bold(answers.configurationName)}'.`))
32+
console.log(green(`Saved configuration '${bold(answers.configurationName)}'.`))
3333
} else {
34-
console.log(chalk.red('You are excused.'))
34+
console.log(red('You are excused.'))
3535
}
3636
}

‎src/commands/configurations/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Command } from 'commander'
2-
import { logError } from '../../lib/util/error.js'
3-
import { createConfiguration } from './create.js'
4-
import { showConfigurationPath } from './path.js'
5-
import { removeConfiguration } from './remove.js'
6-
import { runConfiguration, runConfigurationByName } from './run.js'
7-
import { showConfiguration } from './show.js'
2+
import { logError } from '../../lib/util/error'
3+
import { createConfiguration } from './create'
4+
import { showConfigurationPath } from './path'
5+
import { removeConfiguration } from './remove'
6+
import { runConfiguration, runConfigurationByName } from './run'
7+
import { showConfiguration } from './show'
88

99
export async function addConfigurationsCommands(program: Command) {
1010
const configurations = new Command('configurations')

‎src/commands/configurations/path.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import chalk from 'chalk'
2-
import { configurationPath } from '../../lib/configurations/index.js'
1+
import { bold } from 'chalk'
2+
import { configurationPath } from '../../lib/configurations'
33

44
export const showConfigurationPath = () => {
5-
console.log(chalk.bold(configurationPath))
5+
console.log(bold(configurationPath))
66
}

‎src/commands/configurations/prompts/configuration.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { getConfigurations } from '../../../lib/configurations/index.js'
2-
import { Configuration, ConfigurationChooseAnswers } from '../../../lib/types.js'
3-
import { searchByKey } from '../../../lib/util/search.js'
4-
import { tryCatch } from '../../../lib/util/error.js'
1+
import { getConfigurations } from '../../../lib/configurations'
2+
import { Configuration, ConfigurationChooseAnswers } from '../../../lib/types'
3+
import { searchByKey } from '../../../lib/util/search'
4+
import { tryCatch } from '../../../lib/util/error'
55

66
const formatConfiguration = (configuration: Configuration) => {
77
return {

‎src/commands/configurations/prompts/google-cloud-project.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { fetchGoogleCloudProjects } from '../../../lib/gcloud/projects.js'
2-
import { ConfigurationCreateAnswers } from '../../../lib/types.js'
3-
import { tryCatch } from '../../../lib/util/error.js'
4-
import { search } from '../../../lib/util/search.js'
1+
import { fetchGoogleCloudProjects } from '../../../lib/gcloud/projects'
2+
import { ConfigurationCreateAnswers } from '../../../lib/types'
3+
import { tryCatch } from '../../../lib/util/error'
4+
import { search } from '../../../lib/util/search'
55

66
const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
77
const projects = fetchGoogleCloudProjects()

‎src/commands/configurations/prompts/google-cloud-sql-instance.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import _ from 'lodash'
1+
import { pick } from 'lodash'
22
import {
33
fetchGoogleCloudSqlInstances,
44
GoogleCloudSqlInstance,
5-
} from '../../../lib/gcloud/sql-instances.js'
6-
import { ConfigurationCreateAnswers } from '../../../lib/types.js'
7-
import { searchByKey } from '../../../lib/util/search.js'
8-
import { tryCatch } from '../../../lib/util/error.js'
5+
} from '../../../lib/gcloud/sql-instances'
6+
import { ConfigurationCreateAnswers } from '../../../lib/types'
7+
import { searchByKey } from '../../../lib/util/search'
8+
import { tryCatch } from '../../../lib/util/error'
99

1010
const formatInstance = (instance: GoogleCloudSqlInstance) => {
1111
const { name, region } = instance
1212
return {
1313
name: `${name} (${region})`,
1414
short: name,
15-
value: _.pick(instance, 'connectionName', 'port'),
15+
value: pick(instance, 'connectionName', 'port'),
1616
}
1717
}
1818

‎src/commands/configurations/prompts/kubernetes-context.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { fetchKubernetesContexts } from '../../../lib/kubectl/contexts.js'
2-
import { ConfigurationCreateAnswers } from '../../../lib/types.js'
3-
import { search } from '../../../lib/util/search.js'
4-
import { tryCatch } from '../../../lib/util/error.js'
1+
import { fetchKubernetesContexts } from '../../../lib/kubectl/contexts'
2+
import { ConfigurationCreateAnswers } from '../../../lib/types'
3+
import { search } from '../../../lib/util/search'
4+
import { tryCatch } from '../../../lib/util/error'
55

66
const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
77
const instances = fetchKubernetesContexts()

‎src/commands/configurations/prompts/kubernetes-namespace.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { fetchKubernetesNamespaces } from '../../../lib/kubectl/namespaces.js'
2-
import { ConfigurationCreateAnswers } from '../../../lib/types.js'
3-
import { search } from '../../../lib/util/search.js'
4-
import { tryCatch } from '../../../lib/util/error.js'
1+
import { fetchKubernetesNamespaces } from '../../../lib/kubectl/namespaces'
2+
import { ConfigurationCreateAnswers } from '../../../lib/types'
3+
import { search } from '../../../lib/util/search'
4+
import { tryCatch } from '../../../lib/util/error'
55

66
const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
77
const instances = fetchKubernetesNamespaces(answers.kubernetesContext)

0 commit comments

Comments
 (0)