Skip to content

Commit

Permalink
Merge branch 'master' into fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Heliozoa authored Jan 25, 2024
2 parents 8947f4a + 8555386 commit 776e2aa
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ webpack.prod.js

# Ignore all webview-ui files except the build directory
webview-ui/src/**
webview-ui/public/**
#webview-ui/public/**
webview-ui/scripts/**
webview-ui/index.html
webview-ui/README.md
webview-ui/package.json
webview-ui/package-lock.json
webview-ui/rollup.config.js
webview-ui/node_modules/**
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,9 @@ A script is ran during the release process to ensure that
- the `package.json` and `package-lock.json` has the same version number as the tagged version

You can update the `package-lock.json` version with `npm i --package-lock-only`.

## Other notes

Running the extension produces the following superfluous warnings:
- `An iframe which has both allow-scripts and allow-same-origin for its sandbox attribute can escape its sandboxing.`: https://github.com/microsoft/vscode/issues/192853
- `[Violation] Avoid using document.write(). <URL>`: https://github.com/microsoft/vscode/issues/156147
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "test-my-code",
"displayName": "TestMyCode",
"version": "2.2.4",
"version": "3.0.0",
"description": "TestMyCode extension for Visual Studio Code",
"categories": [
"Other"
Expand Down
3 changes: 2 additions & 1 deletion src/panels/TmcPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ export class TmcPanel {
img-src ${webview.cspSource} https:;;
style-src 'nonce-${nonce}';
script-src 'nonce-${nonce}';"
>
/>
<meta property="csp-nonce" content="${nonce}" />
<link nonce="${nonce}" rel="stylesheet" type="text/css" href="${stylesUri}" />
<script defer nonce="${nonce}" src="${scriptUri}" />
</head>
Expand Down

0 comments on commit 776e2aa

Please sign in to comment.