Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
"dbaeumer.vscode-eslint",
"kumar-harsh.graphql-for-vscode",
"hashicorp.terraform",
"ivangabriele.vscode-heroku",
"pkosta2005.heroku-command",
"yzhang.markdown-all-in-one",
"mikestead.dotenv",
"ms-vscode.remote-repositories",
Expand Down
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ REACT_APP_SENTRY_ENV='local'
PUBLIC_URL='http://localhost:3011'
ASSETS_URL='http://localhost:3011'
HTML_RENDERER_URL='http://localhost:3011'
REACT_APP_SCRATCH_FRAME_URL='http://localhost:3014'
REACT_APP_GOOGLE_TAG_MANAGER_ID=''
REACT_APP_API_ENDPOINT='http://localhost:3009'
REACT_APP_ALLOWED_IFRAME_ORIGINS='http://localhost:3011,http://localhost:3012,http://classroom.localhost:3013'


8 changes: 8 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@
"cy": "readonly",
"Cypress": "readonly"
}
},
{
"files": ["apps/scratch-frame/**/*.test.js", "apps/scratch-frame/**/*.test.jsx"],
"globals": {
"vi": "readonly",
"test": "readonly",
"describe": "readonly"
}
}
]
}
9 changes: 7 additions & 2 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,13 @@ jobs:
env:
JEST_JUNIT_OUTPUT_DIR: ./coverage/
REACT_APP_API_ENDPOINT: http://localhost:3009
REACT_APP_SCRATCH_FRAME_URL: "http://scratch-frame.example.com"
- name: Record coverage
run: ./.github/workflows/record_coverage
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Run Scratch Frame tests
run: yarn run test:scratch-frame

test-cypress:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -111,8 +114,8 @@ jobs:
with:
install: false
start: |
yarn start
wait-on: "http://localhost:3011"
yarn start:all
Comment thread
zetter-rpf marked this conversation as resolved.
wait-on: "http://localhost:3011, http://localhost:3014/scratch.html"
quiet: true
config-file: cypress.config.mjs
browser: chrome
Expand All @@ -121,6 +124,8 @@ jobs:
PUBLIC_URL: "http://localhost:3011"
ASSETS_URL: "http://localhost:3011"
REACT_APP_ALLOWED_IFRAME_ORIGINS: "http://localhost:3011"
CSP_API_MULTIPLE_ORIGINS: "http://localhost:3011,http://localhost:3009"
REACT_APP_SCRATCH_FRAME_URL: "http://localhost:3014"

- name: Archive cypress artifacts
uses: actions/upload-artifact@v4.6.0
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,11 @@ jobs:
run: yarn install --immutable

- name: Build WC and HTML renderer bundles
run: yarn build
run: yarn build:all
env:
PUBLIC_URL: ${{ needs.setup-environment.outputs.public_url }}
ASSETS_URL: ${{ needs.setup-environment.outputs.assets_url }}
REACT_APP_SCRATCH_FRAME_URL: ${{ needs.setup-environment.outputs.assets_url }}
HTML_RENDERER_URL: ${{ needs.setup-environment.outputs.html_renderer_url }}
REACT_APP_API_ENDPOINT: ${{ inputs.react_app_api_endpoint }}
REACT_APP_AUTHENTICATION_CLIENT_ID: ${{ inputs.react_app_authentication_client_id }}
Expand Down
5 changes: 5 additions & 0 deletions COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ License: Apache-2.0
See the License for the specific language governing permissions and
limitations under the License.


Files: apps/scratch-frame
Copyright: 2025 Raspberry Pi Foundation <web@raspberrypi.org>
License: AGPL-3.0

Files: public/p5-shim.js, public/py5-shim.js
Copyright: 2021 Nick McIntyre <https://github.com/mcintyrelabs/skulpt>
License: MIT
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ RUN corepack enable
RUN chsh -s $(which zsh) ${USER}

EXPOSE 3011
EXPOSE 3014

CMD ["yarn", "start"]
CMD ["yarn", "start:all"]
5 changes: 4 additions & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
This licence applies to files in this project unless otherwise specified.
See COPYRIGHT file for more.


Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -187,7 +190,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2021-2026 Raspberry Pi Foundation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
16 changes: 0 additions & 16 deletions app.json

This file was deleted.

Loading
Loading