@krx3d/tizentubekrx 1.15.15 → 1.15.17

package/.github/workflows/publish-on-release.yml

@@ -1,15 +1,17 @@
-name: Build & Publish to npm (install mods deps + polyfills)
+name: Build & Publish (mods + service)
 
 on:
   push:
     branches:
       - main
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   build-and-publish:
     runs-on: ubuntu-latest
-    env:
-      NODE_OPTIONS: --max_old_space_size=4096
 
     steps:
       - name: Checkout repository
@@ -21,176 +23,121 @@ jobs:
           node-version: 20
           registry-url: 'https://registry.npmjs.org/'
 
-      - name: Show repo top-level files for debugging
+      - name: Show repository structure
         run: |
-          echo "=== root files ==="
+          echo "=== ROOT ==="
           ls -la
-
-      - name: Install dependencies for mods (if present)
+          echo "=== mods ==="
+          [ -d mods ] && ls -la mods || echo "mods/ not present"
+          echo "=== service ==="
+          [ -d service ] && ls -la service || echo "service/ not present"
+
+      # -----------------------------
+      # Build MODS (Rollup – upstream)
+      # -----------------------------
+      - name: Install mods dependencies
         run: |
           set -euo pipefail
           if [ -f mods/package.json ]; then
-            echo "Installing mods deps using mods/package-lock.json (if present)..."
-            # Prefer npm ci in mods (fast, reproducible). Falls back to npm install if no lockfile.
+            echo "Installing mods dependencies"
             if [ -f mods/package-lock.json ]; then
               npm ci --prefix mods
             else
               npm install --prefix mods
             fi
-            echo "mods/node_modules installed"
-            ls -la mods/node_modules | sed -n '1,200p' || true
           else
-            echo "No mods/package.json found — skipping."
+            echo "No mods/package.json, skipping mods install"
           fi
 
-      - name: Install dependencies for service (if present)
+      - name: Build mods (rollup)
         run: |
           set -euo pipefail
-          if [ -f service/package.json ]; then
-            echo "Installing service deps using service/package-lock.json (if present)..."
-            if [ -f service/package-lock.json ]; then
-              npm ci --prefix service
-            else
-              npm install --prefix service
-            fi
-            echo "service/node_modules installed"
-            ls -la service/node_modules | sed -n '1,200p' || true
+          if [ -f mods/package.json ]; then
+            echo "Running mods build"
+            npm run build --prefix mods
           else
-            echo "No service/package.json found — skipping."
+            echo "Skipping mods build"
           fi
 
-      - name: Install bundlers/tools (esbuild + ncc) at repo root
+      - name: Verify dist/userScript.js
         run: |
           set -euo pipefail
-          # Install tooling locally in runner (no-save so package.json not changed)
-          npm install --no-save esbuild @vercel/ncc
-
-      - name: Dump mods/ file list and show userScript head (debug)
-        run: |
-          echo "=== mods/ files ==="
-          ls -la mods || true
-          echo "=== first lines of mods/userScript.js ==="
-          if [ -f mods/userScript.js ]; then
-            sed -n '1,120p' mods/userScript.js || true
-          else
-            echo "mods/userScript.js missing"
+          if [ ! -f dist/userScript.js ]; then
+            echo "::error::dist/userScript.js not generated"
             exit 1
           fi
+          echo "dist/userScript.js:"
+          ls -lh dist/userScript.js
 
-      - name: Fetch polyfills & prepare tmp entry (strip poly imports & rewrite relative imports)
+      # -----------------------------
+      # Build SERVICE (ncc bundle)
+      # -----------------------------
+      - name: Install service dependencies
         run: |
           set -euo pipefail
-          mkdir -p tmp dist
-
-          # Fetch polyfills from unpkg (adjust pinned versions if you prefer)
-          curl -fsSL https://unpkg.com/whatwg-fetch/dist/fetch.umd.js -o tmp/whatwg-fetch.umd.js || true
-          curl -fsSL https://unpkg.com/core-js-bundle@3.32.2/minified.js -o tmp/core-js-bundle.min.js || true
-
-          # formatjs iife bundles often are not exported via package exports; try CDN fallback
-          curl -fsSL https://unpkg.com/@formatjs/intl-getcanonicallocales@latest/polyfill.iife.js -o tmp/intl-getcanonicallocales.polyfill.iife.js || true
-          curl -fsSL https://unpkg.com/@formatjs/intl-locale@latest/polyfill.iife.js -o tmp/intl-locale.polyfill.iife.js || true
-          curl -fsSL https://unpkg.com/@formatjs/intl-displaynames@latest/polyfill.iife.js -o tmp/intl-displaynames.polyfill.iife.js || true
-          curl -fsSL https://unpkg.com/@formatjs/intl-displaynames@latest/locale-data/en.js -o tmp/intl-displaynames.locale-data.en.js || true
-
-          # Concatenate what we downloaded (safe even if parts are missing)
-          cat tmp/whatwg-fetch.umd.js tmp/core-js-bundle.min.js tmp/intl-getcanonicallocales.polyfill.iife.js tmp/intl-locale.polyfill.iife.js tmp/intl-displaynames.polyfill.iife.js tmp/intl-displaynames.locale-data.en.js > tmp/polyfills.js || true
-          echo "Polyfills length bytes:"
-          wc -c tmp/polyfills.js || true
-
-          # Create temporary entry:
-          # 1) remove imports that reference the polyfills we fetched above (case-insensitive)
-          # 2) rewrite relative imports "./..." to "../mods/..." so esbuild resolves modules from mods/
-          sed -E '/import .*whatwg-fetch|import .*core-js|import .*@formatjs\/intl-getcanonicallocales|import .*@formatjs\/intl-locale|import .*@formatjs\/intl-displaynames|@formatjs\/intl-displaynames\/locale-data/Id' mods/userScript.js > tmp/userScript.entry.step1.js
-
-          # Convert import "./path/..." to import "../mods/path/..." to keep original import graph but resolvable from tmp/
-          sed -E "s|import[[:space:]]+\"\\./([^\"]+)\"|import \"../mods/\\1\"|g; s|import[[:space:]]+'\\./([^']+)'|import '../mods/\\1'|g" tmp/userScript.entry.step1.js > tmp/userScript.entry.js
-
-          echo "tmp/userScript.entry.js head:"
-          sed -n '1,120p' tmp/userScript.entry.js || true
-
-      - name: Bundle userScript (esbuild) and produce dist/userScript.js
-        run: |
-          set -euo pipefail
-          mkdir -p tmp dist
-          # bundle using esbuild
-          npx esbuild tmp/userScript.entry.js \
-            --bundle \
-            --platform=browser \
-            --format=iife \
-            --minify \
-            --outfile=tmp/bundle.userScript.js \
-            --banner:js="(function(){if(window.__TIZENTUBE_INJECT_LOADED)return;window.__TIZENTUBE_INJECT_LOADED=true;" \
-            --footer:js="})();"
-
-          # prepend polyfills if present
-          if [ -s tmp/polyfills.js ]; then
-            cat tmp/polyfills.js tmp/bundle.userScript.js > dist/userScript.js
+          if [ -f service/package.json ]; then
+            echo "Installing service dependencies"
+            if [ -f service/package-lock.json ]; then
+              npm ci --prefix service
+            else
+              npm install --prefix service
+            fi
           else
-            cp tmp/bundle.userScript.js dist/userScript.js
+            echo "No service/package.json, skipping service install"
           fi
 
-          echo "Built dist/userScript.js (size):"
-          ls -lh dist/userScript.js || true
-          head -n 8 dist/userScript.js || true
-
-      - name: Auto-detect service entry and bundle with ncc
-        id: detect_service
+      - name: Detect service entry
+        id: service_entry
         run: |
           set -euo pipefail
-          # Find a service entry candidate
+
           ENTRY=""
-          if [ -d service ]; then
-            for cand in index.js main.js service.js app.js server.js start.js; do
-              if [ -f "service/$cand" ]; then
-                ENTRY="service/$cand"
-                break
+
+          if [ -f service/package.json ]; then
+            MAIN=$(node -e "console.log(require('./service/package.json').main || '')")
+            if [ -n "$MAIN" ]; then
+              if [[ "$MAIN" == */* ]]; then
+                ENTRY="$MAIN"
+              else
+                ENTRY="service/$MAIN"
               fi
-            done
-            if [ -z "$ENTRY" ]; then
-              # fallback: first .js file found in service/
-              ENTRY=$(find service -maxdepth 1 -type f -name '*.js' | head -n1 || true)
             fi
           fi
+
           if [ -z "$ENTRY" ]; then
-            echo "No service entry detected; skipping service bundle"
-            echo "::set-output name=service_entry::"
-            exit 0
+            for f in service.js index.js app.js server.js; do
+              if [ -f "service/$f" ]; then
+                ENTRY="service/$f"
+                break
+              fi
+            done
           fi
-          echo "Detected service entry: $ENTRY"
-          echo "::set-output name=service_entry::$ENTRY"
 
-      - name: Bundle service if detected
-        run: |
-          set -euo pipefail
-          SERVICE_ENTRY="${{ steps.detect_service.outputs.service_entry }}"
-          if [ -z "$SERVICE_ENTRY" ]; then
-            echo "No service entry - skipping bundle"
-            exit 0
+          if [ -n "$ENTRY" ]; then
+            echo "entry=$ENTRY" >> "$GITHUB_OUTPUT"
+            echo "Service entry: $ENTRY"
+          else
+            echo "entry=" >> "$GITHUB_OUTPUT"
+            echo "No service entry found"
           fi
-          echo "Bundling service from $SERVICE_ENTRY"
-          npx @vercel/ncc build "$SERVICE_ENTRY" -o dist_tmp
-          mv dist_tmp/index.js dist/service.js
-          rm -rf dist_tmp
-          echo "Built dist/service.js (size):"
-          ls -lh dist/service.js || true
-          head -n 8 dist/service.js || true
 
-      - name: Verify dist outputs
+      - name: Bundle service with ncc
+        if: steps.service_entry.outputs.entry != ''
         run: |
           set -euo pipefail
-          if [ ! -f dist/userScript.js ]; then echo "dist/userScript.js missing" >&2; exit 1; fi
-          # service may be optional for some forks; only fail if service/package.json existed
-          if [ -f service/package.json ] && [ ! -f dist/service.js ]; then
-            echo "dist/service.js missing although service/package.json present" >&2
-            exit 1
-          fi
-          echo "✅ dist ready"
-
-      - name: Show dist contents
-        run: ls -la dist || true
+          mkdir -p dist
+          npx @vercel/ncc build "${{ steps.service_entry.outputs.entry }}" -o dist_tmp
+          mv dist_tmp/index.js dist/service.js
+          rm -rf dist_tmp
+          echo "dist/service.js:"
+          ls -lh dist/service.js
 
+      # -----------------------------
+      # Publish to npm
+      # -----------------------------
       - name: Publish to npm
-        if: github.ref == 'refs/heads/main'
-        run: npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          set -euo pipefail
+          npm publish --access public