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

Node.js v22 Upgrade #934

Open
wants to merge 5 commits into
base: feat/fdc3-2_0-conformance
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 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/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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 }}

Expand All @@ -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 }}

Expand All @@ -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/
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions src/shell/js/composeui-node-launcher/src/cli/install.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env node

"use strict";

import path from 'path';
import fs from 'fs';
Expand All @@ -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';

Expand Down