Skip to content

Commit 3d31797

Browse files
authored
Merge branch 'master' into homeFixes
2 parents 9993e14 + 33385cf commit 3d31797

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

apps/debugger/src/app/debugger-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const DebuggerApiMixin = (Base) => class extends Base {
8383
const target = (address && remixDebug.traceHelper.isContractCreation(address)) ? receipt.contractAddress : address
8484
const targetAddress = target || receipt.contractAddress || receipt.to
8585
const codeAtAddress = await this._web3.eth.getCode(targetAddress)
86-
const output = await this.call('fetchAndCompile', 'resolve', targetAddress, codeAtAddress, 'browser/.debug')
86+
const output = await this.call('fetchAndCompile', 'resolve', targetAddress, codeAtAddress, '.debug')
8787
if (output) {
8888
return new CompilerAbstract(output.languageversion, output.data, output.source)
8989
}

libs/remix-core-plugin/src/lib/compiler-content-imports.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ export class CompilerImports extends Plugin {
3535

3636
isExternalUrl (url) {
3737
const handlers = this.urlResolver.getHandlers()
38-
return handlers.some(handler => handler.match(url))
38+
// we filter out "npm" because this will be recognized as internal url although it's not the case.
39+
return handlers.filter((handler) => handler.type !== 'npm').some(handler => handler.match(url))
3940
}
4041

4142
/**

libs/remix-ui/panel/src/lib/plugins/panel-header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
2020

2121
return (
2222
<header className='swapitHeader'><h6 data-id='sidePanelSwapitTitle'>{plugin?.profile.displayName || plugin?.profile.name}</h6>
23-
{plugin?.profile.documentation ? (<a href={plugin.profile.documentation} className="titleInfo" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) : ''}
23+
{plugin?.profile.documentation ? (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) : ''}
2424
</header>)
2525
}
2626

0 commit comments

Comments
 (0)