Commit6525faf

authored

Merge pull requestpyscript#25 from anaconda/mattpap/esm_import_module

Allow `import d3` instead of `from esm import d3`

2 parents51c2efd +0dc3b72 commit6525fafCopy full SHA for 6525faf

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`
`110`	`110`	`<py-script>`
`111`	`111`	`from pyodide import create_proxy, to_js`
`112`		`-from esmimport d3`
	`112`	`+import d3`
`113`	`113`
`114`	`114`	`fruits = [`
`115`	`115`	`dict(name="🍊", count=21),`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,6 @@ export class PyScript extends HTMLElement {`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`protectedasync_register_esm(pyodide:PyodideInterface):Promise<void>{`
`250`		`-constimports:{[key:string]:unknown}={}`
`251`		`-`
`252`	`250`	`for(constnodeofdocument.querySelectorAll("script[type='importmap']")){`
`253`	`251`	`constimportmap=(()=>{`
`254`	`252`	`try{`
`@@ -265,17 +263,19 @@ export class PyScript extends HTMLElement {`
`265`	`263`	`if(typeofname!="string"\|\|typeofurl!="string")`
`266`	`264`	`continue`
`267`	`265`
	`266`	`+letexports:object`
`268`	`267`	`try{`
`269`	`268`	`// XXX: pyodide doesn't like Module(), failing with`
`270`	`269`	`// "can't read 'name' of undefined" at import time`
`271`		`-imports[name]={...awaitimport(url)}`
	`270`	`+exports={...awaitimport(url)}`
`272`	`271`	`}catch{`
`273`		-console.error(`failed to fetch '${url}' for '${name}'`)
	`272`	+console.warn(`failed to fetch '${url}' for '${name}'`)
	`273`	`+continue`
`274`	`274`	`}`
	`275`	`+`
	`276`	`+pyodide.registerJsModule(name,exports)`
`275`	`277`	`}`
`276`	`278`	`}`
`277`		`-`
`278`		`-pyodide.registerJsModule("esm",imports)`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`asyncevaluate():Promise<void>{`

Comments

(0)