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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest] # The operating systems to build for
node: [16]
node: [22] # Node 16 is EOL; nuxt 3.21 requires ^20.19 || >=22.12
runs-on: ${{ matrix.os }}
steps:
- name: Check out Git repository
Expand Down
11 changes: 11 additions & 0 deletions app/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@ export default defineNuxtConfig({
},
},
hooks: {
// nuxt-electron's vite build leaves an fsevents file-watcher open, so
// `nuxt generate` finishes its work but the process never exits, hanging
// CI (the `&& electron-builder` step never starts). Force exit once Nuxt
// closes, but ONLY for `generate`/`build` — never `prepare` (postinstall)
// or `dev`, where exiting early would skip writing .nuxt/tsconfig.json or
// tear down the dev server. See discussion in nuxt/nuxt#7277.
close: (nuxt) => {
const cmd = process.argv[2]
if (!nuxt.options.dev && (cmd === 'generate' || cmd === 'build'))
process.exit(0)
},
// Remove aliases to only have one
// https://github.com/nuxt/framework/issues/7277
'prepare:types': function ({ tsConfig }) {
Expand Down
11 changes: 6 additions & 5 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"dependencies": {
"@electron/remote": "2.0.9",
"@playwright/test": "~1.34.3",
"@trpc/client": "^10.4.3",
"@trpc/server": "^10.4.3",
"@trpc/client": "^10.45.3",
"@trpc/server": "^10.45.3",
"electron-is-dev": "^2.0.0",
"electron-log": "^4.4.8",
"electron-store": "^8.1.0",
"electron-updater": "5.3.0",
"html-to-image": "^1.11.11",
"systeminformation": "^5.21.7",
"systeminformation": "^5.31.6",
"uuid": "8.3.2",
"vue": "^3.2.47",
"vuetify": "^3.0.6"
Expand All @@ -53,6 +53,7 @@
"@reflex/ui": "workspace:*",
"@types/uuid": "^9.0.1",
"@viselect/vanilla": "^3.0.0-beta.13",
"@vitejs/plugin-vue": "^4.6.2",
"@vue/test-utils": "^2.3.2",
"@vueuse/core": "^9.13.0",
"@vueuse/electron": "^9.13.0",
Expand All @@ -69,11 +70,11 @@
"jsdom": "^22.1.0",
"mitt": "^3.0.0",
"moment": "^2.29.4",
"nuxt": "^3.12.4",
"nuxt": "3.12.4",
"nuxt-electron": "^0.2.0",
"path-browserify": "^1.0.1",
"pinia": "^2.0.35",
"postcss": "^8.4.31",
"postcss": "^8.5.10",
"sass": "1.60.0",
"sortablejs": "^1.15.0",
"sortablejs-vue3": "^1.2.9",
Expand Down
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@
"dependencies": {
"node-gyp": "^8.4.1",
"typescript": "^5.0.0"
},
"resolutions": {
"axios": "0.32.0",
"on-headers": "1.1.0",
"trim": "0.0.3"
}
}
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"vue": "^3.0.5"
},
"devDependencies": {
"@babel/core": "^7.14.8",
"@babel/core": "^7.29.6",
"@mdx-js/react": "^1.6.22",
"@storybook/addon-actions": "^6.4.0-alpha.22",
"@storybook/addon-docs": "^6.4.0-alpha.22",
Expand All @@ -35,7 +35,7 @@
"autoprefixer": "^10.3.1",
"babel-loader": "^8.2.2",
"feather-icons": "^4.28.0",
"postcss": "^8.4.31",
"postcss": "^8.5.10",
"postcss-loader": "^5.2.0",
"postcss-scss": "^3.0.5",
"pug": "^3.0.3",
Expand Down
Loading
Loading