Skip to content

Commit 453df6b

Browse files
sra405create-issue-branch[bot]loiswells97
authored
Pyodide Migration Feature Branch (#1027)
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>
1 parent 6621c9a commit 453df6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4844
-5463
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ REACT_APP_PLAUSIBLE_DATA_DOMAIN=''
66
REACT_APP_PLAUSIBLE_SOURCE=''
77
REACT_APP_SENTRY_DSN=''
88
REACT_APP_SENTRY_ENV='local'
9-
PUBLIC_URL='http://localhost:3010'
9+
PUBLIC_URL='http://localhost:3011'
1010
ASSETS_URL='http://localhost:3010'

.env.webcomponent.example

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
REACT_APP_AUTHENTICATION_URL='http://localhost:9001'
22
REACT_APP_SENTRY_DSN=''
33
REACT_APP_SENTRY_ENV='local'
4-
# NB This is the URL of react-ui, rather than the web component
5-
PUBLIC_URL=http://localhost:3012
4+
PUBLIC_URL=http://localhost:3011
65
REACT_APP_IDENTITY_URL='http://localhost:3011'
76
REACT_APP_API_ENDPOINT='http://localhost:3009'
87
ASSETS_URL='http://localhost:3011'

.github/workflows/ci-cd.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,13 @@ jobs:
9292
with:
9393
install: false
9494
start: |
95-
yarn start
9695
yarn start:wc
97-
wait-on: "http://localhost:3010, http://localhost:3011"
96+
wait-on: "http://localhost:3011"
9897
quiet: true
9998
env:
10099
REACT_APP_API_ENDPOINT: "https://test-editor-api.raspberrypi.org"
101-
PUBLIC_URL: "http://localhost:3010"
102-
ASSETS_URL: "http://localhost:3010"
100+
PUBLIC_URL: "http://localhost:3011"
101+
ASSETS_URL: "http://localhost:3011"
103102
REACT_APP_PLAUSIBLE_SOURCE: ""
104103

105104
- name: Archive cypress artifacts

.github/workflows/deploy.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
type: string
1313
base_url:
1414
required: false
15-
default: "https://staging-editor.raspberrypi.org"
15+
default: "https://staging-editor-static.raspberrypi.org"
1616
type: string
1717
assets_url:
1818
required: false
@@ -44,7 +44,7 @@ on:
4444
type: string
4545
react_app_plausible_data_domain:
4646
required: false
47-
default: "staging-editor.raspberrypi.org"
47+
default: "staging-editor-static.raspberrypi.org"
4848
type: string
4949
react_app_plausible_source:
5050
required: false
@@ -123,11 +123,9 @@ jobs:
123123
env:
124124
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
125125

126-
- name: Build site and WC bundle
126+
- name: Build WC bundle
127127
run: |
128-
if [[ "${{ inputs.environment }}" == "production" ]]; then
129-
yarn build
130-
else
128+
if [[ "${{ inputs.environment }}" != "production" ]]; then
131129
yarn build:dev
132130
fi
133131
yarn build:wc

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "chrome",
66
"request": "launch",
77
"name": "Launch Chrome against localhost",
8-
"url": "http://localhost:3010",
8+
"url": "http://localhost:3011",
99
"webRoot": "${workspaceFolder}"
1010
}
1111
]

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## Unreleased
88

9+
### Added
10+
11+
- PyodideWorker setup for the editor (#1104)
12+
- Enabling `pyodide` support in the web component (#1090)
13+
- `Pyodide` `matplotlib` support (#1087)
14+
- Tests for running simple programs in `pyodide` and `skulpt` (#1100)
15+
- Fall back to `skulpt` if the host is not `crossOriginIsolated` (#1107)
16+
17+
### Changed
18+
19+
- Upgrade to `webpack 5` (#1096)
20+
- Bump `pyodide` to `v0.26.2` (#1098)
21+
22+
### Fixed
23+
24+
- Dynamic runner switching with more than one `python` file (#1097)
25+
- Pyodide running the correct file (`main.py`) when there are multiple `python` files (#1097)
26+
927
## [0.27.1] - 2024-10-01
1028

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

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

114133
### Fixed
115134

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

128148
## [0.23.0] - 2024-05-09
129149

0 commit comments

Comments
 (0)