remove libdom

.github/actions/install/action.yml

@@ -5,7 +5,7 @@ inputs:
   zig:
     description: 'Zig version to install'
     required: false
-    default: '0.15.1'
+    default: '0.15.2'
   arch:
     description: 'CPU arch used to select the v8 lib'
     required: false
@@ -17,7 +17,7 @@ inputs:
   zig-v8:
     description: 'zig v8 version to install'
     required: false
-    default: 'v0.1.33'
+    default: 'v0.1.35'
   v8:
     description: 'v8 version to install'
     required: false
@@ -26,6 +26,10 @@ inputs:
     description: 'cache dir to use'
     required: false
     default: '~/.cache'
+  mode:
+    description: 'debug or release'
+    required: false
+    default: 'debug'
 
 runs:
   using: "composite"
@@ -38,7 +42,7 @@ runs:
         sudo apt-get update
         sudo apt-get install -y wget xz-utils python3 ca-certificates git pkg-config libglib2.0-dev gperf libexpat1-dev cmake clang
 
-    - uses: mlugg/setup-zig@v2
+    - uses: mlugg/setup-zig@v2.0.5
       with:
         version: ${{ inputs.zig }}
 
@@ -58,37 +62,26 @@ runs:
 
         wget -O ${{ inputs.cache-dir }}/v8/libc_v8.a https://github.com/lightpanda-io/zig-v8-fork/releases/download/${{ inputs.zig-v8 }}/libc_v8_${{ inputs.v8 }}_${{ inputs.os }}_${{ inputs.arch }}.a
 
-    - name: install v8
+    - name: install v8 release
+      if: ${{ inputs.mode == 'release' }}
       shell: bash
       run: |
-        mkdir -p v8/out/${{ inputs.os }}/debug/obj/zig/
-        ln -s ${{ inputs.cache-dir }}/v8/libc_v8.a v8/out/${{ inputs.os }}/debug/obj/zig/libc_v8.a
-
         mkdir -p v8/out/${{ inputs.os }}/release/obj/zig/
         ln -s ${{ inputs.cache-dir }}/v8/libc_v8.a v8/out/${{ inputs.os }}/release/obj/zig/libc_v8.a
 
-    - name: Cache libiconv
-      id: cache-libiconv
-      uses: actions/cache@v4
-      env:
-        cache-name: cache-libiconv
-      with:
-        path: ${{ inputs.cache-dir }}/libiconv
-        key: vendor/libiconv/libiconv-1.17
-
-    - name: download libiconv
-      if: ${{ steps.cache-libiconv.outputs.cache-hit != 'true' }}
-      shell: bash
-      run: make download-libiconv
-
-    - name: build libiconv
+    - name: install v8 debug
+      if: ${{ inputs.mode == 'debug' }}
       shell: bash
-      run: make build-libiconv
+      run: |
+        mkdir -p v8/out/${{ inputs.os }}/debug/obj/zig/
+        ln -s ${{ inputs.cache-dir }}/v8/libc_v8.a v8/out/${{ inputs.os }}/debug/obj/zig/libc_v8.a
 
-    - name: build mimalloc
+    - name: hmtl5ever release
+      if: ${{ inputs.mode == 'release' }}
       shell: bash
-      run: make install-mimalloc
+      run: zig build -Doptimize=ReleaseFast html5ever
 
-    - name: build netsurf
+    - name: hmtl5ever debug
+      if: ${{ inputs.mode == 'debug' }}
       shell: bash
-      run: make install-netsurf
+      run: zig build html5ever

.github/workflows/build.yml

@@ -36,6 +36,7 @@ jobs:
         with:
           os: ${{env.OS}}
           arch: ${{env.ARCH}}
+          mode: 'release'
 
       - name: zig build
         run: zig build --release=safe -Doptimize=ReleaseSafe -Dcpu=x86_64 -Dgit_commit=$(git rev-parse --short ${{ github.sha }})
@@ -74,6 +75,7 @@ jobs:
         with:
           os: ${{env.OS}}
           arch: ${{env.ARCH}}
+          mode: 'release'
 
       - name: zig build
         run: zig build --release=safe -Doptimize=ReleaseSafe -Dcpu=generic -Dgit_commit=$(git rev-parse --short ${{ github.sha }})
@@ -114,6 +116,7 @@ jobs:
         with:
           os: ${{env.OS}}
           arch: ${{env.ARCH}}
+          mode: 'release'
 
       - name: zig build
         run: zig build --release=safe -Doptimize=ReleaseSafe -Dgit_commit=$(git rev-parse --short ${{ github.sha }})
@@ -157,6 +160,7 @@ jobs:
         with:
           os: ${{env.OS}}
           arch: ${{env.ARCH}}
+          mode: 'release'
 
       - name: zig build
         run: zig build --release=safe -Doptimize=ReleaseSafe -Dgit_commit=$(git rev-parse --short ${{ github.sha }})

.github/workflows/e2e-test.yml

@@ -56,6 +56,8 @@ jobs:
           submodules: recursive
 
       - uses: ./.github/actions/install
+        with:
+          mode: 'release'
 
       - name: zig build release
         run: zig build -Doptimize=ReleaseFast -Dcpu=x86_64 -Dgit_commit=$(git rev-parse --short ${{ github.sha }})

.github/workflows/zig-fmt.yml

@@ -1,7 +1,7 @@
 name: zig-fmt
 
 env:
-  ZIG_VERSION: 0.15.1
+  ZIG_VERSION: 0.15.2
 
 on:
   pull_request:

.gitignore

@@ -1,7 +1,6 @@
-zig-cache
 /.zig-cache/
-zig-out
-/vendor/netsurf/out
-/vendor/libiconv/
+/zig-out/
 lightpanda.id
 /v8/
+/build/
+/src/html5ever/target/

.gitmodules

@@ -1,24 +1,6 @@
-[submodule "vendor/netsurf/libwapcaplet"]
-	path = vendor/netsurf/libwapcaplet
-	url = https://github.com/lightpanda-io/libwapcaplet.git/
-[submodule "vendor/netsurf/libparserutils"]
-	path = vendor/netsurf/libparserutils
-	url = https://github.com/lightpanda-io/libparserutils.git/
-[submodule "vendor/netsurf/libdom"]
-	path = vendor/netsurf/libdom
-	url = https://github.com/lightpanda-io/libdom.git/
-[submodule "vendor/netsurf/share/netsurf-buildsystem"]
-	path = vendor/netsurf/share/netsurf-buildsystem
-	url = https://github.com/lightpanda-io/netsurf-buildsystem.git
-[submodule "vendor/netsurf/libhubbub"]
-	path = vendor/netsurf/libhubbub
-	url = https://github.com/lightpanda-io/libhubbub.git/
 [submodule "tests/wpt"]
 	path = tests/wpt
 	url = https://github.com/lightpanda-io/wpt
-[submodule "vendor/mimalloc"]
-	path = vendor/mimalloc
-	url = https://github.com/microsoft/mimalloc.git/
 [submodule "vendor/nghttp2"]
 	path = vendor/nghttp2
 	url = https://github.com/nghttp2/nghttp2.git

Dockerfile

@@ -1,10 +1,10 @@
 FROM debian:stable
 
 ARG MINISIG=0.12
-ARG ZIG=0.15.1
+ARG ZIG=0.15.2
 ARG ZIG_MINISIG=RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U
 ARG V8=14.0.365.4
-ARG ZIG_V8=v0.1.33
+ARG ZIG_V8=v0.1.35
 ARG TARGETPLATFORM
 
 RUN apt-get update -yq && \
@@ -40,9 +40,7 @@ WORKDIR /browser
 RUN git submodule init && \
     git submodule update --recursive
 
-RUN make install-libiconv && \
-    make install-netsurf && \
-    make install-mimalloc
+RUN zig build -Doptimize=ReleaseFast html5ever
 
 # download and install v8
 RUN case $TARGETPLATFORM in \

Makefile

@@ -96,9 +96,16 @@ wpt-summary:
 	@printf "\e[36mBuilding wpt...\e[0m\n"
 	@$(ZIG) build wpt -- --summary $(filter-out $@,$(MAKECMDGOALS)) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;)
 
-## Test
+## Test - `grep` is used to filter out the huge compile command on build
+ifeq ($(OS), macos)
 test:
-	@TEST_FILTER='${F}' $(ZIG) build test -freference-trace --summary all
+	@script -q /dev/null sh -c 'TEST_FILTER="${F}" $(ZIG) build test -freference-trace --summary all' 2>&1 \
+		| grep --line-buffered -v "^/.*zig test -freference-trace"
+else
+test:
+	@script -qec 'TEST_FILTER="${F}" $(ZIG) build test -freference-trace --summary all' /dev/null 2>&1 \
+		| grep --line-buffered -v "^/.*zig test -freference-trace"
+endif
 
 ## Run demo/runner end to end tests
 end2end:
@@ -120,128 +127,17 @@ build-v8:
 
 # Install and build required dependencies commands
 # ------------
-.PHONY: install-submodule
-.PHONY: install-libiconv
-.PHONY: _install-netsurf install-netsurf clean-netsurf test-netsurf install-netsurf-dev
-.PHONY: install-mimalloc install-mimalloc-dev clean-mimalloc
-.PHONY: install-dev install
+.PHONY: install install-dev
 
 ## Install and build dependencies for release
-install: install-submodule install-libiconv install-netsurf install-mimalloc
+install: install-submodule
 
 ## Install and build dependencies for dev
-install-dev: install-submodule install-libiconv install-netsurf-dev install-mimalloc-dev
-
-install-netsurf-dev: _install-netsurf
-install-netsurf-dev: OPTCFLAGS := -O0 -g -DNDEBUG
-
-install-netsurf: _install-netsurf
-install-netsurf: OPTCFLAGS := -DNDEBUG
-
-BC_NS := $(BC)vendor/netsurf/out/$(OS)-$(ARCH)
-ICONV := $(BC)vendor/libiconv/out/$(OS)-$(ARCH)
-# TODO: add Linux iconv path (I guess it depends on the distro)
-# TODO: this way of linking libiconv is not ideal. We should have a more generic way
-# and stick to a specif version. Maybe build from source. Anyway not now.
-_install-netsurf: clean-netsurf
-	@printf "\e[36mInstalling NetSurf...\e[0m\n" && \
-	ls $(ICONV)/lib/libiconv.a 1> /dev/null || (printf "\e[33mERROR: you need to execute 'make install-libiconv'\e[0m\n"; exit 1;) && \
-	mkdir -p $(BC_NS) && \
-	cp -R vendor/netsurf/share $(BC_NS) && \
-	export PREFIX=$(BC_NS) && \
-	export OPTLDFLAGS="-L$(ICONV)/lib" && \
-	export OPTCFLAGS="$(OPTCFLAGS) -I$(ICONV)/include" && \
-	printf "\e[33mInstalling libwapcaplet...\e[0m\n" && \
-	cd vendor/netsurf/libwapcaplet && \
-	BUILDDIR=$(BC_NS)/build/libwapcaplet make install && \
-	cd ../libparserutils && \
-	printf "\e[33mInstalling libparserutils...\e[0m\n" && \
-	BUILDDIR=$(BC_NS)/build/libparserutils make install && \
-	cd ../libhubbub && \
-	printf "\e[33mInstalling libhubbub...\e[0m\n" && \
-	BUILDDIR=$(BC_NS)/build/libhubbub make install && \
-	rm src/treebuilder/autogenerated-element-type.c && \
-	cd ../libdom && \
-	printf "\e[33mInstalling libdom...\e[0m\n" && \
-	BUILDDIR=$(BC_NS)/build/libdom make install && \
-	printf "\e[33mRunning libdom example...\e[0m\n" && \
-	cd examples && \
-	$(ZIG) cc \
-	-I$(ICONV)/include \
-	-I$(BC_NS)/include \
-	-L$(ICONV)/lib \
-	-L$(BC_NS)/lib \
-	-liconv \
-	-ldom \
-	-lhubbub \
-	-lparserutils \
-	-lwapcaplet \
-	-o a.out \
-	dom-structure-dump.c \
-	$(ICONV)/lib/libiconv.a && \
-	./a.out > /dev/null && \
-	rm a.out && \
-	printf "\e[36mDone NetSurf $(OS)\e[0m\n"
-
-clean-netsurf:
-	@printf "\e[36mCleaning NetSurf build...\e[0m\n" && \
-	rm -Rf $(BC_NS)
-
-test-netsurf:
-	@printf "\e[36mTesting NetSurf...\e[0m\n" && \
-	export PREFIX=$(BC_NS) && \
-	export LDFLAGS="-L$(ICONV)/lib -L$(BC_NS)/lib" && \
-	export CFLAGS="-I$(ICONV)/include -I$(BC_NS)/include" && \
-	cd vendor/netsurf/libdom && \
-	BUILDDIR=$(BC_NS)/build/libdom make test
-
-download-libiconv:
-ifeq ("$(wildcard vendor/libiconv/libiconv-1.17)","")
-	@mkdir -p vendor/libiconv
-	@cd vendor/libiconv && \
-	curl -L https://github.com/lightpanda-io/libiconv/releases/download/1.17/libiconv-1.17.tar.gz | tar -xvzf -
-endif
-
-build-libiconv: clean-libiconv
-	@cd vendor/libiconv/libiconv-1.17 && \
-	./configure --prefix=$(ICONV) --enable-static && \
-	make && make install
-
-install-libiconv: download-libiconv build-libiconv
-
-clean-libiconv:
-ifneq ("$(wildcard vendor/libiconv/libiconv-1.17/Makefile)","")
-	@cd vendor/libiconv/libiconv-1.17 && \
-	make clean
-endif
+install-dev: install-submodule
 
 data:
 	cd src/data && go run public_suffix_list_gen.go > public_suffix_list.zig
 
-.PHONY: _build_mimalloc
-
-MIMALLOC := $(BC)vendor/mimalloc/out/$(OS)-$(ARCH)
-_build_mimalloc: clean-mimalloc
-	@mkdir -p $(MIMALLOC)/build && \
-	cd $(MIMALLOC)/build && \
-	cmake -DMI_BUILD_SHARED=OFF -DMI_BUILD_OBJECT=OFF -DMI_BUILD_TESTS=OFF -DMI_OVERRIDE=OFF $(OPTS) ../../.. && \
-	make && \
-	mkdir -p $(MIMALLOC)/lib
-
-install-mimalloc-dev: _build_mimalloc
-install-mimalloc-dev: OPTS=-DCMAKE_BUILD_TYPE=Debug
-install-mimalloc-dev:
-	@cd $(MIMALLOC) && \
-	mv build/libmimalloc-debug.a lib/libmimalloc.a
-
-install-mimalloc: _build_mimalloc
-install-mimalloc:
-	@cd $(MIMALLOC) && \
-	mv build/libmimalloc.a lib/libmimalloc.a
-
-clean-mimalloc:
-	@rm -Rf $(MIMALLOC)/build
-
 ## Init and update git submodule
 install-submodule:
 	@git submodule init && \