Skip to content
Merged
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
20 changes: 8 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,34 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 24
cache: pnpm
cache: yarn

# `comline-simulator` is a git dependency that compiles to WASM in its
# `prepare` (Rust → wasm-bindgen). The runner has cargo; this caches the
# one-time `wasm-bindgen-cli` build across runs.
# `prepack` (Rust → wasm-bindgen). The runner has cargo + wasm-opt; this
# caches the one-time `wasm-bindgen-cli` build across runs.
- name: Cache cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/bin
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-${{ hashFiles('pnpm-lock.yaml') }}
key: ${{ runner.os }}-cargo-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.os }}-cargo-

- name: Install dependencies
run: pnpm install --frozen-lockfile
env:
COMLINE_SIMULATOR_SCRIPT: '0' # the tutorial only needs the lean sim
run: yarn install

- name: build
env:
BASE_PATH: '/${{ github.event.repository.name }}'
run: |
pnpm run build
run: yarn build

- name: Upload Artifacts
uses: actions/upload-pages-artifact@v3
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ node_modules
vite.config.js.timestamp-*
vite.config.ts.timestamp-*

# Yarn Berry — keep the pinned release, drop the rest
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
.pnp.*


# JetBrains IDEA settings
.idea/
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

1,000 changes: 1,000 additions & 0 deletions .yarn/releases/yarn-4.18.0.cjs

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
yarnPath: .yarn/releases/yarn-4.18.0.cjs
nodeLinker: node-modules

# `comline-simulator` is the sim engine — a git dep that builds itself to WASM
# in its `prepack`/`prepare`. Yarn 4 gates git deps and disables scripts by
# default; both are needed. The build is not byte-reproducible (wasm-opt runs
# only where installed) so let Yarn refresh the tarball checksum.
approvedGitRepositories:
- "https://github.com/ComlineProject/simulator.git"
enableScripts: true
checksumBehavior: update
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"test": "npm run test:integration && npm run test:unit",
"test": "yarn test:integration && yarn test:unit",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "prettier --check . && eslint .",
Expand Down Expand Up @@ -36,13 +36,12 @@
"type": "module",
"dependencies": {
"@sveltejs/adapter-static": "^3.0.10",
"comline-simulator": "github:ComlineProject/simulator#6e197b18e61ead0fbcb36321ab21c5ad2093123d"
"comline-simulator": "git+https://github.com/ComlineProject/simulator.git#eff27ce9b077ec411c299743b328a24089387215"
},
"pnpm": {
"overrides": {
"cookie": "^0.7.2",
"flatted": "^3.4.2",
"yaml": "^2.8.1"
}
}
"resolutions": {
"cookie": "^0.7.2",
"flatted": "^3.4.2",
"yaml": "^2.8.1"
},
"packageManager": "yarn@4.18.0"
}
Loading