Merge 4806f12 into e1f9d66

patternfly · Oct 9, 2024 · e4d73d6 · e4d73d6
2 parents e1f9d66 + 4806f12
commit e4d73d6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 35 deletions.
diff --git a/.changeset/few-pumpkins-sit.md b/.changeset/few-pumpkins-sit.md
@@ -0,0 +1,6 @@
+---
+"@patternfly/pfe-tools": patch
+"@patternfly/pfe-core": patch
+---
+
+SSR: add shim for `ResizeObserver`
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -73,7 +73,7 @@ jobs:
       - name: Configure node version
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version-file: '.nvmrc'
           cache: npm
 
       - name: Install dependencies
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version-file: '.nvmrc'
           cache: npm
       - run: npm ci --prefer-offline
       - run: npm run build
@@ -110,7 +110,7 @@ jobs:
         env:
           HOME: /root
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.PLAYWRIGHT_REPORT_DIR }}
@@ -130,7 +130,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download zipped HTML report
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.PLAYWRIGHT_REPORT_DIR }}
           path: ${{ env.PLAYWRIGHT_REPORT_DIR }}/

diff --git a/core/pfe-core/ssr-shims.ts b/core/pfe-core/ssr-shims.ts
@@ -41,6 +41,8 @@ globalThis.IntersectionObserver ??= ObserverShim;
 // @ts-expect-error: this runs in node
 globalThis.MutationObserver ??= ObserverShim;
 // @ts-expect-error: this runs in node
+globalThis.ResizeObserver ??= ObserverShim;
+// @ts-expect-error: this runs in node
 globalThis.getComputedStyle ??= function() {
   return {
     getPropertyPriority() {

diff --git a/tools/pfe-tools/ssr/global.ts b/tools/pfe-tools/ssr/global.ts
@@ -8,7 +8,8 @@ export async function renderGlobal(
   html: string,
   importSpecifiers: string[],
 ): Promise<string> {
-  await import('./shims.js');
+  // avoid tsconfig problems
+  await import(['@patternfly', 'pfe-core', 'ssr-shims.js'].join('/'));
   const { ssr } = await import('./ssr.js');
   await Promise.all(importSpecifiers.map(x => import(x)));
   return ssr(html);

diff --git a/tools/pfe-tools/ssr/shims.ts b/tools/pfe-tools/ssr/shims.ts