Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 00:09:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes vite warnings & improves pipeline

Browse Source
This commit is contained in:
Henning Dieterichs
2026-02-26 19:52:42 +01:00
committed by Henning Dieterichs
parent 80de3ee6d2
commit 0a01b4f5ae
4 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
.github/workflows/screenshot-test.yml vendored
View File

@@ -1,4 +1,4 @@
name: Screenshot Tests
name: Checking Component Screenshots
on:
push:
@@ -20,6 +20,7 @@ concurrency:
jobs:
screenshots:
name: Checking Component Screenshots
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -95,39 +96,42 @@ jobs:
REPORT="test/componentFixtures/.screenshots/report/report.json"
if [ -f "$REPORT" ]; then
CHANGED=$(node -e "const r = require('./$REPORT'); console.log(r.summary.added + r.summary.removed + r.summary.changed)")
TITLE="${CHANGED} screenshots changed"
TITLE="📸 ${CHANGED} screenshots changed"
CONCLUSION="neutral"
else
TITLE="Screenshots match"
TITLE="📸 Screenshots match"
CONCLUSION="success"
fi
SHA="${{ github.event.pull_request.head.sha || github.sha }}"
CHECK_RUN_ID=$(gh api "repos/${{ github.repository }}/commits/$SHA/check-runs" \
--jq '.check_runs[] | select(.name == "screenshots") | .id')
DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json"
EXPLORER_PUSHED=false
if gh api "repos/${{ github.repository }}/check-runs" \
--input - <<EOF; then
{"name":"Component Screenshots","head_sha":"$SHA","status":"completed","conclusion":"$CONCLUSION","details_url":"$DETAILS_URL","output":{"title":"$TITLE","summary":"$TITLE"}}
EOF
EXPLORER_PUSHED=true
else
echo "::warning::Could not create check run (expected for fork PRs)"
fi
CHECK_RUN_ID=$(gh api "repos/${{ github.repository }}/commits/$SHA/check-runs" \
--jq '.check_runs[] | select(.name == "Checking Component Screenshots / screenshots") | .id')
if [ "$EXPLORER_PUSHED" = true ]; then
CHECK_TITLE="Screenshots"
else
CHECK_TITLE="$TITLE"
fi
if [ -n "$CHECK_RUN_ID" ]; then
gh api "repos/${{ github.repository }}/check-runs/$CHECK_RUN_ID" \
-X PATCH --input - <<EOF || echo "::warning::Could not update check run (expected for fork PRs)"
{"details_url":"$DETAILS_URL","output":{"title":"$TITLE","summary":"$TITLE"}}
{"details_url":"$DETAILS_URL","output":{"title":"$CHECK_TITLE","summary":"$CHECK_TITLE"}}
EOF
fi
DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json"
gh api "repos/${{ github.repository }}/statuses/$SHA" \
--input - <<EOF || echo "::warning::Could not create commit status (expected for fork PRs)"
{"state":"success","target_url":"$DETAILS_URL","description":"$TITLE","context":"screenshots / explorer"}
EOF
- name: Post summary
run: |
if [ -f test/componentFixtures/.screenshots/report/report.md ]; then
cat test/componentFixtures/.screenshots/report/report.md >> $GITHUB_STEP_SUMMARY
else
echo "## Screenshots ✅" >> $GITHUB_STEP_SUMMARY
echo "No visual changes detected." >> $GITHUB_STEP_SUMMARY
fi
# - name: Post PR comment
# if: github.event_name == 'pull_request'
# env:

5
.vscode/tasks.json vendored
View File

@@ -385,6 +385,11 @@
"file": 1,
"line": 2,
"column": 3
},
"background": {
"activeOnStart": true,
"beginsPattern": ".*Setting up sessions.*",
"endsPattern": "Redirection server listening on.*"
}
}
}

7
build/vite/vite.config.ts
View File

@@ -143,11 +143,8 @@ const logger = createLogger();
const loggerWarn = logger.warn;
logger.warn = (msg, options) => {
// amdX and the baseUrl code cannot be analyzed by vite.
// However, they are not needed, so it is okay to silence the warning.
if (msg.indexOf('vs/amdX.ts') !== -1) {
return;
}
// the baseUrl code cannot be analyzed by vite.
// However, it is not needed, so it is okay to silence the warning.
if (msg.indexOf('await import(new URL(`vs/workbench/workbench.desktop.main.js`, baseUrl).href)') !== -1) {
return;
}

8
src/vs/amdX.ts
View File

@@ -171,15 +171,15 @@ class AMDModuleImporter {
if (this._amdPolicy) {
scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as unknown as string;
}
await import(scriptSrc);
await import(/* @vite-ignore */ scriptSrc);
return this._defineCalls.pop();
}
private async _nodeJSLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
try {
const fs = (await import(`${'fs'}`)).default;
const vm = (await import(`${'vm'}`)).default;
const module = (await import(`${'module'}`)).default;
const fs = (await import(/* @vite-ignore */ `${'fs'}`)).default;
const vm = (await import(/* @vite-ignore */ `${'vm'}`)).default;
const module = (await import(/* @vite-ignore */ `${'module'}`)).default;
const filePath = URI.parse(scriptSrc).fsPath;
const content = fs.readFileSync(filePath).toString();