8000 Fix #2040 - Polyscript update to provide config dictionary (#2041) · Narnar-Codes/pyscript@5b4e852 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5b4e852

Browse files
Fix pyscript#2040 - Polyscript update to provide config dictionary (pyscript#2041)
* Fix pyscript#2040 - Polyscript update to provide config dictionary * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 83c2afe commit 5b4e852

File tree

5 files changed

+95
-82
lines changed

5 files changed

+95
-82
lines changed

pyscript.core/package-lock.json

Lines changed: 78 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyscript.core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pyscript/core",
3-
"version": "0.4.22",
3+
"version": "0.4.24",
44
"type": "module",
55
"description": "PyScript",
66
"module": "./index.js",
@@ -42,14 +42,14 @@
4242
"dependencies": {
4343
"@ungap/with-resolvers": "^0.1.0",
4444
"basic-devtools": "^0.1.6",
45-
"polyscript": "^0.12.6",
45+
"polyscript": "^0.12.7",
4646
"sticky-module": "^0.1.1",
4747
"to-json-callback": "^0.1.1",
4848
"type-checked-collections": "^0.1.7"
4949
},
5050
"devDependencies": {
5151
"@codemirror/commands": "^6.5.0",
52-
"@codemirror/lang-python": "^6.1.5",
52+
"@codemirror/lang-python": "^6.1.6",
5353
"@codemirror/language": "^6.10.1",
5454
"@codemirror/state": "^6.4.1",
5555
"@codemirror/view": "^6.26.3",
@@ -63,7 +63,7 @@
6363
"chokidar": "^3.6.0",
6464
"codemirror": "^6.0.1",
6565
"eslint": "^9.1.1",
66-
"rollup": "^4.16.4",
66+
"rollup": "^4.17.2",
6767
"rollup-plugin-postcss": "^4.0.2",
6868
"rollup-plugin-string": "^3.0.0",
6969
"static-handler": "^0.4.3",

pyscript.core/src/stdlib/pyscript/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
from pyscript.magic_js import (
3535
RUNNING_IN_WORKER,
3636
PyWorker,
37+
config,
3738
current_target,
3839
document,
3940
js_modules,

pyscript.core/src/stdlib/pyscript/magic_js.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
import json
12
import sys
23

34
import js as globalThis
5+
from polyscript import config as _config
46
from polyscript import js_modules
57
from pyscript.util import NotSupported
68

79
RUNNING_IN_WORKER = not hasattr(globalThis, "document")
810

11+
config = json.loads(globalThis.JSON.stringify(_config))
12+
913

1014
# allow `from pyscript.js_modules.xxx import yyy`
1115
class JSModule:

pyscript.core/test/config-url.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,17 @@
88
<script type="module" src="../dist/core.js"></script>
99
<mpy-config src="config-url/config.json"></mpy-config>
1010
<script type="mpy">
11+
from pyscript import config
12+
if config["files"]["{TO}"] != "./runtime":
13+
raise Exception("wrong config tree")
14+
1115
from runtime import test
1216
</script>
1317
<script type="mpy" worker>
18+
from pyscript import config
19+
if config["files"]["{TO}"] != "./runtime":
20+
raise Exception("wrong config tree")
21+
1422
from runtime import test
1523
</script>
1624
</head>

0 commit comments

Comments
 (0)
0