Merge branch 'main' into pys-19/allow_out_err_redirect

fpliger · fpliger · commit a6955b170a88 · 2022-04-18T22:21:47.000-05:00
diff --git a/README.md b/README.md
@@ -19,8 +19,8 @@ To try PyScript, import the pyscript to your html page with:
 ```
 At that point, you can then use PyScript components in your html page. PyScript currently implements the following elements:
 
-* `<py-script>`: that can be used to define python code that is execute withing the web page. The element itself is not rendered to the page and only used to add logic
-* `<py-repl>`: creates a REPL component that is rendered to the page as a code editor and allows users to right code that can be executed
+* `<py-script>`: that can be used to define python code that is executable within the web page. The element itself is not rendered to the page and only used to add logic
+* `<py-repl>`: creates a REPL component that is rendered to the page as a code editor and allows users to write code that can be executed
 
 Check out the `/examples` folder for more examples on how to use it, all you need to do is open them in Chrome.
 
diff --git a/pyscriptjs/examples/d3.html b/pyscriptjs/examples/d3.html
@@ -109,7 +109,7 @@
 
 <py-script>
 from pyodide import create_proxy, to_js
-from esm import d3
+import d3
 
 fruits = [
   dict(name="🍊", count=21),
diff --git a/pyscriptjs/src/components/pyscript.ts b/pyscriptjs/src/components/pyscript.ts
@@ -215,8 +215,6 @@ export class PyScript extends BaseEvalElement {
     }
 
     protected async _register_esm(pyodide: PyodideInterface): Promise<void> {
-      const imports: {[key: string]: unknown} = {}
-
       for (const node of document.querySelectorAll("script[type='importmap']")) {
         const importmap = (() => {
           try {
@@ -233,17 +231,19 @@ export class PyScript extends BaseEvalElement {
           if (typeof name != "string" || typeof url != "string")
             continue
 
+          let exports: object
           try {
             // XXX: pyodide doesn't like Module(), failing with
             // "can't read 'name' of undefined" at import time
-            imports[name] = {...await import(url)}
+            exports = {...await import(url)}
           } catch {
-            console.error(`failed to fetch '${url}' for '${name}'`)
+            console.warn(`failed to fetch '${url}' for '${name}'`)
+            continue
           }
+
+          pyodide.registerJsModule(name, exports)
         }
       }
-
-      pyodide.registerJsModule("esm", imports)
     }
 
     getSourceFromElement(): string {

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,6 @@ export class PyScript extends BaseEvalElement {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`protected async _register_esm(pyodide: PyodideInterface): Promise<void> {`
`218`		`- const imports: {[key: string]: unknown} = {}`
`219`		`-`
`220`	`218`	`for (const node of document.querySelectorAll("script[type='importmap']")) {`
`221`	`219`	`const importmap = (() => {`
`222`	`220`	`try {`
`@@ -233,17 +231,19 @@ export class PyScript extends BaseEvalElement {`
`233`	`231`	`if (typeof name != "string" \|\| typeof url != "string")`
`234`	`232`	`continue`
`235`	`233`
	`234`	`+ let exports: object`
`236`	`235`	`try {`
`237`	`236`	`// XXX: pyodide doesn't like Module(), failing with`
`238`	`237`	`// "can't read 'name' of undefined" at import time`
`239`		`- imports[name] = {...await import(url)}`
	`238`	`+ exports = {...await import(url)}`
`240`	`239`	`} catch {`
`241`		- console.error(`failed to fetch '${url}' for '${name}'`)
	`240`	+ console.warn(`failed to fetch '${url}' for '${name}'`)
	`241`	`+ continue`
`242`	`242`	`}`
	`243`	`+`
	`244`	`+ pyodide.registerJsModule(name, exports)`
`243`	`245`	`}`
`244`	`246`	`}`
`245`		`-`
`246`		`- pyodide.registerJsModule("esm", imports)`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`getSourceFromElement(): string {`