Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Website Updates #7

Merged
merged 14 commits into from
Dec 12, 2024
Merged

Website Updates #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
474a1e3
Run PreFigure in a web worker
siefkenj Dec 12, 2024
3e46365
Add build and deploy script
siefkenj Dec 12, 2024
35b6871
Update CI
siefkenj Dec 12, 2024
64ec6d9
Fix CI
siefkenj Dec 12, 2024
906547e
CI update
siefkenj Dec 12, 2024
a6632b9
CI
siefkenj Dec 12, 2024
a1387cf
CI
siefkenj Dec 12, 2024
e422279
CI
siefkenj Dec 12, 2024
085a9bd
Website (#1)
siefkenj Dec 12, 2024
922a615
CI
siefkenj Dec 12, 2024
d24e29d
Merge remote-tracking branch 'origin/main' into website
siefkenj Dec 12, 2024
eb6413e
Website (#2)
siefkenj Dec 12, 2024
016e0df
CI
siefkenj Dec 12, 2024
6ec1b36
Merge remote-tracking branch 'origin/main' into website
siefkenj Dec 12, 2024
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
82 changes: 82 additions & 0 deletions .github/workflows/build-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Build and deploy to github pages

on:
push:
branches: ["main"]
pull_request:
branches: ["*"]

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

jobs:
build:
name: Build and Test
runs-on: ubuntu-latest
env:
CI: false

strategy:
matrix:
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
cache-dependency-path: ./website/package-lock.json

- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: "3.12"

- name: Install poetry
run: python -m pip install poetry

- name: Build .whl file
run: |
python -m poetry install --all-extras
python -m poetry build

- name: Build website
run: |
cd website/
npm ci
cd ./packages/playground
npm run build

- name: Prepare for Github Pages
run: |
mkdir -p ./website_dist
cp -r ./website/packages/playground/dist/* ./website_dist
echo "These are the files that will be packaged"
ls ./website_dist

- name: Package website deployment
uses: actions/upload-pages-artifact@v3
id: website_dist
with:
path: ./website_dist

deploy:
if: ${{ github.event_name == 'push' }}
environment:
name: github-pages
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: website_dist
uses: actions/deploy-pages@v4
6 changes: 6 additions & 0 deletions website/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion website/packages/playground/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
<script type="module" src="./src/main.tsx"></script>
</body>
</html>
1 change: 1 addition & 0 deletions website/packages/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@types/file-saver": "^2.0.7",
"bootstrap": "^5.3.3",
"codemirror": "^6.0.1",
"comlink": "^4.4.2",
"easy-peasy": "^6.0.5",
"file-saver": "^2.0.5",
"pyodide": "^0.26.4",
Expand Down
236 changes: 0 additions & 236 deletions website/packages/playground/src/state/compiler.ts
View file
Open in desktop

This file was deleted.

22 changes: 19 additions & 3 deletions website/packages/playground/src/state/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
import { action, Action, Thunk, thunk } from "easy-peasy";
import { PreFigureCompiler } from "./compiler";
import { PreFigureCompiler } from "../worker/compiler";
import * as Comlink from "comlink";
import Worker from "../worker?worker";
import type { api } from "../worker";

const compiler = new PreFigureCompiler();
// Make a local version of the compiler
let compiler = new PreFigureCompiler();
(window as any).comp = compiler;

const worker = Comlink.wrap<typeof api>(new Worker());
console.log(worker, Worker);
//// Create a worker-based instance of the compiler
(window as any).compWorker = worker.compiler;
// The types seem to be wrong. We are not awaiting a promise here. Instead we have a proxy object
// directly exposed to the main thread.
compiler = worker.compiler as any as Awaited<typeof worker.compiler>;

export interface PlaygroundModel {
source: string;
compiledSource: string;
Expand Down Expand Up @@ -56,8 +68,12 @@ export const playgroundModel: PlaygroundModel = {
loadPyodide: thunk(async (actions) => {
actions.setStatus("loadingPyodide");
// Initialize Pyodide
const indexURL = new URL(
"./assets/pyodide",
window.location.href,
).toString();
await compiler.init({
indexURL: "./assets/pyodide",
indexURL,
});
// Import `prefig` once so that it is cached
await compiler.pyodide?.runPythonAsync("import prefig");
Expand Down
Loading
Loading