Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/dependency update 2024 07 12 #123

Merged
merged 6 commits into from
Jul 12, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
node-version: [20.x, 21.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -54,7 +54,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -68,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
6 changes: 0 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,5 @@
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"editor.formatOnSave": true,
"eslint.validate": ["typescript", "typescriptreact"],
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"eslint.nodePath": ".yarn/sdks",
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
"typescript.enablePromptUseWorkspaceTsdk": true
}
434 changes: 217 additions & 217 deletions .yarn/releases/yarn-4.3.0.cjs → .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarn/versions/2d4efe43.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
releases:
common: patch
frontend: patch
furystack-boilerplate-app: patch
service: patch
3 changes: 2 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.3.0.cjs

yarnPath: .yarn/releases/yarn-4.3.1.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": "^20.14.2",
"@types/node": "^20.14.10",
"ts-json-schema-generator": "^2.3.0",
"vitest": "^1.6.0"
"vitest": "^2.0.2"
},
"dependencies": {
"@furystack/rest": "^7.0.5"
"@furystack/rest": "^8.0.0"
}
}
9 changes: 1 addition & 8 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ import prettierConfig from 'eslint-config-prettier'

export default tseslint.config(
{
ignores: [
'coverage',
'packages/*/node_modules/*',
'packages/*/esm/*',
'packages/*/types/*',
'packages/*/dist/*',
'.yarn/*',
],
ignores: ['coverage', '*/node_modules/*', '*/esm/*', '*/types/*', '*/dist/*', '.yarn/*'],
},
eslint.configs.recommended,
...tseslint.configs.recommended,
Expand Down
22 changes: 11 additions & 11 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"author": "",
"license": "ISC",
"devDependencies": {
"typescript": "^5.4.5",
"vite": "^5.2.13",
"vitest": "^1.6.0"
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vitest": "^2.0.2"
},
"dependencies": {
"@furystack/core": "^14.0.5",
"@furystack/inject": "^11.0.3",
"@furystack/logging": "^7.0.2",
"@furystack/rest-client-fetch": "^7.0.5",
"@furystack/shades": "^10.0.5",
"@furystack/shades-common-components": "^8.2.2",
"@furystack/utils": "^7.0.2",
"@types/node": "^20.14.2",
"@furystack/core": "^15.0.0",
"@furystack/inject": "^12.0.0",
"@furystack/logging": "^8.0.0",
"@furystack/rest-client-fetch": "^8.0.0",
"@furystack/shades": "^11.0.0",
"@furystack/shades-common-components": "^10.0.0",
"@furystack/utils": "^8.0.0",
"@types/node": "^20.14.10",
"common": "workspace:^"
}
}
11 changes: 3 additions & 8 deletions frontend/src/components/github-logo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { ThemeProviderService } from '@furystack/shades-common-components'
import ghLight from './gh-light.png'
// @ts-ignore
import ghDark from './gh-dark.png'
import { Trace } from '@furystack/utils'

type GithubLogoProps = Omit<Partial<HTMLImageElement>, 'style' | 'src' | 'alt'> & {
style?: Partial<CSSStyleDeclaration> | undefined
Expand All @@ -21,13 +20,9 @@ export const GithubLogo = Shade<GithubLogoProps>({
themeProvider.getTextColor(themeProvider.theme.background.paper, 'light', 'dark'),
)
useDisposable('themeChange', () =>
Trace.method({
object: themeProvider,
method: themeProvider.set,
onFinished: () => {
const value = themeProvider.getTextColor(themeProvider.theme.background.paper, 'light', 'dark')
setTheme(value)
},
themeProvider.subscribe('themeChanged', () => {
const value = themeProvider.getTextColor(themeProvider.theme.background.paper, 'light', 'dark')
setTheme(value)
}),
)
return <img {...props} src={theme === 'dark' ? ghLight : ghDark} alt="gh-logo" />
Expand Down
15 changes: 3 additions & 12 deletions frontend/src/components/theme-switch/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ 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 { Trace } from '@furystack/utils'

export const ThemeSwitch = Shade<Omit<ButtonProps, 'onclick'>>({
shadowDomName: 'theme-switch',
Expand All @@ -14,24 +13,16 @@ export const ThemeSwitch = Shade<Omit<ButtonProps, 'onclick'>>({
)

useDisposable('traceThemeChange', () =>
Trace.method({
object: themeProvider,
method: themeProvider.set,
onFinished: () => {
setTheme(
getCssVariable(themeProvider.theme.background.default) === defaultDarkTheme.background.default
? 'dark'
: 'light',
)
},
themeProvider.subscribe('themeChanged', (newTheme) => {
setTheme(newTheme.name === 'dark' ? 'dark' : 'light')
}),
)

return (
<Button
{...props}
onclick={() => {
themeProvider.set(theme === 'dark' ? defaultLightTheme : defaultDarkTheme)
themeProvider.setAssignedTheme(theme === 'dark' ? defaultLightTheme : defaultDarkTheme)
}}
>
{theme === 'dark' ? '☀️' : '🌜'}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ getLogger(shadeInjector).withScope('Startup').verbose({

shadeInjector.getInstance(SessionService)

shadeInjector.getInstance(ThemeProviderService).set(defaultDarkTheme)
shadeInjector.getInstance(ThemeProviderService).setAssignedTheme(defaultDarkTheme)

const rootElement: HTMLDivElement = document.getElementById('root') as HTMLDivElement

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/services/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ export type SessionState = 'initializing' | 'offline' | 'unauthenticated' | 'aut

@Injectable({ lifetime: 'singleton' })
export class SessionService implements IdentityContext {
private readonly operation = () => {
private readonly operation = (): Disposable => {
this.isOperationInProgress.setValue(true)
return { dispose: () => this.isOperationInProgress.setValue(false) }
return { [Symbol.dispose]: () => this.isOperationInProgress.setValue(false) }
}

public state = new ObservableValue<SessionState>('initializing')
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
},
"type": "module",
"devDependencies": {
"@eslint/js": "^9.4.0",
"@playwright/test": "^1.44.1",
"@types/node": "^20.14.2",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"@vitest/coverage-v8": "^1.6.0",
"eslint": "^9.4.0",
"@eslint/js": "^9.6.0",
"@playwright/test": "^1.45.1",
"@types/node": "^20.14.10",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@vitest/coverage-v8": "^2.0.2",
"eslint": "^9.6.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsdoc": "^48.2.9",
"eslint-plugin-jsdoc": "^48.7.0",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^9.0.11",
"lint-staged": "^15.2.5",
"lint-staged": "^15.2.7",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.4.5",
"typescript-eslint": "^7.13.0",
"vite": "^5.2.13",
"vitest": "^1.6.0"
"rimraf": "^6.0.1",
"typescript": "^5.5.3",
"typescript-eslint": "^7.16.0",
"vite": "^5.3.3",
"vitest": "^2.0.2"
},
"husky": {
"hooks": {
Expand Down Expand Up @@ -70,5 +70,5 @@
"engines": {
"node": ">=18.0.0"
},
"packageManager": "[email protected].0"
"packageManager": "[email protected].1"
}
1 change: 0 additions & 1 deletion prettier.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export default {
jsxBracketSameLine: true,
printWidth: 120,
semi: false,
singleQuote: true,
Expand Down
20 changes: 10 additions & 10 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": "^20.14.2",
"typescript": "^5.4.5",
"vitest": "^1.6.0"
"@types/node": "^20.14.10",
"typescript": "^5.5.3",
"vitest": "^2.0.2"
},
"dependencies": {
"@furystack/core": "^14.0.5",
"@furystack/filesystem-store": "^6.0.5",
"@furystack/inject": "^11.0.3",
"@furystack/logging": "^7.0.2",
"@furystack/repository": "^9.0.5",
"@furystack/rest-service": "^9.0.5",
"@furystack/security": "^5.0.5",
"@furystack/core": "^15.0.0",
"@furystack/filesystem-store": "^7.0.0",
"@furystack/inject": "^12.0.0",
"@furystack/logging": "^8.0.0",
"@furystack/repository": "^10.0.0",
"@furystack/rest-service": "^10.0.0",
"@furystack/security": "^6.0.0",
"common": "workspace:^"
}
}
3 changes: 2 additions & 1 deletion service/src/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,5 @@ export const seed = async (i: Injector): Promise<void> => {
logger.verbose({ message: 'Seeding data completed.' })
}

seed(injector).then(() => injector.dispose())
await seed(injector)
await injector[Symbol.asyncDispose]()
4 changes: 2 additions & 2 deletions service/src/shutdown-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ export const attachShutdownHandler = (i: Injector): void => {
})
}
if (i.cachedSingletons.get(ServerManager)) {
await i.getInstance(ServerManager).dispose()
await i.getInstance(ServerManager)[Symbol.asyncDispose]()
}
// if (i.cachedSingletons.get(DbLogger)) {
// await i.getInstance(DbLogger).dispose()
// }
await i.dispose()
await i[Symbol.asyncDispose]()
} catch (e) {
console.error('Error during shutdown', e)
process.exit(1)
Expand Down
Loading
Loading