Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions babel.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default {
],
],
plugins: [
'babel-plugin-transform-import-meta',
[
'babel-plugin-inline-import', {
extensions: [
Expand Down
5 changes: 3 additions & 2 deletions dev/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ const webId = document.getElementById('webId')
loginBanner.appendChild(UI.login.loginStatusBox(document, null, {}))

async function finishLogin () {
await logic.authSession.handleIncomingRedirect()
await logic.authn.checkUser()
const session = logic.authSession
if (session.info.isLoggedIn) {
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 {
Expand Down
5 changes: 4 additions & 1 deletion jest.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ export default {
customExportConditions: ['node']
},
setupFilesAfterEnv: ["./test/helpers/jest.setup.js"],
transformIgnorePatterns: ["/node_modules/(?!lit-html).+\\.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',
Expand Down
Loading
Loading