From 0bde4dfc843be997142834264386a6e013c9a923 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Wed, 2 Apr 2025 11:41:27 +0200 Subject: [PATCH 1/2] update to node v20 --- .github/workflows/ci-build-ts.yml | 2 +- .github/workflows/ci-lint-typescript.yml | 2 +- .github/workflows/ci-nym-network-explorer.yml | 2 +- .github/workflows/ci-sdk-wasm.yml | 2 +- .github/workflows/nightly-build.yml | 2 +- .github/workflows/nightly-nym-wallet-build.yml | 2 +- .github/workflows/nightly-security-audit.yml | 2 +- .github/workflows/publish-sdk-npm.yml | 2 +- .github/workflows/release-calculate-hash.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-build-ts.yml b/.github/workflows/ci-build-ts.yml index 934f855c5f..c596cfdb6f 100644 --- a/.github/workflows/ci-build-ts.yml +++ b/.github/workflows/ci-build-ts.yml @@ -19,7 +19,7 @@ jobs: - uses: rlespinasse/github-slug-action@v3.x - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Setup yarn run: npm install -g yarn - name: Build diff --git a/.github/workflows/ci-lint-typescript.yml b/.github/workflows/ci-lint-typescript.yml index 1c8586a006..f71f16451c 100644 --- a/.github/workflows/ci-lint-typescript.yml +++ b/.github/workflows/ci-lint-typescript.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Setup yarn run: npm install -g yarn diff --git a/.github/workflows/ci-nym-network-explorer.yml b/.github/workflows/ci-nym-network-explorer.yml index b1cb2d9de3..56bb0e1b2d 100644 --- a/.github/workflows/ci-nym-network-explorer.yml +++ b/.github/workflows/ci-nym-network-explorer.yml @@ -22,7 +22,7 @@ jobs: - uses: rlespinasse/github-slug-action@v3.x - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Setup yarn run: npm install -g yarn continue-on-error: true diff --git a/.github/workflows/ci-sdk-wasm.yml b/.github/workflows/ci-sdk-wasm.yml index 8f9eaeeeba..9c9507a944 100644 --- a/.github/workflows/ci-sdk-wasm.yml +++ b/.github/workflows/ci-sdk-wasm.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - uses: actions-rs/toolchain@v1 with: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index c5c68a4614..2c4868c25b 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -106,7 +106,7 @@ jobs: uses: actions/setup-node@v4 if: env.WORKFLOW_CONCLUSION == 'failure' with: - node-version: 18 + node-version: 20 - name: Matrix - Node Install if: env.WORKFLOW_CONCLUSION == 'failure' run: npm install diff --git a/.github/workflows/nightly-nym-wallet-build.yml b/.github/workflows/nightly-nym-wallet-build.yml index 232a1273ef..506227265d 100644 --- a/.github/workflows/nightly-nym-wallet-build.yml +++ b/.github/workflows/nightly-nym-wallet-build.yml @@ -68,7 +68,7 @@ jobs: uses: actions/setup-node@v4 if: env.WORKFLOW_CONCLUSION == 'failure' with: - node-version: 18 + node-version: 20 - name: Matrix - Node Install if: env.WORKFLOW_CONCLUSION == 'failure' run: npm install diff --git a/.github/workflows/nightly-security-audit.yml b/.github/workflows/nightly-security-audit.yml index 76806575e0..189b7a0462 100644 --- a/.github/workflows/nightly-security-audit.yml +++ b/.github/workflows/nightly-security-audit.yml @@ -38,7 +38,7 @@ jobs: - name: install npm uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Matrix - Node Install run: npm install working-directory: .github/workflows/support-files diff --git a/.github/workflows/publish-sdk-npm.yml b/.github/workflows/publish-sdk-npm.yml index c3d4ef3fc7..824b21c752 100644 --- a/.github/workflows/publish-sdk-npm.yml +++ b/.github/workflows/publish-sdk-npm.yml @@ -11,7 +11,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 registry-url: "https://registry.npmjs.org" - name: Setup yarn diff --git a/.github/workflows/release-calculate-hash.yml b/.github/workflows/release-calculate-hash.yml index f1a53c09c7..6ea33e821a 100644 --- a/.github/workflows/release-calculate-hash.yml +++ b/.github/workflows/release-calculate-hash.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - uses: nymtech/nym/.github/actions/nym-hash-releases@develop env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 99d8aebea91d1659e31d8c500ea5c519b8427e23 Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Wed, 2 Apr 2025 13:08:16 +0100 Subject: [PATCH 2/2] fix build --- .github/workflows/ci-nym-network-explorer.yml | 92 -------------- package.json | 117 +++++++++--------- .../src/index.tsx | 9 +- 3 files changed, 63 insertions(+), 155 deletions(-) delete mode 100644 .github/workflows/ci-nym-network-explorer.yml diff --git a/.github/workflows/ci-nym-network-explorer.yml b/.github/workflows/ci-nym-network-explorer.yml deleted file mode 100644 index 56bb0e1b2d..0000000000 --- a/.github/workflows/ci-nym-network-explorer.yml +++ /dev/null @@ -1,92 +0,0 @@ -name: ci-nym-network-explorer - -on: - workflow_dispatch: - push: - paths: - - 'explorer/**' - - '.github/workflows/ci-nym-network-explorer.yml' - -defaults: - run: - working-directory: explorer - -jobs: - build: - runs-on: custom-linux - steps: - - uses: actions/checkout@v4 - - name: Install rsync - run: sudo apt-get install rsync - continue-on-error: true - - uses: rlespinasse/github-slug-action@v3.x - - uses: actions/setup-node@v4 - with: - node-version: 20 - - name: Setup yarn - run: npm install -g yarn - continue-on-error: true - - name: Build shared packages - run: cd .. && yarn && yarn build - - name: Set environment from the example - run: cp .env.prod .env -# - run: yarn test -# continue-on-error: true - - run: yarn && yarn build - continue-on-error: true - - run: yarn storybook:build - name: Build storybook - - name: Deploy branch to CI www - continue-on-error: true - uses: easingthemes/ssh-deploy@main - env: - SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }} - ARGS: "-rltgoDzvO --delete" - SOURCE: "explorer/dist/" - REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }} - REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }} - TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/network-explorer-${{ env.GITHUB_REF_SLUG }} - EXCLUDE: "/dist/, /node_modules/" - - name: Deploy storybook to CI www - continue-on-error: true - uses: easingthemes/ssh-deploy@main - env: - SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }} - ARGS: "-rltgoDzvO --delete" - SOURCE: "explorer/storybook-static/" - REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }} - REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }} - TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/ne-sb-${{ env.GITHUB_REF_SLUG }} - EXCLUDE: "/dist/, /node_modules/" - - name: Matrix - Node Install - run: npm install - working-directory: .github/workflows/support-files - - name: Matrix - Send Notification - env: - NYM_NOTIFICATION_KIND: network-explorer - NYM_PROJECT_NAME: "Network Explorer" - NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}" - NYM_CI_WWW_LOCATION: "network-explorer-${{ env.GITHUB_REF_SLUG }}" - NYM_CI_WWW_LOCATION_STORYBOOK: "ne-sb-${{ env.GITHUB_REF_SLUG }}" - GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}" - GIT_BRANCH: "${GITHUB_REF##*/}" - IS_SUCCESS: "${{ job.status == 'success' }}" - MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}" - MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}" - MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}" - MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}" - MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}" - uses: docker://keybaseio/client:stable-node - with: - args: .github/workflows/support-files/notifications/entry_point.sh - - name: Deploy - if: github.event_name == 'workflow_dispatch' - uses: easingthemes/ssh-deploy@main - env: - SSH_PRIVATE_KEY: ${{ secrets.CD_PROD_NE_SSH_PRIVATE_KEY }} - ARGS: "-rltgoDzvO --delete" - SOURCE: "explorer/dist/" - REMOTE_HOST: ${{ secrets.CD_PROD_NE_REMOTE_HOST }} - REMOTE_USER: ${{ secrets.CD_PROD_NE_REMOTE_USER }} - TARGET: ${{ secrets.CD_PROD_NE_REMOTE_TARGET }} - EXCLUDE: "/dist/, /node_modules/" diff --git a/package.json b/package.json index afd6cf2240..dbf9d0561b 100644 --- a/package.json +++ b/package.json @@ -1,61 +1,60 @@ { - "name": "@nymproject/nymsphere", - "version": "1.0.0", - "private": true, - "license": "Apache 2.0", - "workspaces": [ - "dist/wasm/**", - "dist/node/**", - "dist/ts/**", - "sdk/typescript/packages/mui-theme", - "sdk/typescript/packages/react-components", - "sdk/typescript/packages/validator-client", - "ts-packages/*", - "nym-wallet", - "explorer", - "explorer-nextjs", - "explorer-v2", - "types", - "clients/validator" - ], - "scripts": { - "nuke": "npx rimraf **/node_modules node_modules", - "scrub": "npx rimraf **/dist dist", - "clean": "lerna run clean", - "build": "run-s build:types build:packages", - "build:wasm": "make sdk-wasm-build", - "build:types": "lerna run --scope @nymproject/types build --stream", - "build:packages": "run-s build:packages:theme build:packages:react", - "build:packages:theme": "lerna run --scope @nymproject/mui-theme build", - "build:packages:react": "lerna run --scope @nymproject/react build", - "build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream", - "build:playground": "lerna run --scope @nymproject/react storybook:build --stream", - "build:ci:storybook": "yarn build && yarn dev:on && run-p build:react-example build:playground && yarn build:ci:storybook:collect-artifacts", - "build:ci:storybook:collect-artifacts": "mkdir -p ts-packages/dist && mv sdk/typescript/packages/react-components/storybook-static ts-packages/dist/storybook && mv sdk/typescript/examples/react/mui-theme/dist ts-packages/dist/example", - "prebuild:ci": "yarn dev:on && yarn", - "build:ci": "run-s build:types build:packages build:wasm build:ci:sdk", - "postbuild:ci": "yarn dev:off", - "build:ci:sdk": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/contract-clients,@nymproject/sdk-react,@nymproject/mix-fetch,@nymproject/nodejs-client,@nymproject/mix-fetch-node}' build --stream", - "docs:prod:build": "run-s docs:prod:build:ws", - "docs:prod:build:ws": "lerna run docs:prod:build --stream", - "sdk:build": "./sdk/typescript/scripts/build-prod-sdk.sh", - "sdk:publish": "./sdk/typescript/scripts/publish.sh", - "lint": "lerna run lint --stream", - "lint:fix": "lerna run lint:fix --stream", - "tsc": "lerna run tsc --stream", - "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", - "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", - "dev:on": "node sdk/typescript/scripts/dev-mode-add.mjs", - "dev:off": "node sdk/typescript/scripts/dev-mode-remove.mjs" - }, - "devDependencies": { - "@npmcli/node-gyp": "^3.0.0", - "lerna": "^7.3.0", - "node-gyp": "^9.3.1", - "npm-run-all": "^4.1.5", - "tslog": "3.3.3" - }, - "dependencies": { - "lucide-react": "^0.453.0" - } + "name": "@nymproject/nymsphere", + "version": "1.0.0", + "private": true, + "license": "Apache 2.0", + "workspaces": [ + "dist/wasm/**", + "dist/node/**", + "dist/ts/**", + "sdk/typescript/packages/mui-theme", + "sdk/typescript/packages/react-components", + "sdk/typescript/packages/validator-client", + "ts-packages/*", + "nym-wallet", + "explorer-nextjs", + "explorer-v2", + "types", + "clients/validator" + ], + "scripts": { + "nuke": "npx rimraf **/node_modules node_modules", + "scrub": "npx rimraf **/dist dist", + "clean": "lerna run clean", + "build": "run-s build:types build:packages", + "build:wasm": "make sdk-wasm-build", + "build:types": "lerna run --scope @nymproject/types build --stream", + "build:packages": "run-s build:packages:theme build:packages:react", + "build:packages:theme": "lerna run --scope @nymproject/mui-theme build", + "build:packages:react": "lerna run --scope @nymproject/react build", + "build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream", + "build:playground": "lerna run --scope @nymproject/react storybook:build --stream", + "build:ci:storybook": "yarn build && yarn dev:on && run-p build:react-example build:playground && yarn build:ci:storybook:collect-artifacts", + "build:ci:storybook:collect-artifacts": "mkdir -p ts-packages/dist && mv sdk/typescript/packages/react-components/storybook-static ts-packages/dist/storybook && mv sdk/typescript/examples/react/mui-theme/dist ts-packages/dist/example", + "prebuild:ci": "yarn dev:on && yarn", + "build:ci": "run-s build:types build:packages build:wasm build:ci:sdk", + "postbuild:ci": "yarn dev:off", + "build:ci:sdk": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/contract-clients,@nymproject/sdk-react,@nymproject/mix-fetch,@nymproject/nodejs-client,@nymproject/mix-fetch-node}' build --stream", + "docs:prod:build": "run-s docs:prod:build:ws", + "docs:prod:build:ws": "lerna run docs:prod:build --stream", + "sdk:build": "./sdk/typescript/scripts/build-prod-sdk.sh", + "sdk:publish": "./sdk/typescript/scripts/publish.sh", + "lint": "lerna run lint --stream", + "lint:fix": "lerna run lint:fix --stream", + "tsc": "lerna run tsc --stream", + "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", + "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", + "dev:on": "node sdk/typescript/scripts/dev-mode-add.mjs", + "dev:off": "node sdk/typescript/scripts/dev-mode-remove.mjs" + }, + "devDependencies": { + "@npmcli/node-gyp": "^3.0.0", + "lerna": "^7.3.0", + "node-gyp": "^9.3.1", + "npm-run-all": "^4.1.5", + "tslog": "3.3.3" + }, + "dependencies": { + "lucide-react": "^0.453.0" + } } diff --git a/sdk/typescript/examples/chat-app/react-webpack-with-theme-example/src/index.tsx b/sdk/typescript/examples/chat-app/react-webpack-with-theme-example/src/index.tsx index 1c6b557d7e..778645ad4e 100644 --- a/sdk/typescript/examples/chat-app/react-webpack-with-theme-example/src/index.tsx +++ b/sdk/typescript/examples/chat-app/react-webpack-with-theme-example/src/index.tsx @@ -1,5 +1,6 @@ -import * as React from 'react'; -import ReactDOM from 'react-dom'; -import { App } from './App'; +import * as React from "react"; +import ReactDOM from "react-dom/client"; +import { App } from "./App"; -ReactDOM.render(, document.getElementById('app')); +const root = ReactDOM.createRoot(document.getElementById("app") as HTMLElement); +root.render();