Skip to content

Commit dceeafe

Browse files
authored
Merge branch 'develop' into chore/simplify-playwright-deps-installation-ci
2 parents f79c537 + 6ba7cf0 commit dceeafe

8 files changed

Lines changed: 40 additions & 56 deletions

File tree

.changeset/quiet-stingrays-end.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@iota/dapp-kit': patch
3+
---
4+
5+
Removed unused deps in dappkit.

apps/explorer/src/lib/constants/trustFramework.constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
export const IOTA_IDENTITY_PKG_ID = import.meta.env.VITE_IOTA_IDENTITY_PKG_ID;
55
export const DID_PROTOCOL_SEGMENT_SYMBOL = ':';
66
export const DID_URL_SEGMENT_SYMBOL = '-';
7-
export const IDENTITY_WASM_PATH = '/identity_wasm_bg.wasm';

apps/explorer/src/lib/utils/trust-framework/identity.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import * as identity from '@iota/identity-wasm/web';
5+
import identityWasmUrl from '@iota/identity-wasm/web/identity_wasm_bg.wasm?url';
56
import { isValidIotaObjectId } from '@iota/iota-sdk/utils';
67
import { type IotaClient, Network } from '@iota/iota-sdk/client';
78
import {
89
DID_PROTOCOL_SEGMENT_SYMBOL,
910
DID_URL_SEGMENT_SYMBOL,
10-
IDENTITY_WASM_PATH,
1111
IOTA_IDENTITY_PKG_ID,
1212
} from '~/lib/constants/trustFramework.constants';
1313

@@ -21,7 +21,7 @@ let initPromise: Promise<void> | null = null;
2121
*/
2222
export const initIdentityWasmWeb = async (): Promise<void> => {
2323
if (!initPromise) {
24-
initPromise = identity.init(IDENTITY_WASM_PATH).catch((e) => {
24+
initPromise = identity.init(identityWasmUrl).catch((e) => {
2525
console.error('failed to load identity wasm (web version)', e);
2626
initPromise = null; // allow retry
2727
throw e;

apps/explorer/vite.config.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import { sentryVitePlugin } from '@sentry/vite-plugin';
77
import react from '@vitejs/plugin-react';
88
import { execSync } from 'child_process';
9-
import { copyFileSync } from 'fs';
109
import { defineConfig, loadEnv } from 'vite';
1110
import svgr from 'vite-plugin-svgr';
1211
import { configDefaults } from 'vitest/config';
@@ -36,20 +35,6 @@ export default defineConfig(({ mode }) => {
3635
name: EXPLORER_REV,
3736
},
3837
}),
39-
{
40-
name: 'copy-wasm-files',
41-
buildStart() {
42-
// Copy WASM files to public directory
43-
try {
44-
copyFileSync(
45-
'node_modules/@iota/identity-wasm/web/identity_wasm_bg.wasm',
46-
'public/identity_wasm_bg.wasm',
47-
);
48-
} catch (error) {
49-
console.warn('Could not copy WASM files:', error);
50-
}
51-
},
52-
},
5338
],
5439
test: {
5540
// Omit end-to-end tests:

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
"serialize-javascript": ">=7.0.3",
5353
"form-data@>=4.0.0 <4.0.4": "^4.0.4",
5454
"sha.js": "^2.4.12",
55-
"@mestamask/sdk@<0.33.0": "0.33.0",
56-
"@mestamask/sdk-communication-layer@<0.33.0": "0.33.0",
5755
"validator@<13.15.15": "13.15.15",
5856
"node-forge@1.3.1": "^1.3.3",
5957
"glob@>=10.2.0 <10.5.0": "10.5.0",

pnpm-lock.yaml

Lines changed: 32 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/dapp-kit/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,11 @@
6363
"@testing-library/react": "^16.0.0",
6464
"@testing-library/user-event": "^14.5.2",
6565
"@types/react": "^18.3.3",
66-
"@vanilla-extract/esbuild-plugin": "^2.3.8",
6766
"@vanilla-extract/vite-plugin": "^4.0.13",
6867
"dotenv": "^16.4.5",
69-
"jsdom": "^26.1.0",
7068
"react": "^18.3.1",
71-
"react-dom": "^18.3.1",
7269
"size-limit": "^11.1.4",
7370
"typescript": "^5.5.3",
74-
"vite": "^5.4.12",
7571
"vitest": "^3.2.4"
7672
},
7773
"dependencies": {

sdk/dapp-kit/vitest.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
import { config } from 'dotenv';
88
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
9-
import { defineConfig } from 'vite';
10-
import { configDefaults } from 'vitest/config';
9+
import { defineConfig, configDefaults } from 'vitest/config';
1110

1211
export default defineConfig({
1312
plugins: [vanillaExtractPlugin()],

0 commit comments

Comments
 (0)