Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"parserOptions": {
"ecmaVersion": 2018,
"comment": true,
"project": "./tsconfig.json",
"project": [
"./tsconfig.json",
"./src/webview/tsconfig.json"
],
"sourceType": "module"
},
"plugins": [
Expand Down Expand Up @@ -106,13 +109,19 @@
},
"overrides": [
{
"files": ["*.test.ts"],
"rules": {
"no-unused-expressions": "off",
"@typescript-eslint/unbound-method" : "off",
"max-nested-callbacks" : "off",
"@typescript-eslint/no-unsafe-assignment": 1
}
"files": ["*.test.ts"],
"rules": {
"no-unused-expressions": "off",
"@typescript-eslint/unbound-method" : "off",
"max-nested-callbacks" : "off",
"@typescript-eslint/no-unsafe-assignment": 1
}
},
{
"files": ["./src/@types/**.d.ts"],
"rules": {
"header/header": "off"
}
}
]
}
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@
"-o",
"${workspaceFolder}/test/ui/settings.json",
"-m",
"--mocha_config",
"${workspaceFolder}/test/ui/.mocharc.js",
"-c",
"max",
"-e",
"./test-resources/extensions",
"-i"
Expand Down
10 changes: 8 additions & 2 deletions build/esbuild-watch.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import * as esbuild from 'esbuild';
import { sassPlugin } from 'esbuild-sass-plugin';
import * as fs from 'node:fs/promises';
import process from 'node:process';
import * as cp from 'node:child_process'
import * as cp from 'node:child_process';
import svgr from 'esbuild-plugin-svgr';

// This script runs tsc and esbuild in parallel when there are filesystem changes.
// It outputs predictable markers for the beginning and ending of the compilation,
Expand Down Expand Up @@ -46,7 +47,12 @@ await Promise.all(
'.png': 'file',
'.svg': 'file',
},
plugins: [sassPlugin()],
plugins: [
sassPlugin(),
svgr({
plugins: ['@svgr/plugin-jsx']
}),
],
});
contexts.push(ctx);
}),
Expand Down
6 changes: 5 additions & 1 deletion build/esbuild.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import * as esbuild from 'esbuild';
import { sassPlugin } from 'esbuild-sass-plugin';
import * as fs from 'fs/promises';
import svgr from 'esbuild-plugin-svgr';

const webviews = [
'cluster',
Expand All @@ -18,6 +19,7 @@ const webviews = [
'welcome',
'feedback',
'add-service-binding',
'openshift-terminal',
];

function kebabToCamel(text) {
Expand All @@ -37,10 +39,12 @@ await Promise.all([
sourcemap: true,
loader: {
'.png': 'file',
'.svg': 'file',
},
plugins: [
sassPlugin(),
svgr({
plugins: ['@svgr/plugin-jsx']
}),
]
})
),
Expand Down
3 changes: 1 addition & 2 deletions images/helm/helm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/welcome/microsoft.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading