Merge branch 'main' into chris/kernel-error-messages

Author: Artmann

.gitignore

@@ -1,74 +1,75 @@
+__pycache__
+!build/
+!src/test/pythonEnvironments/**/*.*
+!yarn.lock
 .DS_Store
+.eslintcache
+.github_token
 .huskyrc.json
-dist
-out
+.nyc_output
+.pytest_cache
+.python-version
+.qlty/cache
+.qlty/logs
+.qlty/out
+.qlty/plugin_cachedir
+.qlty/results
+.vs/
+.vscode-test
+.vscode-test-web
 *.exe
-log.log
-**/node_modules
+*.i18n.json
+*.nls.*.json
+*.noseids
 *.pyc
 *.vsix
+*.xlf
+**/.mypy_cache/**
+**/.venv*/
+**/.vscode test/**
+**/.vscode-smoke/**
+**/.vscode-test/**
 **/.vscode/.ropeproject/**
+**/*.esbuild.meta.json
+**/node_modules
 **/testFiles/**/.cache/**
-*.noseids
-.nyc_output
-.vscode-test
-__pycache__
-npm-debug.log
-**/.mypy_cache/**
-!yarn.lock
+# Compilation of less to css
+# Esbuild files
+# Qlty cache directories
+# translation files
+bin/**
 coverage/
 cucumber-report.json
-**/.vscode-test/**
-**/.vscode test/**
-**/.vscode-smoke/**
-**/.venv*/
-port.txt
-precommit.hook
-pythonFiles/lib/**
 debug_coverage*/**
-languageServer/**
+debug*.log
+debugpy*.log
+dist
+l10n/
 languageServer.*/**
-bin/**
+languageServer/**
+log.log
 logs/**
+nodeLanguageServer.*/**
+nodeLanguageServer/**
+npm-debug.log
 obj/**
-.pytest_cache
-temp
-tmp
-src/test/datascience/tmp/**
-src/test/datascience/temp/**
-.python-version
-.vs/
-test-results*.xml
-testresults.json
-telemetry.json
-xunit-test-results.xml
-!build/
-debug*.log
-debugpy*.log
+out
+port.txt
+precommit.hook
 pydevd*.log
-vscode.d.ts
-vscode.proposed.*.d.ts
-nodeLanguageServer/**
-nodeLanguageServer.*/**
+pythonFiles/lib/**
 src/test/datascience/.venv*
-!src/test/pythonEnvironments/**/*.*
-.vscode-test-web
-.github_token
-# translation files
-*.xlf
-*.nls.*.json
-*.i18n.json
-l10n/
-# Esbuild files
-**/*.esbuild.meta.json
-# Compilation of less to css
+src/test/datascience/temp/**
+src/test/datascience/tmp/**
 src/webviews/webview-side/interactive-common/variableExplorerGrid.css
 src/webviews/webview-side/interactive-common/variableExplorerGrid.css.map
 src/webviews/webview-side/react-common/seti/seti.css
 src/webviews/webview-side/react-common/seti/seti.css.map
-# Qlty cache directories
-.qlty/cache
-.qlty/logs
-.qlty/out
-.qlty/plugin_cachedir
-.qlty/results
+telemetry.json
+temp
+test-results*.xml
+testresults.json
+tmp
+vscode.d.ts
+vscode.proposed.*.d.ts
+xunit-test-results.xml

.husky/post-checkout

@@ -0,0 +1 @@
+npm ci

.husky/pre-commit

@@ -1,17 +1 @@
-#!/bin/sh
-if npm list prettier | grep -q prettier@ ; then
-    echo husky - prettier is installed
-else
-    echo husky - prettier is not installed, skipping format check
-    exit 0
-fi
-
-# run prettier on all .ts files that are in the commit
-changed=$(git diff --diff-filter=ACM --cached --name-only | grep .ts$ | tr '\n' ' ')
-
-if [ -z "$changed" ]; then
-    echo husky - No modified files to check
-    exit 0
-fi
-
-npx prettier $changed --check
+npm exec lint-staged

.husky/pre-push

@@ -0,0 +1,5 @@
+branch_name="$(git symbolic-ref --short HEAD)"
+if [ "$branch_name" = "main" ]; then
+  echo "Pushing directly to main is not allowed."
+  exit 1
+fi

build/esbuild/build.ts

@@ -331,6 +331,11 @@ async function buildAll() {
             path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'dataframeRenderer', 'dataframeRenderer.js'),
             { target: 'web', watch: isWatchMode }
         ),
+        build(
+            path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'vega-renderer', 'index.ts'),
+            path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'vegaRenderer', 'vegaRenderer.js'),
+            { target: 'web', watch: isWatchMode }
+        ),
         build(
             path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'variable-view', 'index.tsx'),
             path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'variableView.js'),