Skip to content

Commit ac5ed7b

Browse files
committed
Merge remote-tracking branch 'origin/main' into koesie10/improve-error-message
2 parents c5e9ef1 + 1b84906 commit ac5ed7b

File tree

67 files changed

+1332
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1332
-603
lines changed

.github/workflows/cli-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- extensions/ql-vscode/src/language-support/**
1212
- extensions/ql-vscode/src/query-server/**
1313
- extensions/ql-vscode/supported_cli_versions.json
14+
- extensions/ql-vscode/src/variant-analysis/run-remote-query.ts
1415

1516
jobs:
1617
find-nightly:

.github/workflows/e2e-tests.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Run E2E Playwright tests
2+
on:
3+
push:
4+
branches: [main]
5+
pull_request:
6+
branches: [main]
7+
8+
jobs:
9+
e2e-test:
10+
name: E2E Test
11+
runs-on: ubuntu-latest
12+
timeout-minutes: 30
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version-file: extensions/ql-vscode/.nvmrc
20+
cache: 'npm'
21+
cache-dependency-path: extensions/ql-vscode/package-lock.json
22+
23+
- name: Install dependencies
24+
working-directory: extensions/ql-vscode
25+
run: npm ci
26+
27+
- name: Start containers
28+
working-directory: extensions/ql-vscode/test/e2e
29+
run: docker-compose -f "docker-compose.yml" up -d --build
30+
31+
- name: Install Playwright Browsers
32+
working-directory: extensions/ql-vscode
33+
run: npx playwright install --with-deps
34+
- name: Run Playwright tests
35+
working-directory: extensions/ql-vscode/test/e2e
36+
run: npx playwright test
37+
- uses: actions/upload-artifact@v4
38+
if: always()
39+
with:
40+
name: playwright-report
41+
path: extensions/ql-vscode/playwright-report/
42+
retention-days: 30
43+
- name: Stop containers
44+
working-directory: extensions/ql-vscode/test/e2e
45+
if: always()
46+
run: docker-compose -f "docker-compose.yml" down -v

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ artifacts/
1919
# CodeQL metadata
2020
.cache/
2121
.codeql/
22+
23+
# E2E Reports
24+
**/playwright-report/**
25+
**/test-results/**

extensions/ql-vscode/.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const baseConfig = {
2828
"plugin:@typescript-eslint/recommended",
2929
"plugin:import/recommended",
3030
"plugin:import/typescript",
31+
"plugin:deprecation/recommended",
3132
],
3233
rules: {
3334
"@typescript-eslint/await-thenable": "error",

extensions/ql-vscode/.storybook/vscode-theme-addon/manager.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import * as React from "react";
2-
import { addons, types } from "@storybook/manager-api";
2+
import { addons } from "@storybook/manager-api";
3+
import { Addon_TypesEnum } from "@storybook/types";
34
import { ThemeSelector } from "./ThemeSelector";
45

56
const ADDON_ID = "vscode-theme-addon";
67

78
addons.register(ADDON_ID, () => {
89
addons.add(ADDON_ID, {
910
title: "VSCode Themes",
10-
type: types.TOOL,
11+
type: Addon_TypesEnum.TOOL,
1112
match: ({ viewMode }) => !!(viewMode && viewMode.match(/^(story|docs)$/)),
1213
render: () => <ThemeSelector />,
1314
});

0 commit comments

Comments
 (0)