Skip to content

Commit

Permalink
Pyodide Migration Feature Branch (#1027)
Browse files Browse the repository at this point in the history
Feature branch for the dynamic switching of skulpt/pyodide environments

---------

Co-authored-by: create-issue-branch[bot] <53036503+create-issue-branch[bot]@users.noreply.github.com>
Co-authored-by: Lois Wells <lois.wells@raspberrypi.org>
Co-authored-by: Lois Wells <88904316+loiswells97@users.noreply.github.com>
  • Loading branch information
4 people authored Oct 17, 2024
1 parent 6621c9a commit 453df6b
Show file tree
Hide file tree
Showing 49 changed files with 4,844 additions and 5,463 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ REACT_APP_PLAUSIBLE_DATA_DOMAIN=''
REACT_APP_PLAUSIBLE_SOURCE=''
REACT_APP_SENTRY_DSN=''
REACT_APP_SENTRY_ENV='local'
PUBLIC_URL='http://localhost:3010'
PUBLIC_URL='http://localhost:3011'
ASSETS_URL='http://localhost:3010'
3 changes: 1 addition & 2 deletions .env.webcomponent.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
REACT_APP_AUTHENTICATION_URL='http://localhost:9001'
REACT_APP_SENTRY_DSN=''
REACT_APP_SENTRY_ENV='local'
# NB This is the URL of react-ui, rather than the web component
PUBLIC_URL=http://localhost:3012
PUBLIC_URL=http://localhost:3011
REACT_APP_IDENTITY_URL='http://localhost:3011'
REACT_APP_API_ENDPOINT='http://localhost:3009'
ASSETS_URL='http://localhost:3011'
7 changes: 3 additions & 4 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,13 @@ jobs:
with:
install: false
start: |
yarn start
yarn start:wc
wait-on: "http://localhost:3010, http://localhost:3011"
wait-on: "http://localhost:3011"
quiet: true
env:
REACT_APP_API_ENDPOINT: "https://test-editor-api.raspberrypi.org"
PUBLIC_URL: "http://localhost:3010"
ASSETS_URL: "http://localhost:3010"
PUBLIC_URL: "http://localhost:3011"
ASSETS_URL: "http://localhost:3011"
REACT_APP_PLAUSIBLE_SOURCE: ""

- name: Archive cypress artifacts
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
type: string
base_url:
required: false
default: "https://staging-editor.raspberrypi.org"
default: "https://staging-editor-static.raspberrypi.org"
type: string
assets_url:
required: false
Expand Down Expand Up @@ -44,7 +44,7 @@ on:
type: string
react_app_plausible_data_domain:
required: false
default: "staging-editor.raspberrypi.org"
default: "staging-editor-static.raspberrypi.org"
type: string
react_app_plausible_source:
required: false
Expand Down Expand Up @@ -123,11 +123,9 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Build site and WC bundle
- name: Build WC bundle
run: |
if [[ "${{ inputs.environment }}" == "production" ]]; then
yarn build
else
if [[ "${{ inputs.environment }}" != "production" ]]; then
yarn build:dev
fi
yarn build:wc
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3010",
"url": "http://localhost:3011",
"webRoot": "${workspaceFolder}"
}
]
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

### Added

- PyodideWorker setup for the editor (#1104)
- Enabling `pyodide` support in the web component (#1090)
- `Pyodide` `matplotlib` support (#1087)
- Tests for running simple programs in `pyodide` and `skulpt` (#1100)
- Fall back to `skulpt` if the host is not `crossOriginIsolated` (#1107)

### Changed

- Upgrade to `webpack 5` (#1096)
- Bump `pyodide` to `v0.26.2` (#1098)

### Fixed

- Dynamic runner switching with more than one `python` file (#1097)
- Pyodide running the correct file (`main.py`) when there are multiple `python` files (#1097)

## [0.27.1] - 2024-10-01

### Fixed
Expand Down Expand Up @@ -110,6 +128,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Changed

- Remove unused `/embedded/projects/:identifier` route (#1013)
- Runner defaults to `pyodide` (#937)

### Fixed

Expand All @@ -124,6 +143,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix initial value of `user` in `WebComponentLoader` (#1021)
- Make `authKey` in e2e web component spec more realistic (#1022)
- Remove unused `ComponentStore` (#1023)
- Dynamic switching between `pyodide` and `skulpt` based on user imports (#937)

## [0.23.0] - 2024-05-09

Expand Down
Loading

0 comments on commit 453df6b

Please sign in to comment.