Skip to content

Commit e213eb8

Browse files
WebReflectionWebReflection
committed
fixed wrong parser out of config resolver
1 parent 3300827 commit e213eb8

13 files changed

Lines changed: 166 additions & 5 deletions

File tree

‎docs/index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/toml-BkyT28C4.js‎

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

‎docs/toml-BkyT28C4.js.map‎

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

‎docs/zip-D5O4WegH.js‎

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

‎docs/zip-D5O4WegH.js.map‎

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

‎esm/loader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ export const resolveConfig = (config, configURL, options = {}) => {
2222
if (type === 'json') {
2323
options = fetch(absolute).json();
2424
} else if (type === 'toml') {
25+
const { parser } = options;
2526
options = fetch(absolute).text().then(async value => {
26-
const { parser } = options;
27-
const module = parser ? await import(parser) : { parse: toml };
27+
const module = parser ? (await import(parser)) : { parse: toml };
2828
return (module.parse || module.default)(value);
2929
});
3030
} else if (type === 'string') {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,6 @@
9898
"to-json-callback": "^0.1.1"
9999
},
100100
"worker": {
101-
"blob": "sha256-sbA8E5hS+A6qJj6Hff1Hz/8P9X6JwySkRYqkLfX+gDw="
101+
"blob": "sha256-CMqyU495wkh4FqGMWy1Ju9ljzhOh5f1CMahlLl5USDo="
102102
}
103103
}

‎test/config/parser/config.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name = "test"

‎test/config/parser/index.html‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<script type="module" src="../../../dist/index.js"></script>
7+
<script type="module">
8+
import { define } from "../../../dist/index.js";
9+
10+
define("mpy", {
11+
interpreter: "micropython",
12+
configURL: new URL("./config.toml", location).href,
13+
parser: new URL("./parser.js", location).href,
14+
config: './config.toml',
15+
hooks: {
16+
main: {
17+
onReady(wrap, element) {
18+
fetch(element.src).then(b => b.text()).then(wrap.run);
19+
}
20+
},
21+
worker: {
22+
onReady({ run, runAsync }, xworker) {
23+
console.log('worker');
24+
},
25+
}
26+
}
27+
});
28+
</script>
29+
</head>
30+
<body>
31+
<!-- <script type="mpy" src="./main.py"></script> -->
32+
<script worker type="mpy" src="./worker.py"></script>
33+
</body>
34+
</html>

0 commit comments

Comments
 (0)