Merge remote-tracking branch 'origin/staging' into feat/card-content

Author: Alain Bourgeois

.github/workflows/ci.yml

@@ -7,20 +7,26 @@ on:
   push:
     branches:
       - main
+      - staging
   pull_request:
     branches:
       - main
+      - staging
   workflow_dispatch:
 
 jobs:
-  build:
+  update-deps:
+    uses: SolidOS/solidos/.github/workflows/update-solidos-deps.yml@main
+    secrets: inherit
 
+  build:
+    needs: update-deps
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        node-version: [22, 24]
-
+        node-version: 
+          - 22
+          - 24
     steps:
       - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}

babel.config.mjs

@@ -15,6 +15,7 @@ export default {
     '@babel/preset-typescript'
   ],
   plugins: [
+    'babel-plugin-transform-import-meta',
     [
       'babel-plugin-inline-import', {
         extensions: [

dev/index.js

@@ -14,22 +14,12 @@ if (loginBanner) {
 }
 
 async function finishLogin () {
-  const me = await logic.authn.checkUser()
+  await logic.authn.checkUser()
   const session = logic.authSession
-  const sessionWebId = session?.webId ?? session?.info?.webId ?? null
-  const meWebId = me?.uri ?? me?.value ?? null
-  const webIdUri = meWebId ?? sessionWebId
-  const isLoggedIn = Boolean(
-    me ||
-    session?.isActive ||
-    session?.info?.isLoggedIn ||
-    sessionWebId
-  )
-
-  if (isLoggedIn && webIdUri) {
-    if (webId) {
-      webId.innerHTML = 'Logged in as: ' + webIdUri
-    }
+  const isLoggedIn = session?.info?.isLoggedIn ?? session?.isActive ?? Boolean(session?.webId)
+  if (isLoggedIn) {
+    // Update the page with the status.
+    webId.innerHTML = 'Logged in as: ' + logic.authn.currentUser().uri
   } else {
     if (webId) {
       webId.innerHTML = ''

jest.config.mjs

@@ -6,7 +6,10 @@ export default {
       customExportConditions: ['node']
   },
   setupFilesAfterEnv: ["./test/helpers/jest.setup.js"],
-  transformIgnorePatterns: ["/node_modules/(?!(@lit|@lit-labs|lit|lit-html|lit-element)/).+\\.js$"],
+  transform: {
+    '^.+\\.m?js$': 'babel-jest',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*(?:@uvdsl|uuid|@noble|lit-html|lit-element|lit|@lit|@lit-labs|solid-ui|solid-logic)(?:/|$))'],
   roots: ['<rootDir>/src', '<rootDir>/test'],
   moduleNameMapper: {
     '^SolidLogic$': 'solid-logic',