feat: move to pnpm

Sphereon-Opensource · May 5, 2023 · 2714a9c · 2714a9c
1 parent 09d17aa
commit 2714a9c
Show file tree

Hide file tree

Showing 21 changed files with 19,035 additions and 15,634 deletions.
diff --git a/jest.json b/jest.json
@@ -36,9 +36,6 @@
     "<rootDir>/packages/siopv2-oid4vp-rp-auth/.yalc/",
     "<rootDir>/packages/siopv2-oid4vp-rp-rest-api/.yalc/"
   ],
-  "transformIgnorePatterns": [
-    "node_modules/(?!(?:.pnpm/)?(nist-weierstrauss|multiformatsgggggg))"
-  ],
   "testMatch": [
     "**/__tests__/**/*.test.*",
     "!**/.yalc/**"

diff --git a/lerna.json b/lerna.json
@@ -1,14 +1,22 @@
 {
-  "packages": ["packages/*"],
+  "packages": [
+    "packages/*"
+  ],
   "version": "0.10.0",
-  "npmClient": "yarn",
+  "npmClient": "pnpm",
   "command": {
     "publish": {
-      "allowBranch": ["main", "master"],
+      "allowBranch": [
+        "main",
+        "master"
+      ],
       "conventionalCommits": true,
       "gitRemote": "origin",
       "message": "chore(release): %s"
     }
   },
-  "useWorkspaces": true
+  "useWorkspaces": true,
+  "forceLocal": true,
+  "sort": true,
+  "stream": true
 }
diff --git a/package.json b/package.json
@@ -7,31 +7,22 @@
   "author": "Sphereon <dev@sphereon.com>",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "lerna run build && yarn build:copyfiles && yarn build:schema-api",
-    "build:clean": "lerna clean -y && lerna bootstrap && lerna run build:clean --concurrency 1 && yarn build:copyfiles && yarn build:schema-api",
-    "build:schema-api": "lerna run extract-api && lerna run generate-plugin-schema",
-    "build:copyfiles": "lerna run build:copyfiles",
+    "preinstall": "npx only-allow pnpm",
+    "build": "pnpm build:js && pnpm build:copyfiles && pnpm build:api && pnpm build:schema",
+    "build:js": "pnpm -r --stream build",
+    "build:api": "pnpm --package=@veramo/cli -c dlx \"pnpm -r --stream extract-api\"",
+    "build:schema": "pnpm --package=@veramo/cli -c dlx \"pnpm -r --stream generate-plugin-schema\"",
+    "build:copyfiles": "pnpm -r --stream build:copyfiles",
     "bootstrap": "lerna bootstrap",
     "test:ci": "jest --config=jest.json",
     "test": "jest --verbose --config=jest.json --coverage=true --detectOpenHandles",
-    "test:watch": "yarn test --watch --verbose",
+    "test:watch": "pnpm test --watch --verbose",
     "test:lint": "eslint . --ext .ts",
     "prettier": "prettier --write \"{packages,__tests__,!dist}/**/*.{ts,tsx,js,json,md,yml}\"",
-    "build-clean": "rimraf --glob ./packages/*/dist ./packages/*/api ./packages/*/node_modules ./packages/*/tsconfig.tsbuildinfo && jest --clearCache",
+    "build-clean": "rimraf --glob ./packages/*/dist ./packages/*/api ./packages/*/node_modules ./packages/*/tsconfig.tsbuildinfo ./node_modules ./coverage && jest --clearCache",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org",
     "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org",
-    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org",
-    "postinstall": "patch-package"
-  },
-  "workspaces": {
-    "nohoist": [
-      "patch-package",
-      "jsonld1",
-      "jsonld-signatures1"
-    ],
-    "packages": [
-      "./packages/*"
-    ]
+    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org"
   },
   "publishConfig": {
     "access": "public"
@@ -45,34 +36,6 @@
       }
     ]
   },
-  "resolutions": {
-    "@veramo/cli": "4.2.0",
-    "@veramo/core": "4.2.0",
-    "@veramo/credential-w3c": "4.2.0",
-    "@veramo/data-store": "4.2.0",
-    "@veramo/did-jwt": "4.2.0",
-    "@veramo/credential-ld": "4.2.0",
-    "@veramo/utils": "4.2.0",
-    "@veramo/did-manager": "4.2.0",
-    "@veramo/kms-local": "4.2.0",
-    "@veramo/key-manager": "4.2.0",
-    "@veramo/credential-eip712": "4.2.0",
-    "@veramo/did-comm": "4.2.0",
-    "@veramo/message-handler": "4.2.0",
-    "@veramo/did-discovery": "4.2.0",
-    "@veramo/did-provider-ethr": "4.2.0",
-    "@veramo/did-provider-key": "4.2.0",
-    "@veramo/did-provider-web": "4.2.0",
-    "@veramo/did-resolver": "4.2.0",
-    "@veramo/remote-client": "4.2.0",
-    "@veramo/remote-server": "4.2.0",
-    "@veramo/selective-disclosure": "4.2.0",
-    "@veramo/url-handler": "4.2.0",
-    "@noble/hashes": "1.2.0",
-    "**/@mattrglobal/jsonld-signatures-bbs/jsonld": "4.0.1",
-    "**/jsonld" : "link:./node_modules/@digitalcredentials/jsonld",
-    "**/isomorphic-webcrypto": "link:./node_modules/@sphereon/isomorphic-webcrypto"
-  },
   "dependencies": {
     "@veramo/core": "4.2.0"
   },
@@ -89,6 +52,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.27.5",
     "jest": "^27.5.1",
+    "jest-environment-node": "27.5.1",
     "jest-fetch-mock": "^3.0.3",
     "json-schema": "^0.4.0",
     "lerna": "^6.6.1",
@@ -112,5 +76,39 @@
     "semi": false,
     "singleQuote": true,
     "printWidth": 150
+  },
+  "pnpm": {
+    "overrides": {
+      "@veramo/cli": "4.2.0",
+      "@veramo/core": "4.2.0",
+      "@veramo/credential-w3c": "4.2.0",
+      "@veramo/data-store": "4.2.0",
+      "@veramo/did-jwt": "4.2.0",
+      "@veramo/credential-ld": "4.2.0",
+      "@veramo/utils": "4.2.0",
+      "@veramo/did-manager": "4.2.0",
+      "@veramo/kms-local": "4.2.0",
+      "@veramo/key-manager": "4.2.0",
+      "@veramo/credential-eip712": "4.2.0",
+      "@veramo/did-comm": "4.2.0",
+      "@veramo/message-handler": "4.2.0",
+      "@veramo/did-discovery": "4.2.0",
+      "@veramo/did-provider-ethr": "4.2.0",
+      "@veramo/did-provider-key": "4.2.0",
+      "@veramo/did-provider-web": "4.2.0",
+      "@veramo/did-resolver": "4.2.0",
+      "@veramo/remote-client": "4.2.0",
+      "@veramo/remote-server": "4.2.0",
+      "@veramo/selective-disclosure": "4.2.0",
+      "@veramo/url-handler": "4.2.0",
+      "@noble/hashes": "1.2.0",
+      "@mattrglobal/jsonld-signatures-bbs@1.1.0>jsonld": "4.0.1",
+      "jsonld": "link:./node_modules/.pnpm/@digitalcredentials+jsonld@5.2.1/node_modules/@digitalcredentials/jsonld",
+      "isomorphic-webcrypto": "link:./node_modules/@sphereon/isomorphic-webcrypto"
+    },
+    "patchedDependencies": {
+      "@veramo/core@4.2.0": "patches/@veramo__core@4.2.0.patch",
+      "@veramo/data-store@4.2.0": "patches/@veramo__data-store@4.2.0.patch"
+    }
   }
 }
diff --git a/packages/contact-manager/package.json b/packages/contact-manager/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk-data-store": "^0.10.0",
+    "@sphereon/ssi-sdk-data-store": "workspace:*",
     "cross-fetch": "^3.1.5",
     "typeorm": "^0.3.12"
   },

diff --git a/packages/data-store/package.json b/packages/data-store/package.json
@@ -7,10 +7,10 @@
   "scripts": {
     "build": "tsc --build",
     "typeorm": "ts-node --project ./tsconfig.json -r tsconfig-paths/register ../../node_modules/typeorm/cli.js --config src/migrations/internal-migrations-ormconfig.ts",
-    "typeorm-sqlite:migration:generate": "npm run typeorm -- migration:generate -c migration-sqlite -d src/migrations/sqlite -n",
-    "typeorm-sqlite:migration:run": "npm run typeorm -- migration:run -c migration-sqlite",
-    "typeorm-postgres:migration:generate": "npm run typeorm -- migration:generate -c migration-postgres -d src/migrations/postgres -n",
-    "typeorm-postgres:migration:run": "npm run typeorm -- migration:run -c migration-postgres"
+    "typeorm-sqlite:migration:generate": "pnpm run typeorm -- migration:generate -c migration-sqlite -d src/migrations/sqlite -n",
+    "typeorm-sqlite:migration:run": "pnpm run typeorm -- migration:run -c migration-sqlite",
+    "typeorm-postgres:migration:generate": "pnpm run typeorm -- migration:generate -c migration-postgres -d src/migrations/postgres -n",
+    "typeorm-postgres:migration:run": "pnpm run typeorm -- migration:run -c migration-postgres"
   },
   "dependencies": {
     "@veramo/core": "4.2.0",

diff --git a/packages/ms-request-api/package.json b/packages/ms-request-api/package.json
@@ -12,10 +12,10 @@
   "scripts": {
     "build": "tsc --build",
     "build:clean": "tsc --build --clean && tsc --build",
-    "generate-plugin-schema": "yarn veramo dev generate-plugin-schema"
+    "generate-plugin-schema": "pnpm veramo dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/ms-authenticator": "^0.10.0",
+    "@sphereon/ms-authenticator": "workspace:*",
     "cross-fetch": "^3.1.5",
     "express": "^4.17.1",
     "express-session": "^1.17.2",

diff --git a/packages/presentation-exchange/package.json b/packages/presentation-exchange/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@sphereon/pex": "2.0.1",
     "@sphereon/pex-models": "^2.0.2",
-    "@sphereon/ssi-types": "^0.10.0",
+    "@sphereon/ssi-types": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-utils": "^0.11.0",
     "@veramo/core": "4.2.0",
     "@veramo/kv-store": "file:.yalc/@veramo/kv-store"

diff --git a/packages/qr-code-generator/package.json b/packages/qr-code-generator/package.json
@@ -24,16 +24,16 @@
     "@inrupt/jest-jsdom-polyfills": "^1.5.5",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^27.5.2",
     "@types/react": "^18.0.28",
     "@types/uuid": "^8.3.4",
     "@veramo/cli": "4.2.0",
     "global-jsdom": "^8.7.0",
-    "jest": "^29.4.3",
-    "jest-environment-jsdom": "^29.4.3",
+    "jest": "^27.5.1",
+    "jest-environment-jsdom": "^27.5.1",
     "jsdom": "^21.1.0",
     "react-dom": "^18.2.0",
-    "ts-jest": "^29.0.5"
+    "ts-jest": "^27.1.5"
   },
   "files": [
     "dist/**/*",

diff --git a/packages/siopv2-oid4vp-op-auth/package.json b/packages/siopv2-oid4vp-op-auth/package.json
@@ -17,10 +17,10 @@
     "@sphereon/did-auth-siop": "^0.3.1-unstable.1",
     "@sphereon/pex": "2.0.1",
     "@sphereon/pex-models": "2.0.2",
-    "@sphereon/ssi-sdk-presentation-exchange": "^0.10.0",
-    "@sphereon/ssi-sdk-core": "^0.10.0",
+    "@sphereon/ssi-sdk-presentation-exchange": "workspace:*",
+    "@sphereon/ssi-sdk-core": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-utils": "^0.11.0",
-    "@sphereon/ssi-types": "^0.10.0",
+    "@sphereon/ssi-types": "workspace:*",
     "@sphereon/wellknown-dids-client": "^0.1.3",
     "@types/uuid": "^9.0.1",
     "@veramo/core": "4.2.0",

diff --git a/packages/siopv2-oid4vp-rp-auth/package.json b/packages/siopv2-oid4vp-rp-auth/package.json
@@ -16,11 +16,11 @@
   "dependencies": {
     "@sphereon/did-auth-siop": "^0.3.1-unstable.1",
     "@sphereon/pex": "2.0.1",
-    "@sphereon/ssi-sdk-core": "^0.10.0",
+    "@sphereon/ssi-sdk-core": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-utils": "^0.11.0",
-    "@sphereon/ssi-sdk-siopv2-oid4vp-common": "^0.10.0",
-    "@sphereon/ssi-sdk-presentation-exchange": "^0.10.0",
-    "@sphereon/ssi-types": "^0.10.0",
+    "@sphereon/ssi-sdk-siopv2-oid4vp-common": "workspace:*",
+    "@sphereon/ssi-sdk-presentation-exchange": "workspace:*",
+    "@sphereon/ssi-types": "workspace:*",
     "@sphereon/wellknown-dids-client": "^0.1.3",
     "@types/uuid": "^9.0.1",
     "@veramo/core": "4.2.0",

diff --git a/packages/siopv2-oid4vp-rp-rest-api/package.json b/packages/siopv2-oid4vp-rp-rest-api/package.json
@@ -11,11 +11,11 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk-siopv2-oid4vp-common": "^0.10.0",
-    "@sphereon/ssi-sdk-siopv2-oid4vp-rp-auth": "^0.10.0",
-    "@sphereon/ssi-sdk-presentation-exchange": "^0.10.0",
+    "@sphereon/ssi-sdk-siopv2-oid4vp-common": "workspace:*",
+    "@sphereon/ssi-sdk-siopv2-oid4vp-rp-auth": "workspace:*",
+    "@sphereon/ssi-sdk-presentation-exchange": "workspace:*",
     "@sphereon/did-auth-siop": "^0.3.1-unstable.1",
-    "@sphereon/ssi-types": "^0.10.0",
+    "@sphereon/ssi-types": "workspace:*",
     "@types/uuid": "^9.0.1",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
@@ -31,9 +31,9 @@
   },
   "devDependencies": {
     "@sphereon/did-uni-client": "^0.6.0",
-    "@sphereon/ssi-sdk-data-store": "^0.10.0",
+    "@sphereon/ssi-sdk-data-store": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-provider-jwk": "^0.11.0",
-    "@sphereon/ssi-sdk-vc-handler-ld-local": "^0.10.0",
+    "@sphereon/ssi-sdk-vc-handler-ld-local": "workspace:*",
     "@sphereon/pex-models": "^2.0.2",
     "@sphereon/pex": "^2.0.1",
     "@types/body-parser": "^1.19.2",

diff --git a/packages/siopv2-oid4vp-rp-rest-client/package.json b/packages/siopv2-oid4vp-rp-rest-client/package.json
@@ -13,10 +13,10 @@
   "scripts": {
     "build": "tsc --build",
     "build:clean": "tsc --build --clean && tsc --build",
-    "generate-plugin-schema": "node --loader ts-node/esm ../../node_modules/@veramo/cli/bin/veramo.js dev generate-plugin-schema"
+    "generate-plugin-schema": "pnpm veramo dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk-siopv2-oid4vp-common": "^0.10.0",
+    "@sphereon/ssi-sdk-siopv2-oid4vp-common": "workspace:*",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^3.1.5"
   },

diff --git a/packages/ssi-sdk-core/package.json b/packages/ssi-sdk-core/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@scure/base": "^1.1.1",
-    "@sphereon/ssi-types": "^0.10.0",
+    "@sphereon/ssi-types": "workspace:*",
     "@veramo/core": "4.2.0"
   },
   "devDependencies": {

diff --git a/packages/vc-handler-ld-local/package.json b/packages/vc-handler-ld-local/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "build": "tsc",
     "build:clean": "tsc --build --clean && tsc --build",
-    "generate-plugin-schema": "yarn veramo dev generate-plugin-schema"
+    "generate-plugin-schema": "pnpm veramo dev generate-plugin-schema"
   },
   "dependencies": {
     "@digitalcredentials/did-method-key": "^2.0.3",
@@ -27,7 +27,7 @@
     "@mattrglobal/jsonld-signatures-bbs": "^1.1.1",
     "@sphereon/ed25519-signature-2018": "0.7.0-unstable.2",
     "@sphereon/isomorphic-webcrypto": "^2.4.0-unstable.3",
-    "@sphereon/ssi-sdk-core": "^0.10.0",
+    "@sphereon/ssi-sdk-core": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-utils": "^0.11.0",
     "@transmute/ed25519-key-pair": "0.7.0-unstable.80",
     "@transmute/jose-ld": "0.7.0-unstable.80",

diff --git a/packages/vc-handler-ld-local/plugin.schema.json b/packages/vc-handler-ld-local/plugin.schema.json
@@ -791,7 +791,7 @@
                 },
                 "arguments": {},
                 "caller": {
-                  "$ref": "#/components/schemas/interface-ib.es5.d.ts-10057-11521-ib.es5.d.ts-0-217681"
+                  "$ref": "#/components/schemas/interface-135971151-10057-11521-135971151-0-217681"
                 }
               },
               "required": [
@@ -808,7 +808,7 @@
           ],
           "description": "Encapsulates the parameters required to verify a\n {@link  https://www.w3.org/TR/vc-data-model/#credentials | W3C Verifiable Credential }"
         },
-        "interface-ib.es5.d.ts-10057-11521-ib.es5.d.ts-0-217681": {
+        "interface-135971151-10057-11521-135971151-0-217681": {
           "type": "object",
           "properties": {
             "prototype": {},
@@ -817,7 +817,7 @@
             },
             "arguments": {},
             "caller": {
-              "$ref": "#/components/schemas/interface-ib.es5.d.ts-10057-11521-ib.es5.d.ts-0-217681"
+              "$ref": "#/components/schemas/interface-135971151-10057-11521-135971151-0-217681"
             }
           },
           "required": [
@@ -873,7 +873,7 @@
                 },
                 "arguments": {},
                 "caller": {
-                  "$ref": "#/components/schemas/interface-ib.es5.d.ts-10057-11521-ib.es5.d.ts-0-217681"
+                  "$ref": "#/components/schemas/interface-135971151-10057-11521-135971151-0-217681"
                 }
               },
               "required": [

diff --git a/packages/wellknown-did-issuer/package.json b/packages/wellknown-did-issuer/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "^0.10.0",
+    "@sphereon/ssi-types": "workspace:*",
     "@sphereon/wellknown-dids-client": "^0.1.3",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",