From 0894b4b5f0d520d5b72d3dd078201eef0cfce42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Tue, 20 Aug 2024 20:37:27 -0700
Subject: [PATCH] Temporarily depend on experimental GL JS branch

---
 .github/workflows/build-preview.yml | 16 ++++++++++++----
 package-lock.json                   |  2 +-
 package.json                        |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-preview.yml b/.github/workflows/build-preview.yml
index 84d2ac002..cd1a82cdc 100644
--- a/.github/workflows/build-preview.yml
+++ b/.github/workflows/build-preview.yml
@@ -18,10 +18,10 @@ jobs:
   build-preview:
     runs-on: ubuntu-latest
     steps:
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Checkout Main Branch 🛎️
         uses: actions/checkout@v4
         with:
@@ -42,13 +42,21 @@ jobs:
       - name: Install and Build PR Branch 🔧
         # TODO: when we move shieldlib to its own repo, move shieldlib docs CI also
         run: |
-          npm ci --include=dev
+          npm install --include=dev
+          git clone https://github.com/1ec5/maplibre-gl-js.git --branch=complex-text-50 --depth=1
+          cd maplibre-gl-js/
+          npm install --include=dev
+          npm run build-dist
+          cd ../
+          npm link ./maplibre-gl-js/
+          cd shieldlib/
+          npm link ../maplibre-gl-js
+          cd ../
           npm run build
           npm run style
           npm run shields
           cp src/configs/config.aws.js src/config.js
           mkdir -p dist/shield-docs
-          cp -r shieldlib/docs/* dist/shield-docs
           mv dist ..
         working-directory: pr-branch
       - name: Capture main branch usage statistics
diff --git a/package-lock.json b/package-lock.json
index 6a14114c4..595ce721d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6300,7 +6300,7 @@
     },
     "shieldlib": {
       "name": "@americana/maplibre-shield-generator",
-      "version": "0.0.5",
+      "version": "0.0.7",
       "license": "CC0-1.0",
       "dependencies": {
         "@types/node": "^20.8.4",
diff --git a/package.json b/package.json
index 096fcdd1e..84924db82 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "shieldlib"
   ],
   "scripts": {
-    "build:shieldlib": "cd shieldlib && run-s build:code docs",
+    "build:shieldlib": "cd shieldlib && run-s build:code",
     "build:code": "tsx scripts/build",
     "build": "run-s clean-build sprites build:shieldlib build:code taginfo status_map",
     "clean": "run-s clean:shieldlib clean:code clean-download clean-build",