pyscript · ntoll · Sep 30, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,5 +11,4 @@
 <!-- Note: Only user-facing changes require a changelog entry. Internal-only API changes do not require a changelog entry. Changes in documentation do not require a changelog entry. -->
 
 -   [ ] All tests pass locally
--   [ ] I have updated `CHANGELOG.md`
--   [ ] I have created documentation for this(if applicable)
+-   [ ] I have created / updated documentation for this (if applicable)
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -7,7 +7,7 @@ on:
 
 defaults:
     run:
-        working-directory: ./pyscript.core
+        working-directory: ./core
 
 jobs:
     prepare-release:
@@ -57,7 +57,7 @@ jobs:
 
             - name: Generate index.html
               working-directory: .
-              run: sed 's#_PATH_#./#' ./public/index.html > ./pyscript.core/dist/index.html
+              run: sed -e 's#_PATH_#./#' -e 's#_VERSION_#latest#' -e 's#_DOC_VERSION_#latest#' -e 's#_TAG_VERSION_##' ./public/index.html > ./core/dist/index.html
 
             - name: Zip dist folder
               run: zip -r -q ./build.zip ./dist

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -6,7 +6,7 @@ on:
 
 defaults:
     run:
-        working-directory: ./pyscript.core
+        working-directory: ./core
 
 jobs:
     publish-release:
@@ -59,7 +59,7 @@ jobs:
 
             - name: Generate index.html in snapshot
               working-directory: .
-              run: sed 's#_PATH_#https://pyscript.net/releases/${{ github.ref_name }}/#' ./public/index.html > ./pyscript.core/dist/index.html
+              run: sed -e 's#_PATH_#https://pyscript.net/releases/${{ github.ref_name }}/#' -e 's#_VERSION_#${{ github.ref_name }}#'  -e 's#_DOC_VERSION_#${{ github.ref_name }}#' -e 's#_TAG_VERSION_#/tag/${{ github.ref_name }}#' ./public/index.html > ./core/dist/index.html
 
             - name: Generate release.tar from snapshot and put it in dist/
               working-directory: .

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -10,7 +10,7 @@ on:
 
 defaults:
     run:
-        working-directory: ./pyscript.core
+        working-directory: ./core
 
 jobs:
     publish-snapshot:
@@ -69,7 +69,7 @@ jobs:
 
             - name: Generate index.html in snapshot
               working-directory: .
-              run: sed 's#_PATH_#https://pyscript.net/snapshots/${{ inputs.snapshot_version }}/#' ./public/index.html > ./pyscript.core/dist/index.html
+              run: sed -e 's#_PATH_#https://pyscript.net/snapshots/${{ inputs.snapshot_version }}/#' -e 's#_VERSION_#${{ inputs.snapshot_version }}#'  -e 's#_DOC_VERSION_#${{ inputs.snapshot_version }}#' -e 's#_TAG_VERSION_#/tag/${{ inputs.snapshot_version }}#' ./public/index.html > ./core/dist/index.html
 
             - name: Copy to Snapshot
               run: >

diff --git a/.github/workflows/publish-unstable.yml b/.github/workflows/publish-unstable.yml
@@ -1,11 +1,11 @@
 name: "Publish Unstable"
 
 on:
-    push: # Only run on merges into main that modify files under pyscript.core/ and examples/
+    push: # Only run on merges into main that modify files under core/ and examples/
         branches:
             - main
         paths:
-            - pyscript.core/**
+            - core/**
             - examples/**
 
     workflow_dispatch:
@@ -18,7 +18,7 @@ jobs:
             contents: read
         defaults:
             run:
-                working-directory: ./pyscript.core
+                working-directory: ./core
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
 
             - name: Generate index.html in snapshot
               working-directory: .
-              run: sed 's#_PATH_#https://pyscript.net/unstable/#' ./public/index.html > ./pyscript.core/dist/index.html
+              run: sed -e 's#_PATH_#./#' -e 's#_VERSION_#latest#' -e 's#_DOC_VERSION_#latest#' -e 's#_TAG_VERSION_##' ./public/index.html > ./core/dist/index.html
 
             - name: Configure AWS credentials
               uses: aws-actions/configure-aws-credentials@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,14 +5,14 @@ on:
         branches:
             - main
         paths:
-            - pyscript.core/**
+            - core/**
             - .github/workflows/test.yml
 
     pull_request: # Only run on merges into main that modify certain files
         branches:
             - main
         paths:
-            - pyscript.core/**
+            - core/**
             - .github/workflows/test.yml
     workflow_dispatch:
 
@@ -75,6 +75,6 @@ jobs:
               with:
                   name: pyscript
                   path: |
-                      pyscript.core/dist/
+                      core/dist/
                   if-no-files-found: error
                   retention-days: 7
diff --git a/.gitignore b/.gitignore
@@ -142,11 +142,11 @@ coverage/
 test_results
 
 # @pyscript/core npm artifacts
-pyscript.core/test-results/*
-pyscript.core/core.*
-pyscript.core/dist
-pyscript.core/dist.zip
-pyscript.core/src/plugins.js
-pyscript.core/src/stdlib/pyscript.js
-pyscript.core/src/3rd-party/*
-!pyscript.core/src/3rd-party/READMEmd
+core/test-results/*
+core/core.*
+core/dist
+core/dist.zip
+core/src/plugins.js
+core/src/stdlib/pyscript.js
+core/src/3rd-party/*
+!core/src/3rd-party/READMEmd
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,14 +21,14 @@ repos:
           - id: check-yaml
           - id: detect-private-key
           - id: end-of-file-fixer
-            exclude: pyscript\.core/dist|\.min\.js$
+            exclude: core/dist|\.min\.js$
           - id: trailing-whitespace
 
     - repo: https://github.com/psf/black
       rev: 24.8.0
       hooks:
           - id: black
-            exclude: pyscript\.core/src/stdlib/pyscript/__init__\.py
+            exclude: core/src/stdlib/pyscript/__init__\.py
 
     - repo: https://github.com/codespell-project/codespell
       rev: v2.3.0
@@ -42,7 +42,7 @@ repos:
       rev: "v3.0.0-alpha.6"
       hooks:
           - id: prettier
-            exclude: pyscript\.core/test|pyscript\.core/dist|pyscript\.core/types|pyscript.core/src/stdlib/pyscript.js|pyscript\.sw/|pyscript.core/src/3rd-party
+            exclude: core/test|core/dist|core/types|core/src/stdlib/pyscript.js|pyscript\.sw/|core/src/3rd-party
             args: [--tab-width, "4"]
 
     - repo: https://github.com/pycqa/isort

diff --git a/.prettierignore b/.prettierignore
@@ -1,5 +1,3 @@
 ISSUE_TEMPLATE
 *.min.*
 package-lock.json
-docs
-examples/panel.html
diff --git a/.readthedocs.yml b/.readthedocs.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ check-python:
 
 # Check the environment, install the dependencies.
 setup: check-node check-npm check-python
-	cd pyscript.core && npm install && cd ..
+	cd core && npm install && cd ..
 ifeq ($(VIRTUAL_ENV),)
 	echo "\n\n\033[0;31mCannot install Python dependencies. Your virtualenv is not activated.\033[0m"
 	false
@@ -55,15 +55,15 @@ clean:
 
 # Build PyScript.
 build:
-	cd pyscript.core && npx playwright install chromium && npm run build
+	cd core && npx playwright install chromium && npm run build
 
 # Run the precommit checks (run eslint).
 precommit-check:
 	pre-commit run --all-files
 
 # Run all automated tests in playwright.
 test:
-	cd pyscript.core && npm run test:integration
+	cd core && npm run test:integration
 
 # Format the code.
 fmt: fmt-py

diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md
diff --git a/pyscript.core/README.md → core/README.md b/pyscript.core/README.md → core/README.md
@@ -4,11 +4,11 @@ We have moved and renamed previous _core_ module as [polyscript](https://github.
 
 ## Documentation
 
-Please read [core documentation](./docs/README.md) to know more about this project.
+Please read [core documentation](https://docs.pyscript.net/) to know more about this project.
 
 ## Development
 
-Clone this repository then run `npm install` within its folder.
+Clone this repository then run `npm install` within this folder.
 
 Use `npm run build` to create all artifacts and _dist_ files.
 
@@ -35,9 +35,19 @@ Before running the tests, we need to create a tests environment first. To do so
 make setup
 ```
 
-This will create a tests environment [in the root of the project, named `./env`]and install all the dependencies needed to run the tests.
+This will create a tests environment [in the root of the project, named `./env`] and install all the dependencies needed to run the tests.
 
-After the command has completed and the tests environment has been created, you can run the **automated tests** with
+A lot of problems related to `make setup` are related to node and npm being outdated. Once npm and node are updated, `make setup` should work. You can follow the steps on the [npm documentation](https://docs.npmjs.com/try-the-latest-stable-version-of-npm) to update npm (the update command for Linux should work for Mac as well). Once npm has been updated you can continue to the instructions to update node below.
+
+To update Node run the following commands in order (most likely you'll be prompted for your user password, this is normal):
+
+```
+sudo npm cache clean -f
+sudo npm install -g n
+sudo n stable
+```
+
+After the `make setup` command has completed, you can run the **automated tests** with
 the following command:
 
 ```

diff --git a/pyscript.core/dev.cjs → core/dev.cjs b/pyscript.core/dev.cjs → core/dev.cjs
diff --git a/pyscript.core/eslint.config.mjs → core/eslint.config.mjs b/pyscript.core/eslint.config.mjs → core/eslint.config.mjs
diff --git a/pyscript.core/index.js → core/index.js b/pyscript.core/index.js → core/index.js
diff --git a/pyscript.core/jsdelivr.js → core/jsdelivr.js b/pyscript.core/jsdelivr.js → core/jsdelivr.js
diff --git a/pyscript.core/package-lock.json → core/package-lock.json b/pyscript.core/package-lock.json → core/package-lock.json
diff --git a/pyscript.core/package.json → core/package.json b/pyscript.core/package.json → core/package.json
@@ -8,6 +8,9 @@
     "jsdelivr": "./jsdelivr.js",
     "browser": "./index.js",
     "main": "./index.js",
+    "engines": {
+        "node": ">=20"
+    },
     "files": [
         "./dist/",
         "./src/",

diff --git a/pyscript.core/rollup/3rd-party.cjs → core/rollup/3rd-party.cjs b/pyscript.core/rollup/3rd-party.cjs → core/rollup/3rd-party.cjs
diff --git a/pyscript.core/rollup/build_test_index.cjs → core/rollup/build_test_index.cjs b/pyscript.core/rollup/build_test_index.cjs → core/rollup/build_test_index.cjs
diff --git a/pyscript.core/rollup/core.config.js → core/rollup/core.config.js b/pyscript.core/rollup/core.config.js → core/rollup/core.config.js
diff --git a/pyscript.core/rollup/flatted.cjs → core/rollup/flatted.cjs b/pyscript.core/rollup/flatted.cjs → core/rollup/flatted.cjs
diff --git a/pyscript.core/rollup/plugins.cjs → core/rollup/plugins.cjs b/pyscript.core/rollup/plugins.cjs → core/rollup/plugins.cjs
diff --git a/pyscript.core/rollup/stdlib.cjs → core/rollup/stdlib.cjs b/pyscript.core/rollup/stdlib.cjs → core/rollup/stdlib.cjs
diff --git a/pyscript.core/src/3rd-party/README.md → core/src/3rd-party/README.md b/pyscript.core/src/3rd-party/README.md → core/src/3rd-party/README.md
diff --git a/...ript.core/types/3rd-party/codemirror.d.ts → core/src/3rd-party/codemirror.js b/...ript.core/types/3rd-party/codemirror.d.ts → core/src/3rd-party/codemirror.js
diff --git a/.../types/3rd-party/codemirror_commands.d.ts → core/src/3rd-party/codemirror_commands.js b/.../types/3rd-party/codemirror_commands.d.ts → core/src/3rd-party/codemirror_commands.js
diff --git a/...pes/3rd-party/codemirror_lang-python.d.ts → core/src/3rd-party/codemirror_lang-python.js b/...pes/3rd-party/codemirror_lang-python.d.ts → core/src/3rd-party/codemirror_lang-python.js
diff --git a/.../types/3rd-party/codemirror_language.d.ts → core/src/3rd-party/codemirror_language.js b/.../types/3rd-party/codemirror_language.d.ts → core/src/3rd-party/codemirror_language.js
diff --git a/...ore/types/3rd-party/codemirror_state.d.ts → core/src/3rd-party/codemirror_state.js b/...ore/types/3rd-party/codemirror_state.d.ts → core/src/3rd-party/codemirror_state.js
diff --git a/...core/types/3rd-party/codemirror_view.d.ts → core/src/3rd-party/codemirror_view.js b/...core/types/3rd-party/codemirror_view.d.ts → core/src/3rd-party/codemirror_view.js
diff --git a/core/src/3rd-party/toml.js b/core/src/3rd-party/toml.js