added yarn rc, fixing imports

Author: jurevans

.yarn/install-state.gz

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

.yarn/releases/yarn-4.6.0.cjs

@@ -12,12 +12,12 @@
     "wasm:cp": "We need to copy wasm to the dist folder, so it can be imported correctly"
   },
   "scripts": {
-    "prepublish": "yarn workspaces focus @namada/sdk && yarn build",
+    "prepublish": "yarn build",
     "prebuild": "rimraf ./dist",
     "wasm:cp": "node ./scripts/copy.js",
-    "build:web": "yarn wasm:build && tspc -p tsconfig.web.json && yarn wasm:cp",
-    "build:node": "yarn wasm:build:node && tspc -p tsconfig.node.json && yarn wasm:node:cp",
-    "build": "yarn prebuild && yarn build:web && yarn build:node",
+    "build:web": "yarn wasm:build && tspc -p tsconfig.web.json",
+    "build:node": "yarn wasm:build:node && tspc -p tsconfig.node.json",
+    "build": "yarn prebuild && yarn build:web && yarn build:node && yarn wasm:cp",
     "wasm:check": "cd ./lib && cargo check && cargo clippy",
     "wasm:ts:node": "tsc -p tsconfig.node.json",
     "wasm:ts:web": "tsc -p tsconfig.web.json",
@@ -26,7 +26,6 @@
     "wasm:build:dev": "yarn wasm:ts:web && node ./scripts/build.js",
     "wasm:build:dev:multicore": "yarn wasm:ts:web && node ./scripts/build.js --multicore",
     "wasm:build:node": "yarn wasm:ts:node && node ./scripts/build.js --target nodejs --release",
-    "test-wasm:ci": "yarn wasm:ts:node && cd ./lib && RUSTFLAGS='--cfg getrandom_backend=\"wasm_js\"' wasm-pack test --node -- --features nodejs --no-default-features",
     "wasm:build:node:multicore": "yarn wasm:ts:node && node ./scripts/build.js --target nodejs --release --multicore",
     "wasm:build:node:dev": "yarn wasm:ts:node && node ./scripts/build.js --target nodejs",
     "wasm:build:node:dev:multicore": "yarn wasm:ts:node && node ./scripts/build.js --target nodejs --multicore",
@@ -36,6 +35,7 @@
     "test:only": "yarn jest",
     "test:cov": "yarn wasm:build:node:dev && yarn jest --coverage",
     "test:watch": "yarn wasm:build:node:dev && yarn jest --watchAll=true",
+    "test-wasm:ci": "yarn wasm:ts:node && cd ./lib && RUSTFLAGS='--cfg getrandom_backend=\"wasm_js\"' wasm-pack test --node -- --features nodejs --no-default-features",
     "test:ci": "jest"
   },
   "dependencies": {
@@ -60,10 +60,12 @@
     "jest": "^29.7.0",
     "rimraf": "^5.0.5",
     "ts-jest": "^29.2.5",
+    "ts-macros": "^2.6.2",
     "ts-node": "^10.9.1",
     "typedoc": "^0.25.12",
     "typedoc-plugin-markdown": "^3.17.1",
     "typescript": "5.5.4",
+    "typescript-transform-paths": "^3.4.7",
     "wasm-pack": "^0.13.0"
   },
   "files": [

.yarnrc.yml

@@ -15,6 +15,9 @@ import { makeBip44Path, makeSaplingPath } from "./utils";
 
 import { NAMADA_COIN_TYPE as coinType } from "types";
 
+// TODO: Fix this!
+type USBDevice = unknown;
+
 export type LedgerAddressAndPublicKey = { address: string; publicKey: string };
 export type LedgerViewingKey = {
   xfvk: Uint8Array;

package.json

@@ -1,5 +1,5 @@
 import { field } from "@dao-xyz/borsh";
-import { RevealPkProps } from "../../tx/types";
+import { RevealPkProps } from "../types";
 
 export class RevealPkMsgValue {
   @field({ type: "string" })

src/ledger.ts

@@ -1,4 +1,4 @@
-import { TxType } from "./web/sdk";
+import { TxType } from "./target/web/sdk";
 
 export type SupportedTx = Extract<
   TxType,

src/types/schema/revealPk.ts

@@ -1,25 +1,30 @@
 {
   "compilerOptions": {
     "allowJs": true,
+    "allowSyntheticDefaultImports": true,
     "baseUrl": "./src",
-    "rootDir": "./src",
-    "outDir": "./dist/",
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
-    "lib": ["dom", "dom.iterable", "esnext"],
+    // "dom" is needed for  WebAssembly typings
+    "lib": ["esnext", "dom"],
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
+    "noEmit": false,
     "noFallthroughCasesInSwitch": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,
+    "sourceMap": true,
     "strict": true,
-    "target": "es2015",
-    "types": ["node", "jest"],
-    "declaration": true
+    "target": "es2015"
   },
-  //TODO: remove .eslintrc after fixing lintstaged
-  "include": ["src", ".eslintrc.js"],
-  "typeRoots": ["./node_modules/@types", "./src/types"]
+  "include": ["src/**/*.ts", "examples/**/*.ts"],
+  "exclude": ["node_modules"],
+  "typeRoots": ["./node_modules/@types"],
+  "ts-node": {
+    "compilerOptions": {
+      "module": "commonjs"
+    }
+  }
 }

src/wasm/types.ts

@@ -1,12 +1,24 @@
 {
-  "include": ["lib/src/**/*.ts"],
+  "extends": "./tsconfig.json",
+  "include": [
+    "./src/**/*.ts"
+  ],
+  "exclude": [
+    "./src/tests/*",
+    "node_modules",
+    "scripts"
+  ],
   "compilerOptions": {
-    "esModuleInterop": true,
+    "declaration": true,
+    "outDir": "dist/node",
     "module": "node16",
     "moduleResolution": "node16",
-    "allowJs": false,
-    "skipLibCheck": true,
-    "noEmit": false,
-    "declaration": false
+    "plugins": [
+      // Transform paths in output .js files
+      { "transform": "typescript-transform-paths" },
+
+      // Transform paths in output .d.ts files (Include this line if you output declarations files)
+      { "transform": "typescript-transform-paths", "afterDeclarations": true }
+    ]
   }
 }

tsconfig.json

@@ -1,12 +1,24 @@
 {
-  "include": ["lib/src/**/*.ts"],
+  "extends": "./tsconfig.json",
+  "include": [
+    "./src/**/*"
+  ],
+  "exclude": [
+    "./src/tests/*.ts",
+    "node_modules",
+    "scripts"
+  ],
   "compilerOptions": {
-    "esModuleInterop": true,
+    "declaration": true,
+    "outDir": "dist/web",
     "module": "esnext",
     "moduleResolution": "bundler",
-    "allowJs": false,
-    "skipLibCheck": true,
-    "noEmit": false,
-    "declaration": false
+    "plugins": [
+      // Transform paths in output .js files
+      { "transform": "typescript-transform-paths" },
+
+      // Transform paths in output .d.ts files (Include this line if you output declarations files)
+      { "transform": "typescript-transform-paths", "afterDeclarations": true }
+    ]
   }
 }