From 71c6cda6c7a919aae46b63759208aa274fb65cad Mon Sep 17 00:00:00 2001 From: webreflection Date: Tue, 17 Sep 2024 12:30:35 +0200 Subject: [PATCH] Exposing config type once resolved and running --- pyscript.core/src/stdlib/pyscript/magic_js.py | 5 ++++ pyscript.core/tests/index.html | 2 +- pyscript.core/tests/integration.spec.js | 5 ++++ .../tests/js-integration/config_type.html | 23 +++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pyscript.core/tests/js-integration/config_type.html diff --git a/pyscript.core/src/stdlib/pyscript/magic_js.py b/pyscript.core/src/stdlib/pyscript/magic_js.py index 509643a4806..08e33ea7bc6 100644 --- a/pyscript.core/src/stdlib/pyscript/magic_js.py +++ b/pyscript.core/src/stdlib/pyscript/magic_js.py @@ -10,6 +10,11 @@ config = json.loads(globalThis.JSON.stringify(_config)) +if "MicroPython" in sys.version: + config["type"] = "mpy" +else: + config["type"] = "py" + # allow `from pyscript.js_modules.xxx import yyy` class JSModule: diff --git a/pyscript.core/tests/index.html b/pyscript.core/tests/index.html index 9717655b04d..647df6ca159 100644 --- a/pyscript.core/tests/index.html +++ b/pyscript.core/tests/index.html @@ -14,5 +14,5 @@ a:hover { opacity: 1; } -

diff --git a/pyscript.core/tests/integration.spec.js b/pyscript.core/tests/integration.spec.js index 6c0ecbee79c..1562aacd944 100644 --- a/pyscript.core/tests/integration.spec.js +++ b/pyscript.core/tests/integration.spec.js @@ -114,3 +114,8 @@ test('Pyodide loader', async ({ page }) => { const body = await page.evaluate(() => document.body.textContent); await expect(body.includes('Loaded Pyodide')).toBe(true); }); + +test('Py and Mpy config["type"]', async ({ page }) => { + await page.goto('http://localhost:8080/tests/js-integration/config_type.html'); + await page.waitForSelector('html.mpy.py'); +}); diff --git a/pyscript.core/tests/js-integration/config_type.html b/pyscript.core/tests/js-integration/config_type.html new file mode 100644 index 00000000000..e75b60d6856 --- /dev/null +++ b/pyscript.core/tests/js-integration/config_type.html @@ -0,0 +1,23 @@ + + + + + + + + + + + + +