Skip to content

Commit 8104f6a

Browse files
iwilltry42iwilltry42
committed
change: update deps
1 parent 8956b7d commit 8104f6a

21 files changed

+6775
-7672
lines changed

‎.eslintrc.cjs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
3+
parser: '@typescript-eslint/parser',
4+
plugins: ['@typescript-eslint'],
5+
root: true,
6+
};

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
- name: Setup GIT
3737
run: |
3838
git switch -c main
39-
git config --global user.email "[email protected]"
40-
git config --global user.name "Alvaro Saurin"
39+
git config --global user.email "[email protected]"
40+
git config --global user.name "k3d-io"
4141
4242
- name: Set release version
4343
run: npm version --no-git-tag-version --allow-same-version ${{ steps.info.outputs.SOURCE_TAG }}
@@ -69,7 +69,7 @@ jobs:
6969
draft: false
7070
prerelease: false
7171

72-
- name: Upload VXIS to GitHub release
72+
- name: Upload VSIX to GitHub release
7373
id: upload-release-asset
7474
uses: actions/upload-release-asset@v1
7575
env:
@@ -81,4 +81,4 @@ jobs:
8181
upload_url: ${{ steps.create_release.outputs.upload_url }}
8282
asset_path: ./vscode-k3d-${{ steps.info.outputs.SOURCE_TAG }}.vsix
8383
asset_name: vscode-k3d.vsix
84-
asset_content_type: application/zip
84+
asset_content_type: application/zip

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Kubernetes [k3d](https://github.com/rancher/k3d) extension for Visual Studio Code
1+
# Kubernetes [k3d](https://github.com/k3d-io/k3d) extension for Visual Studio Code
22

33
[![Version](https://vsmarketplacebadge.apphb.com/version/inercia.vscode-k3d.svg)](https://marketplace.visualstudio.com/items?itemName=inercia.vscode-k3d)
44
[![Installs](https://vsmarketplacebadge.apphb.com/installs/inercia.vscode-k3d.svg)](https://marketplace.visualstudio.com/items?itemName=inercia.vscode-k3d)
55
[![Ratings](https://vsmarketplacebadge.apphb.com/rating/inercia.vscode-k3d.svg)](https://vsmarketplacebadge.apphb.com/rating/inercia.vscode-k3d.svg)
66

77
## Overview
88

9-
This extension displays your [k3d](https://github.com/rancher/k3d) local clusters
9+
This extension displays your [k3d](https://github.com/k3d-io/k3d) local clusters
1010
in the Kubernetes extension's Cloud Explorer. You can use this to create and
1111
delete clusters, and to merge them into your `kubeconfig`.
1212

@@ -75,7 +75,7 @@ You can find this plugin in the
7575
You will find detailed installation instructions there.
7676

7777
This extension will download the latest, stable version of `k3d` automatically, although you can
78-
force a specific instalation _channel_ of `k3d` with some settings (see [bellow](#Settings)).
78+
force a specific instalation _channel_ of `k3d` with some settings (see [bellow](#settings)).
7979

8080
## Settings
8181

@@ -136,7 +136,7 @@ the [official documentation](https://code.visualstudio.com/docs/getstarted/keybi
136136

137137
The easiest way to start coding on the extension is by following these steps:
138138

139-
* `git clone https://github.com/inercia/vscode-k3d.git`
139+
* `git clone https://github.com/k3d-io/vscode-k3d.git`
140140
* `code vscode-k3d`
141141
* `npm install` in the terminal for installing all the dependencies,
142142
* Press `F5` for starting a new VSCode window with the extension running in it.

‎package-lock.json‎

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

‎package.json‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"description": "Work with local Kubernetes clusters with K3D provider in Visual Studio Code",
55
"version": "0.0.1",
66
"preview": true,
7-
"publisher": "inercia",
7+
"publisher": "k3d-io",
88
"engines": {
9-
"vscode": "^1.44.0"
9+
"vscode": "^1.75.1"
1010
},
1111
"license": "MIT",
1212
"categories": [
@@ -21,20 +21,11 @@
2121
"galleryBanner": {
2222
"theme": "light"
2323
},
24-
"homepage": "https://github.com/inercia/vscode-k3d/blob/master/README.md",
24+
"homepage": "https://github.com/k3d-io/vscode-k3d/blob/master/README.md",
2525
"activationEvents": [
2626
"onCommand:extension.vsKubernetesConfigureFromCluster",
2727
"onCommand:extension.vsKubernetesCreateCluster",
28-
"onView:kubernetes.cloudExplorer",
29-
"onCommand:extension.vsKubernetesK3DCreate",
30-
"onCommand:extension.vsKubernetesK3DCreateLast",
31-
"onCommand:extension.vsKubernetesK3DDelete",
32-
"onCommand:extension.vsKubernetesK3DReplace",
33-
"onCommand:extension.vsKubernetesK3DReplaceLast",
34-
"onCommand:extension.vsKubernetesK3DAddAgent",
35-
"onCommand:extension.vsKubernetesK3DDeleteAgent",
36-
"onCommand:extension.vsKubernetesK3DAddServer",
37-
"onCommand:extension.vsKubernetesK3DDeleteServer"
28+
"onView:kubernetes.cloudExplorer"
3829
],
3930
"main": "./dist/extension",
4031
"contributes": {
@@ -313,8 +304,8 @@
313304
"watch": "webpack --mode none --watch",
314305
"test": "npm run compile",
315306
"test-compile": "tsc -p ./",
316-
"lint": "./node_modules/tslint/bin/tslint -p tsconfig.json -c tslint.json src/**/*.ts",
317-
"lint:fix": "./node_modules/tslint/bin/tslint -p tsconfig.json -c tslint.json --fix src/**/*.ts",
307+
"lint": "npx eslint . --ext .ts",
308+
"lint:fix": "npx eslint . --ext .ts --fix",
318309
"vscode:prepublish": "webpack --mode production",
319310
"dist": "vsce package",
320311
"dist-tools": "npm install -g vsce"
@@ -324,43 +315,46 @@
324315
],
325316
"devDependencies": {
326317
"@types/dedent": "^0.7.0",
327-
"@types/mocha": "^2.2.42",
328-
"@types/node": "^8.10.25",
329-
"@types/request-promise-native": "^1.0.17",
330-
"@types/shelljs": "^0.8.3",
331-
"@types/tmp": "0.0.33",
332-
"@types/url-join": "^4.0.0",
333-
"@types/vscode": "^1.44.0",
334-
"ts-loader": "^6.0.4",
335-
"tslint": "^5.8.0",
336-
"typescript": "^3.5.2",
337-
"webpack": "^4.36.1",
338-
"webpack-cli": "^3.3.6"
318+
"@types/mocha": "^10.0.1",
319+
"@types/node": "^18.13.0",
320+
"@types/request-promise-native": "^1.0.18",
321+
"@types/shelljs": "^0.8.11",
322+
"@types/tmp": "0.2.3",
323+
"@types/url-join": "^4.0.1",
324+
"@types/vscode": "^1.75.1",
325+
"@typescript-eslint/eslint-plugin": "^5.52.0",
326+
"@typescript-eslint/parser": "^5.52.0",
327+
"@vscode/test-electron": "^2.2.3",
328+
"eslint": "^8.34.0",
329+
"ts-loader": "^9.4.2",
330+
"typescript": "^4.9.5",
331+
"vsce": "^2.15.0",
332+
"webpack": "^5.75.0",
333+
"webpack-cli": "^5.0.1"
339334
},
340335
"dependencies": {
341-
"@octokit/rest": "^18.0.9",
342-
"@types/mkdirp": "^0.5.2",
336+
"@octokit/rest": "^19.0.7",
343337
"dedent": "^0.7.0",
344-
"docker-cli-js": "^2.8.0",
338+
"docker-cli-js": "^2.10.0",
345339
"docker-client": "^1.38.1",
346-
"download": "^7.1.0",
347-
"mkdirp": "^0.5.1",
348-
"replace-string": "^3.0.0",
340+
"download": "^8.0.0",
341+
"mkdirp": "^2.1.3",
342+
"replace-string": "^4.0.0",
349343
"request": "^2.88.2",
350344
"request-promise-native": "^1.0.9",
351-
"rxjs": "^6.4.0",
352-
"shelljs": "^0.8.3",
345+
"rxjs": "^7.8.0",
346+
"shelljs": "^0.8.5",
353347
"spawn-rx": "^3.0.0",
354-
"tmp": "^0.0.33",
355-
"url-join": "^4.0.1",
356-
"vscode-azureextensionui": "^0.38.2",
357-
"vscode-kubernetes-tools-api": "^1.0.0"
348+
"tmp": "^0.2.1",
349+
"url-join": "^5.0.0",
350+
"vscode-azureextensionui": "^0.50.0",
351+
"vscode-kubernetes-tools-api": "^1.3.0"
358352
},
359353
"repository": {
360354
"type": "git",
361-
"url": "https://github.com/inercia/vscode-k3d"
355+
"url": "https://github.com/k3d-io/vscode-k3d"
362356
},
363357
"bugs": {
364-
"url": "https://github.com/inercia/vscode-k3d/issues"
358+
"url": "https://github.com/k3d-io/vscode-k3d/issues"
365359
}
366360
}

‎src/commands/createCluster.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export async function createCluster(createSettings: settings.ClusterCreateSettin
5050

5151
export async function createClusterInteractive(
5252
clusterSettings: settings.ClusterCreateSettings,
53-
switchContext: boolean = true): Promise<void> {
53+
switchContext = true): Promise<void> {
5454

5555
const kubeconfig = await kubectl.getKubeconfigPath();
5656

‎src/commands/createClusterForm.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export function getCreateClusterFormStyle(): string {
3333
[vscode.ColorThemeKind.Light]: "light",
3434
[vscode.ColorThemeKind.Dark]: "dark",
3535
[vscode.ColorThemeKind.HighContrast]: "dark",
36+
[vscode.ColorThemeKind.HighContrastLight]: "light",
3637
}[vscode.window.activeColorTheme.kind];
3738

3839
// TODO: there must be a better way to do this...
@@ -215,7 +216,7 @@ export async function getCreateClusterForm(defaults: ClusterCreateSettings): Pro
215216
The image used for creating all the nodes in the cluster.
216217
<ul>
217218
<li> Leave empty for using the default image.</li>
218-
<li> You can also provide your own image name (ie, "rancher/k3d:v1.18")</li>
219+
<li> You can also provide your own image name (ie, "k3d-io/k3d:v1.18")</li>
219220
${datalistExplain}
220221
</ul>
221222
</h6>
@@ -439,6 +440,6 @@ async function getProposedImages(): Promise<Errorable<string[]>> {
439440
}
440441
} catch (error) {
441442
logChannel.showOutput(`[images proposals] error: ${error}`);
442-
return { succeeded: false, error: error };
443+
return { succeeded: false, error: error as string[]};
443444
}
444445
}

‎src/commands/createClusterSettings.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface ClusterCreateSettings {
1919

2020
// createClusterArgsFromSettings returns a list of arguments for `k3d cluster create`
2121
// for some cluster creation settings
22-
export function createClusterArgsFromSettings(settings: ClusterCreateSettings, switchContext: boolean = true): string[] {
22+
export function createClusterArgsFromSettings(settings: ClusterCreateSettings, switchContext = true): string[] {
2323
const args: string[] = [];
2424

2525
if (settings.numServers) {

‎src/commands/deleteCluster.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async function deleteClusterInteractive(): Promise<void> {
3434
}
3535

3636
// deleteClusterByName will be invoked when users click on "Delete cluster"
37-
export async function deleteClusterByName(clusterName: string, askUser: boolean = true): Promise<void> {
37+
export async function deleteClusterByName(clusterName: string, askUser = true): Promise<void> {
3838
if (askUser) {
3939
const confirmed = await confirm(`This will delete "${clusterName}". You will not be able to undo this.`, 'Delete cluster');
4040
if (!confirmed) {

‎src/commands/replaceCluster.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export async function onReplaceClusterLast(target?: any): Promise<void> {
3333
//////////////////////////////////////////////////////////////////////////////////////////////
3434

3535
export async function replaceCluster(createSettings: settings.ClusterCreateSettings, target?: any): Promise<void> {
36-
let actions: Promise<void>[] = [];
36+
const actions: Promise<void>[] = [];
3737

3838
const promisedClusters = await k3d.getClusters(shell);
3939
let clustersByCreation: model.K3dClusterInfo[] = [];

0 commit comments

Comments
 (0)