Merge pull request #6 from jordansexton/fix-extensions

Fix ESM and CJS builds
WalletConnect · Sep 20, 2022 · db88374 · db88374
2 parents 707d78b + 81c4cbc
commit db88374
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 4,526 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -3,10 +3,30 @@
     "extends": [
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
-        "plugin:prettier/recommended"
+        "plugin:prettier/recommended",
+        "plugin:require-extensions/recommended"
     ],
     "parser": "@typescript-eslint/parser",
     "plugins": [
-        "@typescript-eslint"
+        "@typescript-eslint",
+        "prettier",
+        "require-extensions"
+    ],
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
+    "rules": {
+    },
+    "overrides": [
+        {
+            "files": [
+                "packages/app/**/*"
+            ],
+            "rules": {
+                "require-extensions/require-extensions": "off"
+            }
+        }
     ]
 }
diff --git a/package.json b/package.json
@@ -4,14 +4,18 @@
         "pnpm": ">=7"
     },
     "scripts": {
-        "clean": "pnpm --recursive run clean",
-        "build": "pnpm --recursive run prebuild && tsc --build && pnpm --recursive run build",
-        "watch": "pnpm --recursive run prebuild && tsc --build --watch",
-        "fmt": "prettier --write '{*,**/*}.{ts,tsx,js,jsx,json}'",
-        "lint": "prettier --check '{*,**/*}.{ts,tsx,js,jsx,json}' && eslint",
-        "lint:fix": "pnpm fmt && eslint --fix",
         "nuke": "shx rm -rf node_modules pnpm-lock.yaml packages/*/*/node_modules packages/*/*/pnpm-lock.yaml || true",
-        "reinstall": "pnpm nuke && pnpm install"
+        "reinstall": "pnpm nuke && pnpm install",
+        "clean": "pnpm --recursive run clean && shx rm -rf **/*.tsbuildinfo",
+        "build": "pnpm run build:ts && pnpm run build:other",
+        "build:ts": "tsc --build --verbose",
+        "build:other": "pnpm --recursive run build",
+        "package": "pnpm --recursive run package",
+        "release": "pnpm run clean && pnpm run build:ts && pnpm run package && pnpm run build:other",
+        "watch": "tsc --build --verbose --watch",
+        "fmt": "prettier --write '{*,**/*}.{ts,tsx,js,jsx,json}'",
+        "lint": "prettier --check '{*,**/*}.{ts,tsx,js,jsx,json}' && eslint .",
+        "lint:fix": "pnpm run fmt && eslint --fix ."
     },
     "devDependencies": {
         "@types/node": "^18.6.4",
@@ -20,6 +24,7 @@
         "eslint": "^8.20.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-require-extensions": "^0.1.1",
         "pnpm": "^7.8.0",
         "prettier": "^2.7.1",
         "shx": "^0.3.4",

diff --git a/packages/walletconnect-solana/package.json b/packages/walletconnect-solana/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@jnwng/walletconnect-solana",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "license": "Apache-2.0",
     "type": "module",
     "sideEffects": false,
@@ -22,10 +22,10 @@
     },
     "scripts": {
         "clean": "shx mkdir -p lib && shx rm -rf lib",
-        "prebuild": "pnpm run clean"
+        "package": "shx echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json"
     },
     "devDependencies": {
-        "@solana/web3.js": "1.50.1",
+        "@solana/web3.js": "^1.52.0",
         "@types/node-fetch": "^2.6.2",
         "@types/pino": "6.3.11",
         "@walletconnect/types": "2.0.0-rc.2",

diff --git a/packages/walletconnect-solana/src/adapter.ts b/packages/walletconnect-solana/src/adapter.ts
@@ -1,13 +1,11 @@
-import WalletConnectClient from '@walletconnect/sign-client';
-import QRCodeModal from '@walletconnect/qrcode-modal';
-import { PublicKey } from '@solana/web3.js';
-
-import { ClientNotInitializedError, QRCodeModalError } from './errors.js';
-
-import type { EngineTypes, SessionTypes, SignClientTypes } from '@walletconnect/types';
-import type { Transaction } from '@solana/web3.js';
-import { getSdkError, parseAccountId } from '@walletconnect/utils';
-import base58 from 'bs58';
+import type { Transaction } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
+import QRCodeModal from "@walletconnect/qrcode-modal";
+import WalletConnectClient from "@walletconnect/sign-client";
+import type { EngineTypes, SessionTypes, SignClientTypes } from "@walletconnect/types";
+import { getSdkError, parseAccountId } from "@walletconnect/utils";
+import base58 from "bs58";
+import { ClientNotInitializedError, QRCodeModalError } from "./errors.js";
 
 export interface WalletConnectWalletAdapterConfig {
     network: WalletConnectChainID;