From 377cceeeeb4df6c60c015bbe6288b87bcdbef56b Mon Sep 17 00:00:00 2001 From: kruplm <73655443+kruplm@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:55:07 +0100 Subject: [PATCH 1/5] chore(composeui-node-launcher): Upgrade Node.js to v22 --- src/shell/js/composeui-node-launcher/src/cli/install.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shell/js/composeui-node-launcher/src/cli/install.js b/src/shell/js/composeui-node-launcher/src/cli/install.js index 7b6c86178..78af35a3e 100644 --- a/src/shell/js/composeui-node-launcher/src/cli/install.js +++ b/src/shell/js/composeui-node-launcher/src/cli/install.js @@ -1,6 +1,5 @@ #!/usr/bin/env node -"use strict"; import path from 'path'; import fs from 'fs'; @@ -12,7 +11,7 @@ import extract from 'extract-zip'; import * as stream from 'stream'; import { promisify } from 'util'; -import pkg from './../../package.json' assert { type: "json" }; +import pkg from './../../package.json' with { type: "json" }; const DEFAULT_CDN_URL = 'https://github.com/morganstanley/ComposeUI/releases/download'; From 15c50670be4f0f45bc5c1dce63cc7361b650d627 Mon Sep 17 00:00:00 2001 From: kruplm <73655443+kruplm@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:56:29 +0100 Subject: [PATCH 2/5] chore(messaging/js-client): Upgrade to Node.js v22 --- src/messaging/js/composeui-messaging-client/rollup.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/messaging/js/composeui-messaging-client/rollup.config.js b/src/messaging/js/composeui-messaging-client/rollup.config.js index 037bc6b8c..89431e2d9 100644 --- a/src/messaging/js/composeui-messaging-client/rollup.config.js +++ b/src/messaging/js/composeui-messaging-client/rollup.config.js @@ -13,7 +13,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'; import typescript from '@rollup/plugin-typescript'; -import pkg from "./package.json" assert { type: "json" }; +import pkg from "./package.json" with { type: "json" }; const moduleName = pkg.name.replace(/^@.*\//, ""); const inputFileName = "src/index.ts"; From 94c488baf9d0dea43d7801195f3ef839c3087f2e Mon Sep 17 00:00:00 2001 From: kruplm <73655443+kruplm@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:57:14 +0100 Subject: [PATCH 3/5] chore(workflows): Upgrade CI and Release workflows to Node.js v22 --- .github/workflows/continuous-integration.yml | 14 +++++++------- .github/workflows/release.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 69c17928f..2e65ab19f 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -24,13 +24,13 @@ jobs: strategy: matrix: dotnet-version: [ '6.0.x' ] - node-version: [ '20.x' ] + node-version: [ '22.x' ] steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: ${{ matrix.node-version }} COMPOSEUI_SKIP_DOWNLOAD: ${{env.COMPOSEUI_SKIP_DOWNLOAD}} @@ -45,7 +45,7 @@ jobs: run: npx lerna run test - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 + uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 with: dotnet-version: ${{ matrix.dotnet-version }} @@ -65,7 +65,7 @@ jobs: - name: Codecov - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 + uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -74,13 +74,13 @@ jobs: powershell ./build/dotnet-pack.ps1 - name: Upload Nuget Packages - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: packages path: ${{ github.workspace }}/packages - name: Upload Shell Binaries - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: shell-binaries path: ${{ github.workspace }}/src/shell/dotnet/Shell/bin/Release/net6.0-windows/ \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6a7dd489..4520fa38a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: - node-version: 20.x + node-version: 22.x registry-url: https://registry.npmjs.org/ - run: | lerna publish from-package --no-private --yes From e44335b9303ab575495f452efd9451c68230d727 Mon Sep 17 00:00:00 2001 From: kruplm <73655443+kruplm@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:03:06 +0100 Subject: [PATCH 4/5] chore(documentation): Update README Files to Reflect Node.js 22 Upgrade --- .github/workflows/README.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 74a8fef47..62ec9d1f4 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -8,7 +8,7 @@ Accessing them can be done via the vars object. | Variable | Description | Example value | | -------------- | ------------------------------------------------------- | ------------- | | DOTNET_VERSION | The version of dotnet to load with actions/setup-dotnet | 6.0.x | -| NODE_VERSION | The version of node.js to load with actions/setup-node | 18.x | +| NODE_VERSION | The version of node.js to load with actions/setup-node | 22.x | # Workflows ## continous-integration.yml diff --git a/README.md b/README.md index 44d690a26..96cfe9bc6 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ It supports desktop and web applications in order to provide an evergreen altern # Development Setup ## Prerequisites -* Node.js 18 +* Node.js 22 * .NET 6 (SDK 6.0.x, Desktop Runtime 6.0.x) * Visual Studio 2022 Community Edition From aa5e6d09c24758001a0c4407e7e0c0ae0213e780 Mon Sep 17 00:00:00 2001 From: kruplm <73655443+kruplm@users.noreply.github.com> Date: Wed, 29 Jan 2025 14:42:25 +0100 Subject: [PATCH 5/5] fix(node-launcher): Fix binary Filename --- src/shell/js/composeui-node-launcher/src/launcher.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shell/js/composeui-node-launcher/src/launcher.ts b/src/shell/js/composeui-node-launcher/src/launcher.ts index 3df82e003..b7ae5a62f 100644 --- a/src/shell/js/composeui-node-launcher/src/launcher.ts +++ b/src/shell/js/composeui-node-launcher/src/launcher.ts @@ -3,7 +3,7 @@ import { WindowConfig } from './windowConfig'; import { fileURLToPath } from "node:url"; export class Launcher { - private composeuiBinaryFileName = process.platform === 'win32' ? 'ComposeUI-Shell.exe' : 'ComposeUI-Shell'; + private composeuiBinaryFileName = process.platform === 'win32' ? 'MorganStanley.ComposeUI.Shell.exe' : 'MorganStanley.ComposeUI.Shell'; private composeuiBinaryFilePath = process.env.npm_config_composeui_binary_file_path || process.env.COMPOSEUI_BINARY_FILE_PATH || fileURLToPath(new URL(`./../dist/${this.composeuiBinaryFileName}`, import.meta.url)); private processArgs(config?: WindowConfig) {