Skip to content

Commit 6653e4b

Browse files
FrederikBoldingFrederikBolding
committed
Use Webpack for Node.js bundles
1 parent b65288b commit 6653e4b

File tree

11 files changed

+662
-284
lines changed

11 files changed

+662
-284
lines changed

‎packages/snaps-controllers/src/services/node-js/NodeProcessExecutionService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class NodeProcessExecutionService extends AbstractExecutionService<ChildP
1313
}> {
1414
const worker = fork(
1515
require.resolve(
16-
'@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js',
16+
'@metamask/snaps-execution-environments/dist/webpack/node-process/bundle.js',
1717
),
1818
{
1919
stdio: 'pipe',

‎packages/snaps-controllers/src/services/node-js/NodeThreadExecutionService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class NodeThreadExecutionService extends AbstractExecutionService<Worker>
1313
}> {
1414
const worker = new Worker(
1515
require.resolve(
16-
'@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js',
16+
'@metamask/snaps-execution-environments/dist/webpack/node-thread/bundle.js',
1717
),
1818
{
1919
stdout: true,

‎packages/snaps-controllers/wdio.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const config = {
8282
mount: '/',
8383
path: resolve(
8484
__dirname,
85-
'../snaps-execution-environments/dist/browserify/iframe',
85+
'../snaps-execution-environments/dist/webpack/iframe',
8686
),
8787
},
8888

‎packages/snaps-execution-environments/lavamoat/webpack/policy.json ‎packages/snaps-execution-environments/lavamoat/webpack/iframe/policy.json

+33-35
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,51 @@
3333
"removeEventListener": true
3434
},
3535
"packages": {
36-
"@metamask/utils": true,
36+
"@metamask/post-message-stream>@metamask/utils": true,
3737
"readable-stream": true
3838
}
3939
},
40+
"@metamask/post-message-stream>@metamask/utils": {
41+
"globals": {
42+
"Buffer": true,
43+
"TextDecoder": true,
44+
"TextEncoder": true
45+
},
46+
"packages": {
47+
"@metamask/superstruct": true,
48+
"@metamask/utils>@noble/hashes": true,
49+
"@metamask/utils>@scure/base": true,
50+
"@metamask/utils>pony-cause": true,
51+
"depcheck>semver": true,
52+
"tsup>debug": true
53+
}
54+
},
4055
"@metamask/providers": {
4156
"globals": {
4257
"console": true
4358
},
4459
"packages": {
4560
"@metamask/json-rpc-engine": true,
4661
"@metamask/object-multiplex": true,
62+
"@metamask/providers>@metamask/json-rpc-middleware-stream": true,
4763
"@metamask/providers>@metamask/safe-event-emitter": true,
4864
"@metamask/providers>is-stream": true,
49-
"@metamask/providers>json-rpc-middleware-stream": true,
5065
"@metamask/rpc-errors": true,
5166
"eslint>fast-deep-equal": true,
5267
"readable-stream": true
5368
}
5469
},
70+
"@metamask/providers>@metamask/json-rpc-middleware-stream": {
71+
"globals": {
72+
"console.warn": true,
73+
"setTimeout": true
74+
},
75+
"packages": {
76+
"@metamask/providers>@metamask/safe-event-emitter": true,
77+
"@metamask/utils": true,
78+
"readable-stream": true
79+
}
80+
},
5581
"@metamask/providers>@metamask/safe-event-emitter": {
5682
"globals": {
5783
"setTimeout": true
@@ -69,16 +95,6 @@
6995
"browserify>buffer>ieee754": true
7096
}
7197
},
72-
"@metamask/providers>json-rpc-middleware-stream": {
73-
"globals": {
74-
"console.warn": true,
75-
"setTimeout": true
76-
},
77-
"packages": {
78-
"@metamask/providers>@metamask/safe-event-emitter": true,
79-
"readable-stream": true
80-
}
81-
},
8298
"@metamask/rpc-errors": {
8399
"packages": {
84100
"@metamask/rpc-errors>fast-safe-stringify": true,
@@ -87,18 +103,8 @@
87103
},
88104
"@metamask/snaps-sdk": {
89105
"packages": {
90-
"@metamask/snaps-sdk>fast-xml-parser": true,
91-
"@metamask/utils": true,
92-
"superstruct": true
93-
}
94-
},
95-
"@metamask/snaps-sdk>fast-xml-parser": {
96-
"globals": {
97-
"entityName": true,
98-
"val": true
99-
},
100-
"packages": {
101-
"@metamask/snaps-sdk>fast-xml-parser>strnum": true
106+
"@metamask/superstruct": true,
107+
"@metamask/utils": true
102108
}
103109
},
104110
"@metamask/snaps-utils": {
@@ -111,22 +117,19 @@
111117
"packages": {
112118
"@metamask/rpc-errors": true,
113119
"@metamask/snaps-sdk": true,
114-
"@metamask/utils": true,
115-
"superstruct": true
120+
"@metamask/superstruct": true,
121+
"@metamask/utils": true
116122
}
117123
},
118124
"@metamask/utils": {
119125
"globals": {
120-
"Buffer": true,
121-
"TextDecoder": true,
122126
"TextEncoder": true
123127
},
124128
"packages": {
129+
"@metamask/superstruct": true,
125130
"@metamask/utils>@noble/hashes": true,
126-
"@metamask/utils>@scure/base": true,
127131
"@metamask/utils>pony-cause": true,
128132
"depcheck>semver": true,
129-
"superstruct": true,
130133
"tsup>debug": true
131134
}
132135
},
@@ -195,11 +198,6 @@
195198
"localStorage": true
196199
}
197200
},
198-
"superstruct": {
199-
"globals": {
200-
"console.warn": true
201-
}
202-
},
203201
"tsup>debug": {
204202
"globals": {
205203
"console": true,

‎packages/snaps-execution-environments/lavamoat/webpack/node-process/policy.json

+238
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
{
2+
"resources": {
3+
"@metamask/json-rpc-engine": {
4+
"packages": {
5+
"@metamask/providers>@metamask/safe-event-emitter": true,
6+
"@metamask/rpc-errors": true,
7+
"@metamask/utils": true
8+
}
9+
},
10+
"@metamask/object-multiplex": {
11+
"globals": {
12+
"console.warn": true
13+
},
14+
"packages": {
15+
"@metamask/object-multiplex>once": true,
16+
"readable-stream": true
17+
}
18+
},
19+
"@metamask/object-multiplex>once": {
20+
"packages": {
21+
"@metamask/object-multiplex>once>wrappy": true
22+
}
23+
},
24+
"@metamask/post-message-stream": {
25+
"builtin": {
26+
"worker_threads.parentPort": true
27+
},
28+
"globals": {
29+
"MessageEvent.prototype": true,
30+
"WorkerGlobalScope": true,
31+
"addEventListener": true,
32+
"browser": true,
33+
"chrome": true,
34+
"location.origin": true,
35+
"postMessage": true,
36+
"process.on": true,
37+
"process.removeListener": true,
38+
"process.send": true,
39+
"removeEventListener": true
40+
},
41+
"packages": {
42+
"@metamask/post-message-stream>@metamask/utils": true,
43+
"readable-stream": true
44+
}
45+
},
46+
"@metamask/post-message-stream>@metamask/utils": {
47+
"globals": {
48+
"Buffer": true,
49+
"TextDecoder": true,
50+
"TextEncoder": true
51+
},
52+
"packages": {
53+
"@metamask/superstruct": true,
54+
"@metamask/utils>@noble/hashes": true,
55+
"@metamask/utils>@scure/base": true,
56+
"@metamask/utils>pony-cause": true,
57+
"depcheck>semver": true,
58+
"tsup>debug": true
59+
}
60+
},
61+
"@metamask/providers": {
62+
"globals": {
63+
"console": true
64+
},
65+
"packages": {
66+
"@metamask/json-rpc-engine": true,
67+
"@metamask/object-multiplex": true,
68+
"@metamask/providers>@metamask/json-rpc-middleware-stream": true,
69+
"@metamask/providers>@metamask/safe-event-emitter": true,
70+
"@metamask/providers>is-stream": true,
71+
"@metamask/rpc-errors": true,
72+
"eslint>fast-deep-equal": true,
73+
"readable-stream": true
74+
}
75+
},
76+
"@metamask/providers>@metamask/json-rpc-middleware-stream": {
77+
"globals": {
78+
"console.warn": true,
79+
"setTimeout": true
80+
},
81+
"packages": {
82+
"@metamask/providers>@metamask/safe-event-emitter": true,
83+
"@metamask/utils": true,
84+
"readable-stream": true
85+
}
86+
},
87+
"@metamask/providers>@metamask/safe-event-emitter": {
88+
"builtin": {
89+
"events": true
90+
},
91+
"globals": {
92+
"setTimeout": true
93+
}
94+
},
95+
"@metamask/rpc-errors": {
96+
"packages": {
97+
"@metamask/rpc-errors>fast-safe-stringify": true,
98+
"@metamask/utils": true
99+
}
100+
},
101+
"@metamask/snaps-sdk": {
102+
"packages": {
103+
"@metamask/superstruct": true,
104+
"@metamask/utils": true
105+
}
106+
},
107+
"@metamask/snaps-utils": {
108+
"globals": {
109+
"URL": true,
110+
"console.error": true,
111+
"console.log": true,
112+
"console.warn": true
113+
},
114+
"packages": {
115+
"@metamask/rpc-errors": true,
116+
"@metamask/snaps-sdk": true,
117+
"@metamask/superstruct": true,
118+
"@metamask/utils": true
119+
}
120+
},
121+
"@metamask/utils": {
122+
"globals": {
123+
"TextEncoder": true
124+
},
125+
"packages": {
126+
"@metamask/superstruct": true,
127+
"@metamask/utils>@noble/hashes": true,
128+
"@metamask/utils>pony-cause": true,
129+
"depcheck>semver": true,
130+
"tsup>debug": true
131+
}
132+
},
133+
"@metamask/utils>@noble/hashes": {
134+
"builtin": {
135+
"node:crypto": true
136+
},
137+
"globals": {
138+
"TextEncoder": true
139+
}
140+
},
141+
"@metamask/utils>@scure/base": {
142+
"globals": {
143+
"TextDecoder": true,
144+
"TextEncoder": true
145+
}
146+
},
147+
"@wdio/mocha-framework>mocha>supports-color": {
148+
"builtin": {
149+
"os.release": true,
150+
"tty.isatty": true
151+
},
152+
"globals": {
153+
"process.env": true,
154+
"process.platform": true
155+
},
156+
"packages": {
157+
"istanbul-lib-report>supports-color>has-flag": true
158+
}
159+
},
160+
"browserify>browser-pack>safe-buffer": {
161+
"builtin": {
162+
"buffer": true
163+
}
164+
},
165+
"browserify>inherits": {
166+
"builtin": {
167+
"util.inherits": true
168+
}
169+
},
170+
"browserify>string_decoder": {
171+
"packages": {
172+
"browserify>browser-pack>safe-buffer": true
173+
}
174+
},
175+
"depcheck>semver": {
176+
"globals": {
177+
"console.error": true,
178+
"process": true
179+
},
180+
"packages": {
181+
"depcheck>semver>lru-cache": true
182+
}
183+
},
184+
"depcheck>semver>lru-cache": {
185+
"packages": {
186+
"depcheck>semver>lru-cache>yallist": true
187+
}
188+
},
189+
"istanbul-lib-report>supports-color>has-flag": {
190+
"globals": {
191+
"process.argv": true
192+
}
193+
},
194+
"readable-stream": {
195+
"builtin": {
196+
"buffer.Buffer": true,
197+
"events.EventEmitter": true,
198+
"stream": true,
199+
"util": true
200+
},
201+
"globals": {
202+
"process.env.READABLE_STREAM": true,
203+
"process.nextTick": true,
204+
"process.stderr": true,
205+
"process.stdout": true
206+
},
207+
"packages": {
208+
"browserify>inherits": true,
209+
"browserify>string_decoder": true,
210+
"readable-stream>util-deprecate": true
211+
}
212+
},
213+
"readable-stream>util-deprecate": {
214+
"builtin": {
215+
"util.deprecate": true
216+
}
217+
},
218+
"tsup>debug": {
219+
"builtin": {
220+
"tty.isatty": true,
221+
"util.deprecate": true,
222+
"util.format": true,
223+
"util.inspect": true
224+
},
225+
"globals": {
226+
"console": true,
227+
"document": true,
228+
"localStorage": true,
229+
"navigator": true,
230+
"process": true
231+
},
232+
"packages": {
233+
"@wdio/mocha-framework>mocha>supports-color": true,
234+
"tsup>debug>ms": true
235+
}
236+
}
237+
}
238+
}

0 commit comments

Comments
 (0)