From cb5e1c77321fd98701945db90037e797d8481632 Mon Sep 17 00:00:00 2001 From: SIDANWhatever Date: Thu, 15 Aug 2024 00:58:07 +0800 Subject: [PATCH 1/2] fix: fixing nextjs strica package import --- package-lock.json | 14 -------------- .../src/stricahq/bip32ed25519/wrapper.ts | 14 +++++++++----- .../mesh-core-cst/src/stricahq/cbors/wrapper.ts | 7 ++++--- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5511423..648a1f70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1232,13 +1232,6 @@ "which", "write-file-atomic" ], - "workspaces": [ - "docs", - "smoke-tests", - "mock-globals", - "mock-registry", - "workspaces/*" - ], "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/arborist": "^6.5.0", @@ -14870,13 +14863,6 @@ "which", "write-file-atomic" ], - "workspaces": [ - "docs", - "smoke-tests", - "mock-globals", - "mock-registry", - "workspaces/*" - ], "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/arborist": "^7.5.4", diff --git a/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts b/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts index b94607ec..a47cce74 100644 --- a/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts +++ b/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts @@ -1,7 +1,11 @@ import * as cjsBip32ed25519 from "@stricahq/bip32ed25519"; // This ensures that TypeScript understands the types properly -export const bip32ed25519 = cjsBip32ed25519; + +export const bip32ed25519: typeof cjsBip32ed25519 & { + default?: typeof cjsBip32ed25519; +} = cjsBip32ed25519; +const exportedBip32ed25519 = bip32ed25519?.default || bip32ed25519; // Export individual classes and types export type StricaPrivateKey = cjsBip32ed25519.PrivateKey; @@ -9,7 +13,7 @@ export type StricaPublicKey = cjsBip32ed25519.PublicKey; export type StricaBip32PrivateKey = cjsBip32ed25519.Bip32PrivateKey; export type StricaBip32PublicKey = cjsBip32ed25519.Bip32PublicKey; -export const StricaPrivateKey = cjsBip32ed25519.PrivateKey; -export const StricaPublicKey = cjsBip32ed25519.PublicKey; -export const StricaBip32PrivateKey = cjsBip32ed25519.Bip32PrivateKey; -export const StricaBip32PublicKey = cjsBip32ed25519.Bip32PublicKey; +export const StricaPrivateKey = exportedBip32ed25519.PrivateKey; +export const StricaPublicKey = exportedBip32ed25519.PublicKey; +export const StricaBip32PrivateKey = exportedBip32ed25519.Bip32PrivateKey; +export const StricaBip32PublicKey = exportedBip32ed25519.Bip32PublicKey; diff --git a/packages/mesh-core-cst/src/stricahq/cbors/wrapper.ts b/packages/mesh-core-cst/src/stricahq/cbors/wrapper.ts index 90eb7057..8d7335ab 100644 --- a/packages/mesh-core-cst/src/stricahq/cbors/wrapper.ts +++ b/packages/mesh-core-cst/src/stricahq/cbors/wrapper.ts @@ -1,8 +1,9 @@ import * as cjsCbors from "@stricahq/cbors"; -export const cbors = cjsCbors; +export const cbors: typeof cjsCbors & { default?: typeof cjsCbors } = cjsCbors; +const exportedCbors = cbors?.default || cbors; -export const StricaEncoder = cjsCbors.Encoder; +export const StricaEncoder = exportedCbors.Encoder; -export const StricaDecoder = cjsCbors.Decoder; +export const StricaDecoder = exportedCbors.Decoder; export type StricaDecoder = cjsCbors.Decoder; From 149caab6258b264082610074cbd4959f1cde8463 Mon Sep 17 00:00:00 2001 From: "Hong Jing (Jingles)" Date: Thu, 15 Aug 2024 08:14:54 +0800 Subject: [PATCH 2/2] bump version and clean up --- apps/docs/package.json | 2 +- apps/playground/package.json | 2 +- package-lock.json | 19 ++++-- packages/mesh-common/package.json | 2 +- packages/mesh-contract/package.json | 2 +- packages/mesh-core-csl/package.json | 2 +- packages/mesh-core-cst/package.json | 2 +- .../src/stricahq/bip32ed25519/wrapper.ts | 1 - packages/mesh-core/package.json | 2 +- packages/mesh-provider/package.json | 2 +- packages/mesh-react/package.json | 2 +- packages/mesh-transaction/package.json | 2 +- packages/mesh-wallet/package.json | 2 +- turbo.json | 61 +++++-------------- 14 files changed, 40 insertions(+), 63 deletions(-) diff --git a/apps/docs/package.json b/apps/docs/package.json index ddb41450..151d009a 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -1,5 +1,5 @@ { - "name": "@meshsdk/docs", + "name": "docs", "version": "0.1.0", "private": true, "scripts": { diff --git a/apps/playground/package.json b/apps/playground/package.json index cfb70d27..2d7a48ba 100644 --- a/apps/playground/package.json +++ b/apps/playground/package.json @@ -1,5 +1,5 @@ { - "name": "@meshsdk/playground", + "name": "playground", "version": "1.0.0", "private": true, "scripts": { diff --git a/package-lock.json b/package-lock.json index 648a1f70..120ad613 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8874,6 +8874,7 @@ "version": "3.9.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, "funding": [ { "type": "github", @@ -11928,7 +11929,8 @@ "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true }, "node_modules/html-escaper": { "version": "2.0.2", @@ -14757,6 +14759,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -14768,6 +14771,7 @@ "version": "5.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, "bin": { "semver": "bin/semver" } @@ -18978,6 +18982,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -18986,12 +18991,14 @@ "node_modules/spdx-exceptions": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==" + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true }, "node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -19000,7 +19007,8 @@ "node_modules/spdx-license-ids": { "version": "3.0.18", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", - "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==" + "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", + "dev": true }, "node_modules/split-ca": { "version": "1.0.1", @@ -20598,6 +20606,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -20953,6 +20962,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" @@ -20964,7 +20974,8 @@ "node_modules/write-file-atomic/node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true }, "node_modules/ws": { "version": "7.5.10", diff --git a/packages/mesh-common/package.json b/packages/mesh-common/package.json index efb59d03..7be0b579 100644 --- a/packages/mesh-common/package.json +++ b/packages/mesh-common/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/common", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-contract/package.json b/packages/mesh-contract/package.json index 5d2ad74d..d6253d4b 100644 --- a/packages/mesh-contract/package.json +++ b/packages/mesh-contract/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/contract", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-core-csl/package.json b/packages/mesh-core-csl/package.json index 36cb2c63..809f2c3a 100644 --- a/packages/mesh-core-csl/package.json +++ b/packages/mesh-core-csl/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/core-csl", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-core-cst/package.json b/packages/mesh-core-cst/package.json index ee82609f..2a9b53e6 100644 --- a/packages/mesh-core-cst/package.json +++ b/packages/mesh-core-cst/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/core-cst", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts b/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts index a47cce74..bdbd5b1d 100644 --- a/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts +++ b/packages/mesh-core-cst/src/stricahq/bip32ed25519/wrapper.ts @@ -1,7 +1,6 @@ import * as cjsBip32ed25519 from "@stricahq/bip32ed25519"; // This ensures that TypeScript understands the types properly - export const bip32ed25519: typeof cjsBip32ed25519 & { default?: typeof cjsBip32ed25519; } = cjsBip32ed25519; diff --git a/packages/mesh-core/package.json b/packages/mesh-core/package.json index e59de1f5..7be15e4e 100644 --- a/packages/mesh-core/package.json +++ b/packages/mesh-core/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/core", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-provider/package.json b/packages/mesh-provider/package.json index 6f10e211..7d8087df 100644 --- a/packages/mesh-provider/package.json +++ b/packages/mesh-provider/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/provider", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-react/package.json b/packages/mesh-react/package.json index 72521a76..bcb48f38 100644 --- a/packages/mesh-react/package.json +++ b/packages/mesh-react/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/react", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-transaction/package.json b/packages/mesh-transaction/package.json index 3c60af59..4348972f 100644 --- a/packages/mesh-transaction/package.json +++ b/packages/mesh-transaction/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/transaction", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/packages/mesh-wallet/package.json b/packages/mesh-wallet/package.json index b6cf91e4..bf50aa0b 100644 --- a/packages/mesh-wallet/package.json +++ b/packages/mesh-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@meshsdk/wallet", - "version": "1.6.6", + "version": "1.6.7", "description": "", "main": "./dist/index.cjs", "module": "./dist/index.js", diff --git a/turbo.json b/turbo.json index 0f33ee1c..2807464f 100644 --- a/turbo.json +++ b/turbo.json @@ -1,57 +1,28 @@ { "$schema": "https://turbo.build/schema.json", - "globalDependencies": [ - "**/.env.*local" - ], + "globalDependencies": ["**/.env.*local"], "tasks": { "build": { - "dependsOn": [ - "^build:mesh", - "^build:docs", - "^build:apps" - ], - "outputs": [ - "dist/**", - ".next/**", - "!.next/cache/**" - ] + "dependsOn": ["^build:mesh", "^build:docs", "^build:apps"], + "outputs": ["dist/**", ".next/**", "!.next/cache/**"] }, "build:apps": { - "dependsOn": [ - "^build:mesh", - "^build:docs", - "^build:apps" - ], - "outputs": [ - "dist/**" - ] + "dependsOn": ["^build:mesh", "^build:docs", "^build:apps"], + "outputs": ["dist/**", ".next/**", "!.next/cache/**"] }, "build:docs": { - "dependsOn": [ - "^build:mesh", - "^build:docs" - ], - "outputs": [ - "dist/**" - ] + "dependsOn": ["^build:mesh", "^build:docs"], + "outputs": ["dist/**"] }, "build:mesh": { - "dependsOn": [ - "^build:mesh" - ], - "outputs": [ - "dist/**" - ] + "dependsOn": ["^build:mesh"], + "outputs": ["dist/**"] }, "lint": { - "dependsOn": [ - "^lint" - ] + "dependsOn": ["^lint"] }, "dev": { - "dependsOn": [ - "^build" - ], + "dependsOn": ["^build"], "cache": false, "persistent": true }, @@ -59,18 +30,14 @@ "cache": false }, "pack": { - "dependsOn": [ - "^build" - ], + "dependsOn": ["^build"], "cache": false }, "format": { - "outputs": [ - "node_modules/.cache/.prettiercache" - ], + "outputs": ["node_modules/.cache/.prettiercache"], "outputLogs": "new-only" }, "test": {} }, "ui": "tui" -} \ No newline at end of file +}