fix: sync with Infra (#200)

* fix: Infra sync * fix: Infra sync * fix: Infra sync
sigwinhq · Dec 22, 2023 · 006e29e · 006e29e
1 parent efa5b83
commit 006e29e
Show file tree

Hide file tree

Showing 7 changed files with 3,596 additions and 9,907 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -86,6 +86,10 @@ jobs:
                 name: Run init
                 working-directory: tests/functional/init
                 run: make -f ../default.mk self/init
+            -
+                name: Run Infra init
+                working-directory: tests/functional/init
+                run: make -f ../default.mk init
             -
                 name: Run build
                 working-directory: tests/functional/init

diff --git a/resources/init/basic/compose.yaml b/resources/init/basic/compose.yaml
diff --git a/resources/init/basic/package.json b/resources/init/basic/package.json
@@ -1,11 +1,11 @@
 {
     "devDependencies": {
-        "@symfony/webpack-encore": "^1.7.0",
+        "@symfony/webpack-encore": "^4.5.0",
         "file-loader": "^6.2.0",
         "sass": "^1.45.2",
-        "sass-loader": "^12.4.0",
+        "sass-loader": "^13.3.2",
         "ts-loader": "^9.2.6",
-        "typescript": "^4.5.4",
+        "typescript": "^5.3.3",
         "webpack-notifier": "^1.15.0"
     }
 }
diff --git a/tests/functional/site/Makefile b/tests/functional/site/Makefile
@@ -4,3 +4,15 @@ YASSG_SKIP_BUNDLES := Symfony\\WebpackEncoreBundle\\WebpackEncoreBundle
 APP_ROOT := $(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
 
 include vendor/sigwin/infra/resources/YASSG/default.mk
+
+build/docker/imgproxy:
+	docker compose up imgproxy -d
+build/docker: build/docker/imgproxy
+	docker compose run --rm webpack npm ci
+	docker compose run --rm webpack npx encore production
+	docker compose run --rm --env IMGPROXY_URL=http://imgproxy:8080 app vendor/sigwin/yassg/bin/yassg yassg:generate --env prod "$(BASE_URL)"
+
+vendor/sigwin/infra/resources/YASSG/default.mk:
+	mv composer.json composer.json~ && rm -f composer.lock
+	docker run --rm --user '$(shell id -u):$(shell id -g)' --volume '$(shell pwd):/app' --workdir /app composer:2 require sigwin/infra
+	mv composer.json~ composer.json && rm -f composer.lock
diff --git a/tests/functional/site/compose.yaml b/tests/functional/site/compose.yaml
@@ -1,4 +1,22 @@
 services:
+    app:
+        image: php:8.2-alpine
+        environment:
+            BASE_URL: ${BASE_URL}
+        working_dir: /app
+        volumes:
+            - .:/app
+        tmpfs:
+            - /tmp
+    webpack:
+        image: node:20-alpine
+        environment:
+            BASE_URL: ${BASE_URL}
+        working_dir: /app
+        volumes:
+            - .:/app
+        tmpfs:
+            - /tmp
     imgproxy:
         image: darthsim/imgproxy:v3
         environment: