Skip to content
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ on: [push]
jobs:
build:
name: Lint, Build and test
timeout-minutes: 5
timeout-minutes: 10
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.x, 21.x]
node-version: [22.x, 24.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
Expand All @@ -30,7 +30,7 @@ jobs:
run: yarn create-schemas && yarn build # an incremental rebuild is neccessary to use the updated schema
- name: Test
run: yarn test:unit
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
env:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ name: 'CodeQL'

on:
push:
branches: [master]
branches: [master, develop]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [master, develop]
schedule:
- cron: '27 16 * * 5'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [20.x, 22.x]
node-version: [22.x, 24.x]

steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.yarn
node_modules
frontend/dist
frontend/dist
coverage
600 changes: 300 additions & 300 deletions .yarn/releases/yarn-4.10.3.cjs → .yarn/releases/yarn-4.12.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.10.3.cjs
yarnPath: .yarn/releases/yarn-4.12.0.cjs
6 changes: 3 additions & 3 deletions common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"create-schemas": "node ./dist/bin/create-schemas.js"
},
"devDependencies": {
"@types/node": "^24.7.2",
"@types/node": "^25.0.10",
"ts-json-schema-generator": "^2.4.0",
"vitest": "^3.2.4"
"vitest": "^4.0.18"
},
"dependencies": {
"@furystack/rest": "^8.0.27"
"@furystack/rest": "^8.0.32"
}
}
2 changes: 1 addition & 1 deletion common/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './models/index.js'
export * from './boilerplate-api.js'
export * from './models/index.js'
20 changes: 10 additions & 10 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
"devDependencies": {
"@codecov/vite-plugin": "^1.9.1",
"typescript": "^5.9.3",
"vite": "^7.1.10",
"vitest": "^3.2.4"
"vite": "^7.3.1",
"vitest": "^4.0.18"
},
"dependencies": {
"@furystack/core": "^15.0.27",
"@furystack/inject": "^12.0.21",
"@furystack/logging": "^8.0.21",
"@furystack/rest-client-fetch": "^8.0.27",
"@furystack/shades": "^11.0.28",
"@furystack/shades-common-components": "^10.0.28",
"@furystack/utils": "^8.1.3",
"@types/node": "^24.7.2",
"@furystack/core": "^15.0.32",
"@furystack/inject": "^12.0.26",
"@furystack/logging": "^8.0.26",
"@furystack/rest-client-fetch": "^8.0.32",
"@furystack/shades": "^11.0.33",
"@furystack/shades-common-components": "^10.0.33",
"@furystack/utils": "^8.1.8",
"@types/node": "^25.0.10",
"common": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions frontend/src/components/body.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createComponent, Shade, Router } from '@furystack/shades'
import { createComponent, Router, Shade } from '@furystack/shades'
import { ButtonsDemo, HelloWorld, Init, Login, Offline } from '../pages/index.js'
import { SessionService } from '../services/session.js'
import { ButtonsDemo, Init, HelloWorld, Offline, Login } from '../pages/index.js'

export const Body = Shade<{ style?: Partial<CSSStyleDeclaration> }>({
shadowDomName: 'shade-app-body',
Expand Down
9 changes: 7 additions & 2 deletions frontend/src/components/theme-switch/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { createComponent, Shade } from '@furystack/shades'
import type { ButtonProps } from '@furystack/shades-common-components'
import { getCssVariable } from '@furystack/shades-common-components'
import { Button, defaultDarkTheme, defaultLightTheme, ThemeProviderService } from '@furystack/shades-common-components'
import {
Button,
defaultDarkTheme,
defaultLightTheme,
getCssVariable,
ThemeProviderService,
} from '@furystack/shades-common-components'

export const ThemeSwitch = Shade<Omit<ButtonProps, 'onclick'>>({
shadowDomName: 'theme-switch',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/services/boilerplate-api-client.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@furystack/inject'
import { createClient } from '@furystack/rest-client-fetch'
import type { BoilerplateApi } from 'common'
import { Injectable } from '@furystack/inject'
import { environmentOptions } from '../environment-options.js'

@Injectable({ lifetime: 'singleton' })
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
},
"type": "module",
"devDependencies": {
"@eslint/js": "^9.37.0",
"@playwright/test": "^1.56.0",
"@types/node": "^24.7.2",
"@vitest/coverage-v8": "^3.2.4",
"eslint": "^9.37.0",
"@eslint/js": "^9.39.2",
"@playwright/test": "^1.58.0",
"@types/node": "^25.0.10",
"@vitest/coverage-v8": "^4.0.18",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-import": "2.32.0",
"eslint-plugin-jsdoc": "^61.1.4",
"eslint-plugin-playwright": "^2.2.2",
"eslint-plugin-prettier": "^5.5.4",
"eslint-plugin-jsdoc": "^62.4.0",
"eslint-plugin-playwright": "^2.5.0",
"eslint-plugin-prettier": "^5.5.5",
"husky": "^9.1.7",
"lint-staged": "^16.2.4",
"prettier": "^3.6.2",
"rimraf": "^6.0.1",
"lint-staged": "^16.2.7",
"prettier": "^3.8.1",
"rimraf": "^6.1.2",
"typescript": "^5.9.3",
"typescript-eslint": "^8.46.1",
"vite": "^7.1.10",
"vitest": "^3.2.4"
"typescript-eslint": "^8.53.1",
"vite": "^7.3.1",
"vitest": "^4.0.18"
},
"husky": {
"hooks": {
Expand Down Expand Up @@ -69,5 +69,5 @@
"engines": {
"node": ">=18.0.0"
},
"packageManager": "yarn@4.10.3"
"packageManager": "yarn@4.12.0"
}
18 changes: 9 additions & 9 deletions service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
"build": "tsc -b"
},
"devDependencies": {
"@types/node": "^24.7.2",
"@types/node": "^25.0.10",
"typescript": "^5.9.3",
"vitest": "^3.2.4"
"vitest": "^4.0.18"
},
"dependencies": {
"@furystack/core": "^15.0.27",
"@furystack/filesystem-store": "^7.0.27",
"@furystack/inject": "^12.0.21",
"@furystack/logging": "^8.0.21",
"@furystack/repository": "^10.0.27",
"@furystack/rest-service": "^10.0.28",
"@furystack/security": "^6.0.27",
"@furystack/core": "^15.0.32",
"@furystack/filesystem-store": "^7.0.32",
"@furystack/inject": "^12.0.26",
"@furystack/logging": "^8.0.26",
"@furystack/repository": "^10.0.32",
"@furystack/rest-service": "^10.1.3",
"@furystack/security": "^6.0.32",
"common": "workspace:^"
}
}
2 changes: 1 addition & 1 deletion service/src/config.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, it, expect } from 'vitest'
import { describe, expect, it } from 'vitest'

describe('Config tests', () => {
it('Should match the snapshot', () => {
Expand Down
11 changes: 5 additions & 6 deletions service/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { join } from 'path'
import { addStore, InMemoryStore, isAuthenticated } from '@furystack/core'
import { FileSystemStore } from '@furystack/filesystem-store'
import { Injector } from '@furystack/inject'
import { PasswordCredential } from '@furystack/security'
import { useLogging, VerboseConsoleLogger } from '@furystack/logging'
import type { DataSetSettings, AuthorizationResult } from '@furystack/repository'
import type { AuthorizationResult, DataSetSettings } from '@furystack/repository'
import { getRepository } from '@furystack/repository'
import { usePasswordPolicy } from '@furystack/security'
import { User } from 'common'
import { DefaultSession } from '@furystack/rest-service'
import { PasswordCredential, usePasswordPolicy } from '@furystack/security'
import { User } from 'common'
import { join } from 'path'

export const authorizedOnly = async (options: { injector: Injector }): Promise<AuthorizationResult> => {
const isAllowed = await isAuthenticated(options.injector)
Expand All @@ -25,7 +24,7 @@ export const authorizedDataSet: Partial<DataSetSettings<any, any>> = {
authorizeGet: authorizedOnly,
authorizeRemove: authorizedOnly,
authorizeUpdate: authorizedOnly,
authroizeRemoveEntity: authorizedOnly,
authorizeRemoveEntity: authorizedOnly,
}

export const injector = new Injector()
Expand Down
5 changes: 2 additions & 3 deletions service/src/service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import type { BoilerplateApi } from 'common'
import BoilerplateApiSchemas from 'common/schemas/boilerplate-api.json' with { type: 'json' }

import {
DefaultSession,
GetCurrentUser,
Expand All @@ -13,7 +10,9 @@ import {
useRestService,
useStaticFiles,
} from '@furystack/rest-service'
import type { BoilerplateApi } from 'common'
import { User } from 'common'
import BoilerplateApiSchemas from 'common/schemas/boilerplate-api.json' with { type: 'json' }
import { injector } from './config.js'
import { attachShutdownHandler } from './shutdown-handler.js'

Expand Down
Loading
Loading