diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 10a96b49..02e47d3a 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -1,6 +1,6 @@ name: Release Candidate on: - push: + push: tags: - 'v*-b*' @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" # See https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md # https://github.com/nodejs/node-gyp/blob/main/docs/Updating-npm-bundled-node-gyp.md @@ -43,12 +43,12 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" - name: Configure Node run: | # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8 - npm install -g npm@8 + npm install -g npm@8 npm install -g node-gyp@latest npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js - name: Install dependencies @@ -68,15 +68,15 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" - name: Configure Node shell: powershell run: | # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8 - npm install -g npm@8 + npm install -g npm@8 npm install -g node-gyp@latest npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - name: Install dependencies run: yarn install --immutable - name: Build and Release - run: yarn release \ No newline at end of file + run: yarn release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69a8c491..32b49a71 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" # See https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md # https://github.com/nodejs/node-gyp/blob/main/docs/Updating-npm-bundled-node-gyp.md @@ -42,12 +42,12 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" - name: Configure Node run: | # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8 - npm install -g npm@8 + npm install -g npm@8 npm install -g node-gyp@latest npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js - name: Install dependencies @@ -67,15 +67,15 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" - name: Configure Node shell: powershell run: | # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8 - npm install -g npm@8 + npm install -g npm@8 npm install -g node-gyp@latest npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - name: Install dependencies run: yarn install --immutable - name: Build and Release - run: yarn release \ No newline at end of file + run: yarn release diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4f493203..bd2ca40e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" # - name: Configure Node # run: | @@ -28,7 +28,7 @@ jobs: run: yarn install --immutable - name: Build run: yarn build - + MacOs: runs-on: macos-latest env: @@ -37,12 +37,12 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" - name: Configure Node run: | # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8 - npm install -g npm@8 + npm install -g npm@8 npm install -g node-gyp@latest npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js # yarn set version stable @@ -61,13 +61,13 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-node@master with: - node-version: "18" + node-version: "22" cache: "yarn" - name: Configure Node shell: powershell run: | # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8 - npm install -g npm@8 + npm install -g npm@8 npm install -g node-gyp@latest npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} # yarn set version stable diff --git a/.nvmrc b/.nvmrc index 55bffd62..7d41c735 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.15.0 +22.14.0 diff --git a/README.md b/README.md index 2967703f..27fc0336 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ ## Installation ### Requirements -* node >= `18.x` -* yarn >= `1.19.x` +* node >= `22.x` +* yarn >= `4.x` ```bash $ git clone https://github.com/getstation/desktop-app.git diff --git a/package.json b/package.json index 1db3d749..8906d1f5 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,11 @@ "rimraf": "^5.0.10" }, "devEngines": { - "node": ">=18.0.0", + "node": ">=22.0.0", "yarn": ">=4.1.0" }, "volta": { - "node": "18.14.0", + "node": "22.14.0", "yarn": "4.1.0" }, "packageManager": "yarn@4.1.0" diff --git a/packages/app/package.json b/packages/app/package.json index a3cf8139..1125d6a5 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -187,7 +187,7 @@ "use-timeout": "^1.1.0", "utility-types": "^3.7.0", "uuid": "^3.3.3", - "windows-focus-assist": "patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch", + "windows-focus-assist": "^1.4.0", "ws": "^5.2.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index b3cc6fd0..3cba9bba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29557,7 +29557,7 @@ __metadata: webpack: "npm:^4.46.0" webpack-cli: "npm:^3.3.12" webpack-merge: "npm:^4.2.2" - windows-focus-assist: "patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch" + windows-focus-assist: "npm:^1.4.0" write-file-webpack-plugin: "npm:^4.5.1" ws: "npm:^5.2.2" xvfb-maybe: "npm:^0.2.1" @@ -32804,25 +32804,14 @@ __metadata: languageName: node linkType: hard -"windows-focus-assist@npm:1.3.0": - version: 1.3.0 - resolution: "windows-focus-assist@npm:1.3.0" - dependencies: - bindings: "npm:^1.5.0" - node-addon-api: "npm:*" - node-gyp: "npm:latest" - checksum: 10c0/0a168df52e517e753fc3310dc3be04c37ca8c9a1afa84798a4ec5db252939382b866b76bf3656ed4b42d79ceed551f620307fb632d3e183cd7bea31a03f10c70 - languageName: node - linkType: hard - -"windows-focus-assist@patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch": - version: 1.3.0 - resolution: "windows-focus-assist@patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch::version=1.3.0&hash=5e48fb" +"windows-focus-assist@npm:^1.4.0": + version: 1.4.0 + resolution: "windows-focus-assist@npm:1.4.0" dependencies: bindings: "npm:^1.5.0" node-addon-api: "npm:*" node-gyp: "npm:latest" - checksum: 10c0/394ad49aaf273fed06dcccb55deab787387b50263c425fb9b035cd43f52d4cad37e0e63739d92784fc4a554496369672edda80ea8f84201c401028f0566ed5aa + checksum: 10c0/e0df9e7906f218772cb9fe81bd64a71643a7ac90ef457fa40e608b793800f72e1eea981fdd25f445adda00cb1d95f7f5e2de15ad0283ec098f8303a70bc4c83c languageName: node linkType: hard