Merge pull request #136 from MercuryWorkshop/v1.2

V1.2

.eslintignore

@@ -9,4 +9,5 @@ nohost/
 public/anura-sw.js
 public/lib/
 documentation/templates
-public/lib/html-to-image.min.js
+public/lib/html-to-image.min.js
+public/uv/

.gitignore

@@ -15,6 +15,7 @@ build/
 dist/
 bios/
 apps/games.app
+apps/libfileview.lib/icons/
 libv86.js
 v86.wasm
 public/dist.js

.prettierignore

@@ -4,3 +4,4 @@
 /build/**/*
 /apps/**/*
 /nohost/**/*
+/public/uv/

Makefile

@@ -5,7 +5,7 @@ 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: build/bootstrap v86dirty v86 build/nohost-sw.js bundle public/config.json build/cache-load.json
+all: build/bootstrap v86dirty v86 build/nohost-sw.js bundle public/config.json build/cache-load.json apps/libfileview.lib/icons apps/chideNewNewNew.app/node_modules build/libcurl.mjs build/lib/bare.cjs build/assets/matter.css 
 
 full: all rootfs-debian rootfs-arch rootfs-alpine
 
@@ -14,6 +14,12 @@ hooks: FORCE
 	echo -e "#!/bin/sh\nmake lint\ngit add -A" > .git/hooks/pre-commit
 	chmod +x .git/hooks/pre-commit
 
+apps/libfileview.lib/icons:
+	cd apps/libfileview.lib; bash geticons.sh
+
+apps/chideNewNewNew.app/node_modules:
+	cd apps/chideNewNewNew.app; npm i
+
 public/config.json:
 	cp config.default.json public/config.json
 build/bootstrap: 
@@ -25,6 +31,17 @@ build/bootstrap:
 
 build/nohost-sw.js:
 	cd nohost; npm i; npm run build; cp -r dist/* ../build/
+
+build/libcurl.mjs:
+	mkdir -p libcurl; cd libcurl; npm i --prefix . libcurl.js; cp node_modules/libcurl.js/libcurl.mjs ../build/; cp node_modules/libcurl.js/libcurl.wasm ../build/; rm -r ../libcurl
+
+build/lib/bare.cjs: build/bootstrap
+	cp node_modules/@mercuryworkshop/bare-client-custom/dist/bare.cjs build/lib/bare.cjs
+
+build/assets/matter.css:
+	mkdir -p build/assets
+	curl https://github.com/finnhvman/matter/releases/latest/download/matter.css -L -o build/assets/matter.css
+
 clean:
 	cd v86; make clean
 	rm -rf build/*

README.md

@@ -53,7 +53,7 @@ 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/debian-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).)
+-   (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
 

SECURITY.md

@@ -10,7 +10,6 @@
 | 1.1.1   | :white_check_mark: |
 | 1.0.0   | :x:                |
 
-
 ## Reporting a Vulnerability
 
 In the case that you somehow manage to find a vulnerability in Anura please contact security@mercurywork.shop