Merge branch 'main' into activation

Author: r58Playz

.envrc

@@ -1,11 +1,15 @@
-name: Build anura
+name: CI
 
-on: [push]
+on: [push, pull_request, workflow_dispatch]
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 
 jobs:
     build:
+        name: Build Anura
         runs-on: ubuntu-latest
-
         steps:
             - uses: actions/checkout@v4
             - name: Use Node.js
@@ -17,9 +21,66 @@ jobs:
             - run: git submodule update --init
             - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
             - run: source "$HOME/.cargo/env" && make static
-            - run: zip -r anura.zip static/
-            - uses: actions/upload-artifact@v4
+
+            - name: Upload Anura Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Anura static build
+                  path: static/*
+                  retention-days: 90
+
+    upload:
+        name: Upload release
+        runs-on: ubuntu-latest
+        needs: build
+        permissions: write-all
+        if: github.ref == 'refs/heads/main'
+
+        steps:
+            - name: Delete old release and tag
+              uses: dev-drprasad/[email protected]
+              with:
+                  delete_release: true
+                  tag_name: latest
+                  github_token: ${{ github.token }}
+
+            - name: Get artifacts
+              uses: actions/download-artifact@v4
               with:
                   name: Anura static build
-                  path: anura.zip
-                  retention-days: 2
+                  path: ./static
+
+            - name: Zip anura Release
+              run: cd static && zip -r ../anura.zip . && cd ..
+
+            - name: Release to GitHub
+              uses: ncipollo/release-action@v1
+              with:
+                  name: Continuous Build
+                  tag: latest
+                  commit: main
+                  body: "${{ github.event.head_commit.url }} ${{ github.event.head_commit.message }}"
+                  artifacts: "anura.zip"
+                  prerelease: true
+
+    pages:
+        name: Upload to Github Pages
+        runs-on: ubuntu-latest
+        needs: build
+        permissions: write-all
+        if: github.ref == 'refs/heads/main'
+        steps:
+            - name: Get artifacts
+              uses: actions/download-artifact@v4
+              with:
+                  name: Anura static build
+                  path: ./static
+
+            - name: upload pages artifact
+              uses: actions/upload-pages-artifact@v3
+              with:
+                  path: "./static"
+
+            - name: deploy to github
+              id: deployment
+              uses: actions/deploy-pages@v4

.eslintignore

@@ -27,9 +27,10 @@ server/passkey
 package-lock.json
 .direnv
 result
+anuraos-types/
 public/config.json
 static/
-x86_image_wizard/alpine/anurad.c
+x86_image_wizard/alpine/anura-run
 x86_image_wizard/alpine/xfrog.sh
 x86_image_wizard/alpine/xsetrandr.sh
 x86_image_wizard/alpine/anuramouse

.eslintrc.js

@@ -0,0 +1,11 @@
+/**
+ * @type {import("prettier").Config}
+ */
+const config = {
+    tabWidth: 4,
+    trailingComma: "all",
+    semi: true,
+    singleQuote: false,
+};
+
+export default config;

.github/workflows/build.yaml

@@ -5,7 +5,10 @@ RUST_FILES=$(shell find v86/src/rust/ -name '*.rs') \
 	   v86/src/rust/gen/jit.rs v86/src/rust/gen/jit0f.rs \
 	   v86/src/rust/gen/analyzer.rs v86/src/rust/gen/analyzer0f.rs
 
-all: submodules build/bootstrap v86dirty v86 build/libs/nfsadapter/nfsadapter.js build/libs/mime/mime.iife.js build/libs/filer/filer.min.js build/libs/comlink/comlink.min.mjs build/libs/workbox/version build/libs/fflate/browser.js bundle public/config.json build/cache-load.json apps/libfileview.lib/icons build/bin/chimerix.ajs build/libs/libcurl/version build/libs/bare-mux/bare.cjs build/uv/uv.bundle.js build/libs/idb-keyval/idb-keyval.js build/assets/matter.css build/libs/dreamland/all.js
+all: submodules build/bootstrap \
+		v86 build/libs/filer/filer.min.js build/libs/mime/mime.iife.js build/libs/nfsadapter/nfsadapter.js build/libs/comlink/comlink.min.mjs build/libs/workbox/version build/libs/idb-keyval/idb-keyval.js \
+		bundle public/config.json build/cache-load.json build/libs/fflate/browser.js apps/libfileview.lib/icons \
+		build/bin/chimerix.ajs build/libs/libcurl/version build/libs/bare-mux/bare.cjs build/uv/uv.bundle.js build/assets/matter.css build/libs/dreamland/all.js \
 
 full: all rootfs-alpine
 
@@ -147,9 +150,6 @@ build/lib/v86.wasm: $(RUST_FILES) v86/build/softfloat.o v86/build/zstddeclib.o v
 	cd v86; make build/v86.wasm
 	cp v86/build/v86.wasm build/lib/v86.wasm
 
-v86dirty: 
-	touch v86timestamp # makes it "dirty" and forces recompilation
-
 build/cache-load.json: FORCE
 	(find apps/ -type f && cd build/ && find lib/ -type f && find libs/ -type f && find uv/ -type f && find assets/ -type f && find bundle.css -type f && cd ../public/ && find . -type f)| grep -v -e node_modules -e \.map -e \.d\.ts -e "/\." -e "uv/" -e "workbox/" | jq -Rnc '[inputs]' > build/cache-load.json
 
@@ -162,10 +162,20 @@ watch: bundle FORCE
 bundle: tsc css lint milestone
 	mkdir -p build/artifacts
 
+ANURA_VERSION = $(shell jq -r '.version' package.json)
+
 tsc:
 	mkdir -p build/artifacts
 	cp -r src/* build/artifacts
 	npx tsc
+	mkdir -p anuraos-types
+	cd anuraos-types/; \
+	mkdir -p lib/
+	cd build/; \
+	(find lib -type f -name "*.d.ts" -exec cp --parents {} ../anuraos-types/ \;)
+	(cd build && find lib -type f -name "*.d.ts") | sed 's/ \+/\n/g' | sed 's|.*|/// <reference path="&" />|' > anuraos-types/index.d.ts
+	jq '.version = "$(ANURA_VERSION)"' types-package.json > anuraos-types/package.json
+	
 css: src/*.css
 	# shopt -s globstar; cat src/**/*.css | npx postcss --use autoprefixer -o build/bundle.css
 	shopt -s globstar; cat src/**/*.css > build/bundle.css
@@ -185,7 +195,7 @@ static: all
 	cp -r public/* static/
 
 server: FORCE
-	cd server; npx ts-node server.ts
+	cd server; node server.js
 
 # v86 imports
 v86/src/rust/gen/jit.rs: 

.gitignore

@@ -62,7 +62,6 @@ Anura shows as more of a proof-of-concept with what's possible on the modern web
 -   Make sure you have `Docker` installed and running.
 -   Run `make rootfs`
 -   Make sure to add yourself to the Docker group using `usermod -a -G docker $USER`
--   (Special Use Case) In the event that you should need to override/manually add the initrd and kernel, remember to keep track of the file names of initrd and vmlinuz in build/images/(rootfs)-boot/. Then, copy them to the Anura root directory and rename them to initrd.img and bzimage respectively.(See the extended instructions [here](./documentation/Kernel_Override.md).)
 
 ### Running Anura Locally