Commit3029687

authored

Merge pull request#62 from ShMcK/feature/load-external

Feature/load external

2 parents8068220 +1653d4a commit3029687Copy full SHA for 3029687

File tree

+22

-19

lines changed

+22

-19

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ const createReactWebView = ({ extensionPath, workspaceState, workspaceRoot }: Re`
`25`	`25`	`localResourceRoots:[vscode.Uri.file(path.join(extensionPath,'build'))],`
`26`	`26`	`// prevents destroying the window when it is in the background`
`27`	`27`	`retainContextWhenHidden:true,`
	`28`	`+// allows scripts to load external resources (eg. markdown images, fonts)`
	`29`	`+enableCommandUris:true,`
`28`	`30`	`}`
`29`	`31`	`loaded=true`
`30`	`32`	`returnvscode.window.createWebviewPanel(viewType,title,vscode.ViewColumn.Two,config)`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,13 @@ async function render(panel: vscode.WebviewPanel, rootPath: string) {`
`64`	`64`	`// set CSP (content security policy) to grant permission to local files`
`65`	`65`	`constcspMeta:HTMLMetaElement=document.createElement('meta')`
`66`	`66`	`cspMeta.httpEquiv='Content-Security-Policy'`
`67`		`-cspMeta.content=[`
`68`		-`font-src${panel.webview.cspSource} http: https: data:;`,
`69`		-`img-src${panel.webview.cspSource} https:;`,
`70`		-`script-src${nonces.map(nonce=>`'nonce-${nonce}'`).join(' ')};`,
`71`		-`style-src${panel.webview.cspSource} https:;`,
`72`		`-].join(' ')`
	`67`	`+cspMeta.content=`
	`68`	`+[`
	`69`	+`font-src${panel.webview.cspSource} http: https: data:`,
	`70`	+`img-src${panel.webview.cspSource} https:`,
	`71`	+`script-src${nonces.map(nonce=>`'nonce-${nonce}'`).join(' ')} data:`,
	`72`	+`style-src${panel.webview.cspSource} https:`,
	`73`	`+].join('; ')+';'`
`73`	`74`	`document.head.appendChild(cspMeta)`
`74`	`75`
`75`	`76`	`// stringify dom`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,26 +2,26 @@`
`2`	`2`	`@import'~@alifd/theme-4/dist/next.css';`
`3`	`3`
`4`	`4`	`html {`
`5`		`-height:100%;`
`6`		`-width:100%;`
	`5`	`+height:100%;`
	`6`	`+width:100%;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`body {`
`10`		`-height:100%;`
`11`		`-width:100%;`
`12`		`-margin:0;`
`13`		`-padding:0;`
`14`		`-font-family: -apple-system, BlinkMacSystemFont,'Segoe UI','Roboto','Oxygen','Ubuntu','Cantarell','Fira Sans',`
`15`		`-'Droid Sans','Helvetica Neue', sans-serif;`
`16`		`--webkit-font-smoothing: antialiased;`
`17`		`--moz-osx-font-smoothing: grayscale;`
`18`		`-background-color: white;`
	`10`	`+height:100%;`
	`11`	`+width:100%;`
	`12`	`+margin:0;`
	`13`	`+padding:0;`
	`14`	`+font-family: -apple-system, BlinkMacSystemFont,'Segoe UI','Roboto','Oxygen','Ubuntu','Cantarell','Fira Sans',`
	`15`	`+'Droid Sans','Helvetica Neue', sans-serif;`
	`16`	`+-webkit-font-smoothing: antialiased;`
	`17`	`+-moz-osx-font-smoothing: grayscale;`
	`18`	`+background-color: white;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`code {`
`22`		`-font-family: source-code-pro, Menlo, Monaco, Consolas,'Courier New', monospace;`
	`22`	`+font-family: source-code-pro, Menlo, Monaco, Consolas,'Courier New', monospace;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`p {`
`26`		`-margin:0;`
	`26`	`+margin:0;`
`27`	`27`	`}`

Comments

(0)