Updated coincident to use a local channel (#2195)

* Updated coincident to use a local channel
2025-12-19 10:17:23 -05:00 · 2024-09-30 14:03:33 +02:00
parent 2642be863b
commit 8de97a7e7b
7 changed files with 48 additions and 28 deletions
--- a/core/package-lock.json
+++ b/core/package-lock.json
@@ -1,18 +1,18 @@
 {
    "name": "@pyscript/core",
-    "version": "0.5.15",
+    "version": "0.5.16",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "@pyscript/core",
-            "version": "0.5.15",
+            "version": "0.5.16",
            "license": "APACHE-2.0",
            "dependencies": {
                "@ungap/with-resolvers": "^0.1.0",
                "@webreflection/idb-map": "^0.3.1",
                "basic-devtools": "^0.1.6",
-                "polyscript": "^0.15.11",
+                "polyscript": "^0.15.12",
                "sabayon": "^0.5.2",
                "sticky-module": "^0.1.1",
                "to-json-callback": "^0.1.1",
@@ -45,6 +45,9 @@
                "typescript": "^5.6.2",
                "xterm": "^5.3.0",
                "xterm-readline": "^1.1.1"
+            },
+            "engines": {
+                "node": ">=20"
            }
        },
        "node_modules/@codemirror/autocomplete": {
@@ -1284,13 +1287,13 @@
            }
        },
        "node_modules/coincident": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/coincident/-/coincident-2.2.0.tgz",
-            "integrity": "sha512-TQGuIpd6SIkTyTrW/9wFhIfrD3qwt5QoC8WfCTx1BG3tTCi+Qtyk/grsG0RvNvxC7Ver/oZ1xKPVoI9Ed9AmeA==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/coincident/-/coincident-2.2.1.tgz",
+            "integrity": "sha512-Kwh0Sd+jbz63HwgJ8247SMEoZgeaMRiq7hHHrPLuop4BcwVURZMyaKnlloZgv4xX5w1/IXbgw0X/hCbAS2PK5g==",
            "license": "MIT",
            "dependencies": {
                "gc-hook": "^0.4.1",
-                "js-proxy": "^0.5.0",
+                "js-proxy": "^0.5.1",
                "sabayon": "^0.5.2"
            }
        },
@@ -2234,9 +2237,9 @@
            "license": "ISC"
        },
        "node_modules/js-proxy": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/js-proxy/-/js-proxy-0.5.0.tgz",
-            "integrity": "sha512-f7g0UphZydxBANAC9jgfCqYqdz+nfOCiACq63VAQ36xKdvnRpdRs934aDSVTT1XAUApBhHfBa4wWT7Em/R47Qw==",
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/js-proxy/-/js-proxy-0.5.1.tgz",
+            "integrity": "sha512-G1AswnGndelrmZ2tuJi5NWlXo28BucJdgO8aKP5U1NkxWxPvgFA510Ku6at+1A17Kh2ja7A/r4RDtd9Hdr6sOw==",
            "license": "MIT",
            "dependencies": {
                "gc-hook": "^0.3.1",
@@ -2672,9 +2675,9 @@
            }
        },
        "node_modules/polyscript": {
-            "version": "0.15.11",
-            "resolved": "https://registry.npmjs.org/polyscript/-/polyscript-0.15.11.tgz",
-            "integrity": "sha512-uL26/U5WLgiwg1Tjgln5/kIeejzIVtroPFlYm+YFM2wzktcsk3ClxI27vXHMvy1A0M2r1AWCm2ThaAVc8CKJSg==",
+            "version": "0.15.12",
+            "resolved": "https://registry.npmjs.org/polyscript/-/polyscript-0.15.12.tgz",
+            "integrity": "sha512-4u2JRInGIBEQLM6IcNnJ797IGw8aReGx8ttnNB5Zfe2z3ZvK7DpB1kbkSzox+Q9GoP2OddoyORhq4p/mWCwL1g==",
            "license": "APACHE-2.0",
            "dependencies": {
                "@ungap/structured-clone": "^1.2.0",
@@ -2683,7 +2686,7 @@
                "@webreflection/idb-map": "^0.3.1",
                "basic-devtools": "^0.1.6",
                "codedent": "^0.1.2",
-                "coincident": "^2.2.0",
+                "coincident": "^2.2.1",
                "gc-hook": "^0.4.1",
                "html-escaper": "^3.0.3",
                "proxy-target": "^3.0.2",
--- a/core/package.json
+++ b/core/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@pyscript/core",
-    "version": "0.5.15",
+    "version": "0.5.16",
    "type": "module",
    "description": "PyScript",
    "module": "./index.js",
@@ -43,7 +43,7 @@
        "build:3rd-party": "node rollup/3rd-party.cjs",
        "build:tests-index": "node rollup/build_test_index.cjs",
        "clean:3rd-party": "rm src/3rd-party/*.js && rm src/3rd-party/*.css",
-        "test:integration": "static-handler --coi . 2>/dev/null & SH_PID=$!; EXIT_CODE=0; playwright test --workers=1 tests/js_tests.spec.js tests/py_tests.spec.js || EXIT_CODE=$?; kill $SH_PID 2>/dev/null; exit $EXIT_CODE",
+        "test:integration": "static-handler --coi . 2>/dev/null & SH_PID=$!; EXIT_CODE=0; playwright test tests/js_tests.spec.js tests/py_tests.spec.js || EXIT_CODE=$?; kill $SH_PID 2>/dev/null; exit $EXIT_CODE",
        "test:ws": "bun tests/ws/index.js & playwright test tests/ws.spec.js",
        "dev": "node dev.cjs",
        "release": "npm run build && npm run zip",
@@ -61,7 +61,7 @@
        "@ungap/with-resolvers": "^0.1.0",
        "@webreflection/idb-map": "^0.3.1",
        "basic-devtools": "^0.1.6",
-        "polyscript": "^0.15.11",
+        "polyscript": "^0.15.12",
        "sabayon": "^0.5.2",
        "sticky-module": "^0.1.1",
        "to-json-callback": "^0.1.1",
--- a/core/rollup/plugins.cjs
+++ b/core/rollup/plugins.cjs
@@ -13,7 +13,12 @@ for (const file of readdirSync(join(__dirname, "..", "src", "plugins"))) {
        plugins.push(
            // this comment is needed to avoid bundlers eagerly embedding lazy
            // dependencies, causing all sort of issues once in production
-            `    ${key}: () => import(/* webpackIgnore: true */ ${value}),`,
+            // ⚠️ THIS HAS TO BE LIKE THIS or prettier changes it every single time
+            `    ${key}: () =>
+        import(
+            /* webpackIgnore: true */
+            ${value}
+        ),`,
        );
    }
 }
--- a/core/src/plugins.js
+++ b/core/src/plugins.js
@@ -1,10 +1,23 @@
 // ⚠️ This file is an artifact: DO NOT MODIFY
 export default {
    ["deprecations-manager"]: () =>
-        import(/* webpackIgnore: true */ "./plugins/deprecations-manager.js"),
-    error: () => import(/* webpackIgnore: true */ "./plugins/error.js"),
+        import(
+            /* webpackIgnore: true */
+            "./plugins/deprecations-manager.js"
+        ),
+    error: () =>
+        import(
+            /* webpackIgnore: true */
+            "./plugins/error.js"
+        ),
    ["py-editor"]: () =>
-        import(/* webpackIgnore: true */ "./plugins/py-editor.js"),
+        import(
+            /* webpackIgnore: true */
+            "./plugins/py-editor.js"
+        ),
    ["py-terminal"]: () =>
-        import(/* webpackIgnore: true */ "./plugins/py-terminal.js"),
+        import(
+            /* webpackIgnore: true */
+            "./plugins/py-terminal.js"
+        ),
 };
--- a/core/src/stdlib/pyscript.js
+++ b/core/src/stdlib/pyscript.js
--- a/core/tests/js_tests.spec.js
+++ b/core/tests/js_tests.spec.js
@@ -1,5 +1,7 @@
 import { test, expect } from '@playwright/test';

+test.setTimeout(120 * 1000);
+
 test('MicroPython display', async ({ page }) => {
  await page.goto('http://localhost:8080/tests/javascript/mpy.html');
  await page.waitForSelector('html.done.worker');
@@ -94,7 +96,6 @@ test('MicroPython + JS Storage', async ({ page }) => {
 });

 test('MicroPython + workers', async ({ page }) => {
-  test.setTimeout(120*1000);  // Increase timeout for this test.
  await page.goto('http://localhost:8080/tests/javascript/workers/index.html');
  await page.waitForSelector('html.mpy.py');
 });
--- a/core/tests/py_tests.spec.js
+++ b/core/tests/py_tests.spec.js
@@ -1,8 +1,9 @@
 import { test, expect } from '@playwright/test';

+test.setTimeout(120 * 1000);
+
 test('Python unit tests - MicroPython on MAIN thread', async ({ page }) => {
  await page.goto('http://localhost:8080/tests/python/index.html');
-  test.setTimeout(120*1000);  // Increase timeout for this test.
  const result = page.locator("#result");  // Payload for results will be here.
  await result.waitFor();  // wait for the result.
  const data = JSON.parse(await result.textContent());  // get the result data.
@@ -11,7 +12,6 @@ test('Python unit tests - MicroPython on MAIN thread', async ({ page }) => {

 test('Python unit tests - Pyodide on MAIN thread', async ({ page }) => {
  await page.goto('http://localhost:8080/tests/python/index.html?type=py');
-  test.setTimeout(120*1000);  // Increase timeout for this test.
  const result = page.locator("#result");  // Payload for results will be here.
  await result.waitFor();  // wait for the result.
  const data = JSON.parse(await result.textContent());  // get the result data.
@@ -20,7 +20,6 @@ test('Python unit tests - Pyodide on MAIN thread', async ({ page }) => {

 test('Python unit tests - MicroPython on WORKER', async ({ page }) => {
  await page.goto('http://localhost:8080/tests/python/index.html?worker');
-  test.setTimeout(120*1000);  // Increase timeout for this test.
  const result = page.locator("#result");  // Payload for results will be here.
  await result.waitFor();  // wait for the result.
  const data = JSON.parse(await result.textContent());  // get the result data.
@@ -29,7 +28,6 @@ test('Python unit tests - MicroPython on WORKER', async ({ page }) => {

 test('Python unit tests - Pyodide on WORKER', async ({ page }) => {
  await page.goto('http://localhost:8080/tests/python/index.html?type=py&worker');
-  test.setTimeout(120*1000);  // Increase timeout for this test.
  const result = page.locator("#result");  // Payload for results will be here.
  await result.waitFor();  // wait for the result.
  const data = JSON.parse(await result.textContent());  // get the result data.