Merge branch 'main' of https://github.com/HeyPuter/browser.js into chrome-theme-test

Author: velzie

.github/workflows/main.yml

@@ -2,11 +2,7 @@ name: CI
 
 on:
   push:
-    paths-ignore: &ci_ignore_paths
-      - ".github/workflows/**"
-      - "assets/**"
-      - "scripts/**"
-      # Editor configs
+    paths-ignore: &ci_ignore_paths # Editor configs
       - ".zed/**"
       - ".vscode/**"
       # Docs
@@ -83,9 +79,9 @@ jobs:
         id: rewriter-cache
         with:
           path: |
-            packages/scramjet/rewriter/wasm/out
-            packages/scramjet/dist/scramjet.wasm.wasm
-          key: rewriter-release-${{ hashFiles('packages/scramjet/rewriter/**/Cargo.toml', 'packages/scramjet/rewriter/**/*.rs', 'packages/scramjet/rewriter/**/src/**/*.toml', 'packages/scramjet/rewriter/**/src/**/*.json', 'packages/scramjet/rewriter/**/src/**/*.md', 'packages/scramjet/rewriter/**/*.sh') }}
+            packages/scramjet/packages/core/rewriter/wasm/out
+            packages/scramjet/packages/core/dist/scramjet.wasm.wasm
+          key: rewriter-release-${{ hashFiles('packages/scramjet/packages/core/rewriter/**/Cargo.toml', 'packages/scramjet/packages/core/rewriter/**/*.rs', 'packages/scramjet/packages/core/rewriter/**/src/**/*.toml', 'packages/scramjet/packages/core/rewriter/**/src/**/*.json', 'packages/scramjet/packages/core/rewriter/**/src/**/*.md', 'packages/scramjet/packages/core/rewriter/**/*.sh') }}
           restore-keys: |
             rewriter-release-
 
@@ -100,7 +96,7 @@ jobs:
         if: steps.rewriter-cache.outputs.cache-hit != 'true'
         uses: jetli/[email protected]
         with:
-          version: "0.2.100"
+          version: "0.2.105"
 
       - name: Setup Binaryen
         if: steps.rewriter-cache.outputs.cache-hit != 'true'
@@ -112,25 +108,27 @@ jobs:
         if: steps.rewriter-cache.outputs.cache-hit != 'true'
         run: "cargo install --git https://github.com/r58playz/wasm-snip"
 
+      - name: Build Scramjet (failing)
+        run: pnpm build
+        continue-on-error: true
+        working-directory: packages/scramjet/packages/core
+
       - name: Pack Scramjet
-        run: |
-          cd packages/scramjet
-          pnpm pack
+        run: pnpm pack
+        working-directory: packages/scramjet/packages/core
 
       - name: Upload Artifact (pnpm pack)
         uses: actions/upload-artifact@v4
         with:
           name: packaged-scramjet
-          path: packages/scramjet/mercuryworkshop-scramjet-*.tgz
+          path: packages/scramjet/packages/core/mercuryworkshop-scramjet-*.tgz
 
       - name: Upload Artifact (dist)
         uses: actions/upload-artifact@v4
         with:
           name: scramjet
           path: |
-            packages/scramjet/dist/*.js
-            packages/scramjet/dist/*.js.map
-            packages/scramjet/dist/*.wasm
+            packages/scramjet/packages/core/dist/*
   frontend:
     name: Build Frontend
     runs-on: ubuntu-latest
@@ -158,12 +156,10 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: scramjet
-          path: packages/scramjet/dist
+          path: packages/scramjet/packages/core/dist
 
       - name: Build Dreamland
-        run: |
-          cd external/dreamlandjs
-          pnpm build
+        run: pnpm build:dreamland
 
       # - name: Get Chii submodule commit hash
       #   id: chii-hash
@@ -196,7 +192,7 @@ jobs:
 
       - name: Build Frontend
         run: |
-          pnpm build
+          SKIP_CORE=1 pnpm build
           VITE_ISOLATION_ORIGIN="https://puter.zone" pnpm build:chrome
   tests:
     name: Run Scramjet Tests
@@ -226,7 +222,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: scramjet
-          path: dist
+          path: packages/scramjet/packages/core/dist
 
       - name: Cache Playwright browsers
         id: pw-browsers-cache
@@ -240,9 +236,11 @@ jobs:
       - name: Install Playwright Chromium
         if: steps.pw-browsers-cache.outputs.cache-hit != 'true'
         run: npx playwright install --with-deps chromium
+        working-directory: packages/scramjet/packages/core
 
       - name: Run Playwright tests
         run: pnpm test:integration
+        working-directory: packages/scramjet/packages/core
 
   rewritertests:
     name: "Run Rewriter Tests"
@@ -260,9 +258,9 @@ jobs:
         id: rewriter-cache
         with:
           path: |
-            rewriter/wasm/out
-            dist/scramjet.wasm.wasm
-          key: rewriter-release-${{ hashFiles('rewriter/**/Cargo.toml', 'rewriter/**/src/**/*.rs', 'rewriter/**/src/**/*.toml', 'rewriter/**/src/**/*.json', 'rewriter/**/src/**/*.md', 'rewriter/**/*.sh') }}
+            packages/scramjet/packages/core/rewriter/wasm/out
+            packages/scramjet/packages/core/dist/scramjet.wasm.wasm
+          key: rewriter-release-${{ hashFiles('packages/scramjet/packages/core/rewriter/**/Cargo.toml', 'packages/scramjet/packages/core/rewriter/**/*.rs', 'packages/scramjet/packages/core/rewriter/**/src/**/*.toml', 'packages/scramjet/packages/core/rewriter/**/src/**/*.json', 'packages/scramjet/packages/core/rewriter/**/src/**/*.md', 'packages/scramjet/packages/core/rewriter/**/*.sh') }}
           restore-keys: |
             rewriter-release-
 
@@ -273,4 +271,5 @@ jobs:
           cache-all-crates: true
 
       - name: Run Tests
-        run: cd rewriter/native && cargo test
+        run: cargo test
+        working-directory: packages/scramjet/packages/core/rewriter/native

CONTRIBUTING.md

@@ -1,51 +1,17 @@
 # Development Setup
 
-Node.js 22+ and depot_tools are required for development
+Node.js 22+ and PNPM required for development
 
 ```bash
-update_depot_tools
-ensure_bootstrap
-git clone https://github.com/HeyPuter/browser.js --recursive
-cd browser.js
+git submodule update --init
 pnpm i
-rustup update
-rustup install nightly
-rustup default nightly
-cargo install --git https://github.com/r58playz/wasm-snip
-cargo install wasm-bindgen-cli --version 0.2.100
-pnpm rewriter:build
-pnpm build
-cd dreamlandjs
-pnpm build
-cd ..
-cd chii
-pnpm init:front_end
-pnpm build
-cd ..
-cd playwright
-npm i
-npm run build
-cd web_builder
-npx rollup -c
-cd ../..
-cd chobitsu
-pnpm build
-cd ..
-cd page_inject
-npx rollup -c
-cd ..
-cd frontend
-pnpm vite build
+pnpm build:dreamland
+pnpm build (x2)
+pnpm dev
 ```
 
 # Incremental Build
 
 ```bash
-(cd playwright && npm run watch) &
-(cd playwright/web_builder && npx rollup -cw) &
-(pnpm dev) &
-(cd dreamlandjs && pnpm watch) &
-(cd chobitsu && pnpm webpack --watch --mode=development) &
-(cd page_inject && npx rollup -cw) &
-(cd frontend && pnpm dev) &
+pnpm dev
 ```