fix(repo): fix generate package script (#17300)

2026-03-02 21:45:14 +01:00 · 2025-02-28 11:12:02 +01:00
parent 38b231a487
commit a13f269b99
25 changed files with 83 additions and 66 deletions
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
        "update-project-references": "yarn tsx ./scripts/updateProjectReferences.ts",
        "verify-project-references": "yarn update-project-references --test",
        "check-workspace-resolutions": "yarn tsx ./scripts/check-workspace-resolutions.ts",
-        "generate-package": "yarn tsx ./scripts/generatePackage.js",
+        "generate-package": "yarn workspace @trezor/scripts generate-package",
        "deps": "rimraf **/node_modules && yarn",
        "depcheck": "yarn nx affected --target=depcheck",
        "list-outdated": "./scripts/list-outdated-dependencies/list-outdated-dependencies.sh",
@@ -139,7 +139,7 @@
        "ts-node": "^10.9.2",
        "tsconfig-paths": "^4.2.0",
        "tslib": "^2.6.2",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "typescript": "5.5.4",
        "version-bump-prompt": "^6.1.0"
    },
--- a/packages/blockchain-link-types/package.json
+++ b/packages/blockchain-link-types/package.json
@@ -24,7 +24,7 @@
        "@trezor/utxo-lib": "workspace:*"
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "peerDependencies": {
        "tslib": "^2.6.2"
--- a/packages/blockchain-link-utils/package.json
+++ b/packages/blockchain-link-utils/package.json
@@ -28,7 +28,7 @@
        "@trezor/blockchain-link-types": "workspace:*",
        "@trezor/eslint": "workspace:*",
        "@trezor/type-utils": "workspace:*",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "peerDependencies": {
        "tslib": "^2.6.2"
--- a/packages/blockchain-link/package.json
+++ b/packages/blockchain-link/package.json
@@ -65,7 +65,7 @@
        "fs-extra": "^11.2.0",
        "html-webpack-plugin": "^5.6.0",
        "tiny-worker": "^2.3.0",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "webpack": "^5.97.1",
        "webpack-cli": "^5.1.4",
        "webpack-dev-server": "^5.0.4",
--- a/packages/connect-common/package.json
+++ b/packages/connect-common/package.json
@@ -46,6 +46,6 @@
        "tslib": "^2.6.2"
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    }
 }
--- a/packages/connect-examples/node/package.json
+++ b/packages/connect-examples/node/package.json
@@ -9,6 +9,6 @@
    },
    "dependencies": {
        "@trezor/connect": "workspace:*",
-        "tsx": "^4.19.2"
+        "tsx": "^4.19.3"
    }
 }
--- a/packages/connect-explorer/package.json
+++ b/packages/connect-explorer/package.json
@@ -55,7 +55,7 @@
        "eslint-plugin-mdx": "^3.1.5",
        "html-webpack-plugin": "^5.6.0",
        "rimraf": "^6.0.1",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "webpack": "^5.97.1",
        "webpack-cli": "^5.1.4"
    }
--- a/packages/connect-mobile/package.json
+++ b/packages/connect-mobile/package.json
@@ -19,7 +19,7 @@
        "prepublish": "yarn tsx ../../scripts/prepublish.js"
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "dependencies": {
        "@trezor/connect": "workspace:^",
--- a/packages/connect-web/package.json
+++ b/packages/connect-web/package.json
@@ -60,7 +60,7 @@
        "rimraf": "^6.0.1",
        "selfsigned": "^2.4.1",
        "terser-webpack-plugin": "^5.3.11",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "webpack": "^5.97.1",
        "webpack-cli": "^5.1.4",
        "webpack-merge": "^6.0.1",
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -113,7 +113,7 @@
        "node-fetch": "^2.6.4",
        "node-libs-browser": "^2.2.1",
        "ts-node": "^10.9.2",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "web3-utils": "^4.3.2",
        "webpack": "^5.97.1",
        "ws": "^8.18.0"
--- a/packages/crypto-utils/package.json
+++ b/packages/crypto-utils/package.json
@@ -38,6 +38,6 @@
        "tslib": "^2.6.2"
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    }
 }
--- a/packages/env-utils/package.json
+++ b/packages/env-utils/package.json
@@ -48,6 +48,6 @@
        }
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    }
 }
--- a/packages/protobuf/package.json
+++ b/packages/protobuf/package.json
@@ -40,7 +40,7 @@
    },
    "devDependencies": {
        "protobufjs-cli": "^1.1.3",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "peerDependencies": {
        "tslib": "^2.6.2"
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -31,6 +31,6 @@
        "tslib": "^2.6.2"
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    }
 }
--- a/packages/schema-utils/package.json
+++ b/packages/schema-utils/package.json
@@ -24,7 +24,7 @@
        "@sinclair/typebox-codegen": "^0.10.4",
        "@trezor/eslint": "workspace:*",
        "ts-node": "^10.9.2",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "dependencies": {
        "@sinclair/typebox": "^0.33.7",
--- a/packages/suite-data/package.json
+++ b/packages/suite-data/package.json
@@ -39,7 +39,7 @@
        "postcss-modules-values": "^4.0.0",
        "simple-git": "^3.27.0",
        "style-loader": "^3.3.4",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "webpack": "^5.97.1",
        "webpack-cli": "^5.1.4"
    },
--- a/packages/suite-web/package.json
+++ b/packages/suite-web/package.json
@@ -46,7 +46,7 @@
        "rimraf": "^6.0.1",
        "stylelint": "^16.14.1",
        "stylelint-config-standard": "^36.0.0",
-        "tsx": "^4.16.3",
+        "tsx": "^4.19.3",
        "webpack": "^5.97.1",
        "ws": "^8.18.0",
        "yargs": "17.7.2"
--- a/packages/transport/package.json
+++ b/packages/transport/package.json
@@ -60,7 +60,7 @@
        "jest": "29.7.0",
        "jest-environment-node": "^29.7.0",
        "ts-node": "^10.9.2",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "dependencies": {
        "@trezor/protobuf": "workspace:*",
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -37,7 +37,7 @@
    },
    "devDependencies": {
        "@trezor/eslint": "workspace:*",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "dependencies": {
        "bignumber.js": "^9.1.2"
--- a/packages/utxo-lib/package.json
+++ b/packages/utxo-lib/package.json
@@ -66,7 +66,7 @@
        "@types/events": "^3.0.3",
        "@types/wif": "^2.0.5",
        "minimaldata": "^1.0.2",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "peerDependencies": {
        "tslib": "^2.6.2"
--- a/packages/websocket-client/package.json
+++ b/packages/websocket-client/package.json
@@ -54,6 +54,6 @@
        "tslib": "^2.6.2"
    },
    "devDependencies": {
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    }
 }
--- a/scripts/generatePackage.ts
+++ b/scripts/generatePackage.ts
@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import fs from 'fs';
 import fsExtra from 'fs-extra';
+import path from 'path';
 import prettier from 'prettier';
 import sortPackageJson from 'sort-package-json';

@@ -25,13 +26,20 @@ const scopes = {
        templatePath: 'package-template/',
        templatePackageJson: templatePackageJsonWeb,
    },
-};
+} as const;

-const exitWithErrorMessage = errorMessage => {
+const exitWithErrorMessage = (errorMessage: string) => {
    console.error(errorMessage);
    process.exit(1);
 };

+const isValidScope = (scope: string): scope is keyof typeof scopes =>
+    Object.keys(scopes).includes(scope);
+
+// Get the directory of the current file
+const currentDir = path.dirname(__filename);
+const rootDir = path.resolve(currentDir, '..');
+
 (async () => {
    const newPackage = process.argv?.[2];
    if (!newPackage || typeof newPackage !== 'string' || !newPackage.includes('/')) {
@@ -44,19 +52,22 @@ const exitWithErrorMessage = errorMessage => {

    const [packageScope, packageName] = newPackage.split('/');

-    const validScopes = Object.keys(scopes);
-    if (!validScopes.includes(packageScope)) {
+    if (!isValidScope(packageScope)) {
        exitWithErrorMessage(
            chalk.bold.red(
-                `Invalid scope ${packageScope}. Please use one of the supported scopes: ${validScopes.join(
-                    ', ',
-                )}`,
+                `Invalid scope ${packageScope}. Please use one of the supported scopes: ${Object.keys(
+                    scopes,
+                ).join(', ')}`,
            ),
        );
    }

-    const { path, templatePath, templatePackageJson } = scopes[packageScope];
-    const packagePath = `${path}/${packageName}`;
+    const {
+        path: scopePath,
+        templatePath,
+        templatePackageJson,
+    } = scopes[packageScope as keyof typeof scopes];
+    const packagePath = path.join(rootDir, scopePath, packageName);

    const workspacesNames = Object.keys(getWorkspacesList());
    if (fs.existsSync(packagePath)) {
@@ -76,12 +87,15 @@ const exitWithErrorMessage = errorMessage => {
    });

    const prettierConfig = await getPrettierConfig();
-    const serializeConfig = config =>
+    const serializeConfig = (config: Record<string, unknown>) =>
        prettier.format(JSON.stringify(config).replace(/\\\\/g, '/'), prettierConfig);
-
    try {
-        fsExtra.copySync(`./scripts/${templatePath}`, packagePath);
-        fs.writeFileSync(`${packagePath}/package.json`, await serializeConfig(packageJson));
+        const templateSourcePath = path.join(currentDir, templatePath);
+        fsExtra.copySync(templateSourcePath, packagePath);
+        fs.writeFileSync(
+            path.join(packagePath, 'package.json'),
+            await serializeConfig(packageJson),
+        );
    } catch (error) {
        exitWithErrorMessage(`${error}\n${chalk.bold.red('Package creation failed.')}`);
    }
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -5,7 +5,8 @@
    "scripts": {
        "depcheck": "yarn g:depcheck",
        "type-check": "yarn g:tsc --build",
-        "run:analytics": "tsx githubAnalytics.ts"
+        "run:analytics": "tsx githubAnalytics.ts",
+        "generate-package": "tsx generatePackage.ts"
    },
    "dependencies": {
        "@mobily/ts-belt": "^3.13.1",
@@ -16,6 +17,7 @@
        "octokit": "3.1.2",
        "prettier": "^3.3.2",
        "sort-package-json": "^1.57.0",
+        "tsx": "^4.19.3",
        "yargs": "17.7.2"
    },
    "devDependencies": {
--- a/suite-common/message-system/package.json
+++ b/suite-common/message-system/package.json
@@ -34,7 +34,7 @@
    "devDependencies": {
        "@suite-common/test-utils": "workspace:*",
        "@types/fs-extra": "^11.0.4",
-        "tsx": "^4.16.3"
+        "tsx": "^4.19.3"
    },
    "nx": {
        "targets": {
--- a/yarn.lock
+++ b/yarn.lock
@@ -9538,7 +9538,7 @@ __metadata:
    react: "npm:18.2.0"
    react-redux: "npm:8.0.7"
    semver: "npm:^7.6.3"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  languageName: unknown
  linkType: soft

@@ -11531,7 +11531,7 @@ __metadata:
    "@solana/web3.js": "npm:^2.0.0"
    "@trezor/type-utils": "workspace:*"
    "@trezor/utxo-lib": "workspace:*"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -11547,7 +11547,7 @@ __metadata:
    "@trezor/eslint": "workspace:*"
    "@trezor/type-utils": "workspace:*"
    "@trezor/utils": "workspace:*"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -11577,7 +11577,7 @@ __metadata:
    ripple-lib: "npm:^1.10.1"
    socks-proxy-agent: "npm:8.0.4"
    tiny-worker: "npm:^2.3.0"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    webpack: "npm:^5.97.1"
    webpack-cli: "npm:^5.1.4"
    webpack-dev-server: "npm:^5.0.4"
@@ -11685,7 +11685,7 @@ __metadata:
  dependencies:
    "@trezor/env-utils": "workspace:*"
    "@trezor/utils": "workspace:*"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -11784,7 +11784,7 @@ __metadata:
    rimraf: "npm:^6.0.1"
    styled-components: "npm:^6.1.8"
    swr: "npm:^2.2.5"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    webpack: "npm:^5.97.1"
    webpack-cli: "npm:^5.1.4"
  languageName: unknown
@@ -11820,7 +11820,7 @@ __metadata:
  dependencies:
    "@trezor/connect": "workspace:^"
    "@trezor/utils": "workspace:^"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -11946,7 +11946,7 @@ __metadata:
    rimraf: "npm:^6.0.1"
    selfsigned: "npm:^2.4.1"
    terser-webpack-plugin: "npm:^5.3.11"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    webpack: "npm:^5.97.1"
    webpack-cli: "npm:^5.1.4"
    webpack-merge: "npm:^6.0.1"
@@ -12034,7 +12034,7 @@ __metadata:
    node-fetch: "npm:^2.6.4"
    node-libs-browser: "npm:^2.2.1"
    ts-node: "npm:^10.9.2"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    web3-utils: "npm:^4.3.2"
    webpack: "npm:^5.97.1"
    ws: "npm:^8.18.0"
@@ -12047,7 +12047,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@trezor/crypto-utils@workspace:packages/crypto-utils"
  dependencies:
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -12081,7 +12081,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@trezor/env-utils@workspace:packages/env-utils"
  dependencies:
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    ua-parser-js: "npm:^1.0.37"
  peerDependencies:
    expo-constants: "*"
@@ -12179,7 +12179,7 @@ __metadata:
    long: "npm:5.2.0"
    protobufjs: "npm:7.4.0"
    protobufjs-cli: "npm:^1.1.3"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -12189,7 +12189,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@trezor/protocol@workspace:packages/protocol"
  dependencies:
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -12239,7 +12239,7 @@ __metadata:
    "@trezor/eslint": "workspace:*"
    ts-mixer: "npm:^6.0.3"
    ts-node: "npm:^10.9.2"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -12259,6 +12259,7 @@ __metadata:
    octokit: "npm:3.1.2"
    prettier: "npm:^3.3.2"
    sort-package-json: "npm:^1.57.0"
+    tsx: "npm:^4.19.3"
    yargs: "npm:17.7.2"
  languageName: unknown
  linkType: soft
@@ -12355,7 +12356,7 @@ __metadata:
    postcss-modules-values: "npm:^4.0.0"
    simple-git: "npm:^3.27.0"
    style-loader: "npm:^3.3.4"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    webpack: "npm:^5.97.1"
    webpack-cli: "npm:^5.1.4"
  languageName: unknown
@@ -12541,7 +12542,7 @@ __metadata:
    styled-components: "npm:^6.1.8"
    stylelint: "npm:^16.14.1"
    stylelint-config-standard: "npm:^36.0.0"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    webpack: "npm:^5.97.1"
    worker-loader: "npm:^3.0.8"
    ws: "npm:^8.18.0"
@@ -12766,7 +12767,7 @@ __metadata:
    jest: "npm:29.7.0"
    jest-environment-node: "npm:^29.7.0"
    ts-node: "npm:^10.9.2"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    usb: "npm:^2.14.0"
  peerDependencies:
    tslib: ^2.6.2
@@ -12803,7 +12804,7 @@ __metadata:
  dependencies:
    "@trezor/eslint": "workspace:*"
    bignumber.js: "npm:^9.1.2"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
  peerDependencies:
    tslib: ^2.6.2
  languageName: unknown
@@ -12836,7 +12837,7 @@ __metadata:
    minimaldata: "npm:^1.0.2"
    pushdata-bitcoin: "npm:^1.0.1"
    tiny-secp256k1: "npm:^1.1.6"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    typeforce: "npm:^1.18.0"
    varuint-bitcoin: "npm:2.0.0"
    wif: "npm:^5.0.0"
@@ -12862,7 +12863,7 @@ __metadata:
  resolution: "@trezor/websocket-client@workspace:packages/websocket-client"
  dependencies:
    "@trezor/utils": "workspace:*"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    ws: "npm:^8.18.0"
  peerDependencies:
    tslib: ^2.6.2
@@ -18814,7 +18815,7 @@ __metadata:
  resolution: "connect-example-node@workspace:packages/connect-examples/node"
  dependencies:
    "@trezor/connect": "workspace:*"
-    tsx: "npm:^4.19.2"
+    tsx: "npm:^4.19.3"
  languageName: unknown
  linkType: soft

@@ -21778,7 +21779,7 @@ __metadata:
  languageName: node
  linkType: hard

-"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0":
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0, esbuild@npm:~0.25.0":
  version: 0.25.0
  resolution: "esbuild@npm:0.25.0"
  dependencies:
@@ -21944,7 +21945,7 @@ __metadata:
  languageName: node
  linkType: hard

-"esbuild@npm:^0.23.1, esbuild@npm:~0.23.0":
+"esbuild@npm:^0.23.1":
  version: 0.23.1
  resolution: "esbuild@npm:0.23.1"
  dependencies:
@@ -40736,7 +40737,7 @@ __metadata:
    ts-node: "npm:^10.9.2"
    tsconfig-paths: "npm:^4.2.0"
    tslib: "npm:^2.6.2"
-    tsx: "npm:^4.16.3"
+    tsx: "npm:^4.19.3"
    typescript: "npm:5.5.4"
    version-bump-prompt: "npm:^6.1.0"
  dependenciesMeta:
@@ -40973,11 +40974,11 @@ __metadata:
  languageName: node
  linkType: hard

-"tsx@npm:^4.16.3, tsx@npm:^4.19.2":
-  version: 4.19.2
-  resolution: "tsx@npm:4.19.2"
+"tsx@npm:^4.19.3":
+  version: 4.19.3
+  resolution: "tsx@npm:4.19.3"
  dependencies:
-    esbuild: "npm:~0.23.0"
+    esbuild: "npm:~0.25.0"
    fsevents: "npm:~2.3.3"
    get-tsconfig: "npm:^4.7.5"
  dependenciesMeta:
@@ -40985,7 +40986,7 @@ __metadata:
      optional: true
  bin:
    tsx: dist/cli.mjs
-  checksum: 10/4c5610ed1fb2f80d766681f8ac7827e1e8118dfe354c18f74800691f3ef1e9ed676a29842ab818806bcf8613cdc97c6af84b5645e768ddb7f4b0527b9100deda
+  checksum: 10/a7e7f41e5593b242772050abacf51908aa8a6d4d9ea6c29e80161eb557d664a0f4cc8d38d0c8c151fddb6c2e9e337af27ba0e269c9707ccd7eeff0e0ea7fcf98
  languageName: node
  linkType: hard