@forge/tunnel 5.10.1-next.9 → 5.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +222 -0
- package/out/command/interactors/tunnel-interactor.d.ts.map +1 -1
- package/out/command/interactors/tunnel-interactor.js +6 -2
- package/out/sandbox/node-sandbox.js +1 -1
- package/out/servers/dev-server.d.ts +3 -2
- package/out/servers/dev-server.d.ts.map +1 -1
- package/out/servers/dev-server.js +9 -2
- package/out/servers/resource-tunnel-server.d.ts.map +1 -1
- package/out/servers/resource-tunnel-server.js +2 -0
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,227 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
+
## 5.10.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- f9c2880: Add support for --no-verify during tunnel
|
|
8
|
+
- bd12e28: Fix tunnelling with handlers not in default location
|
|
9
|
+
- 0dfb15d: Revert CustomUITunnellingResourceHandler change
|
|
10
|
+
- 8c34ca3: Changed manifest to allow egress objects to be a list of string, egress objects containing at least the 'address' field, or a remote reference
|
|
11
|
+
- 336f74f: Support serving i18n resources while using `forge tunnel`
|
|
12
|
+
- Updated dependencies [f9c2880]
|
|
13
|
+
- Updated dependencies [3a510c5]
|
|
14
|
+
- Updated dependencies [2c0e151]
|
|
15
|
+
- Updated dependencies [a779dc3]
|
|
16
|
+
- Updated dependencies [7243788]
|
|
17
|
+
- Updated dependencies [2204d8d]
|
|
18
|
+
- Updated dependencies [2cdac63]
|
|
19
|
+
- Updated dependencies [c57e34a]
|
|
20
|
+
- Updated dependencies [9d231e9]
|
|
21
|
+
- Updated dependencies [0aad197]
|
|
22
|
+
- Updated dependencies [61f499c]
|
|
23
|
+
- Updated dependencies [1a9af0b]
|
|
24
|
+
- Updated dependencies [999a9d0]
|
|
25
|
+
- Updated dependencies [7f46df4]
|
|
26
|
+
- Updated dependencies [d0cb567]
|
|
27
|
+
- Updated dependencies [7d8339b]
|
|
28
|
+
- Updated dependencies [f12ec8a]
|
|
29
|
+
- Updated dependencies [8410c2d]
|
|
30
|
+
- Updated dependencies [4b083be]
|
|
31
|
+
- Updated dependencies [d156658]
|
|
32
|
+
- Updated dependencies [7a83fd9]
|
|
33
|
+
- Updated dependencies [b503084]
|
|
34
|
+
- Updated dependencies [8c34ca3]
|
|
35
|
+
- Updated dependencies [336f74f]
|
|
36
|
+
- Updated dependencies [210360b]
|
|
37
|
+
- Updated dependencies [a7db2e6]
|
|
38
|
+
- @forge/cli-shared@6.8.0
|
|
39
|
+
- @forge/csp@3.7.0
|
|
40
|
+
- @forge/bundler@4.22.0
|
|
41
|
+
|
|
42
|
+
## 5.10.1-next.32
|
|
43
|
+
|
|
44
|
+
### Patch Changes
|
|
45
|
+
|
|
46
|
+
- @forge/bundler@4.22.0-next.31
|
|
47
|
+
- @forge/cli-shared@6.8.0-next.29
|
|
48
|
+
|
|
49
|
+
## 5.10.1-next.31
|
|
50
|
+
|
|
51
|
+
### Patch Changes
|
|
52
|
+
|
|
53
|
+
- Updated dependencies [f12ec8a]
|
|
54
|
+
- @forge/cli-shared@6.8.0-next.28
|
|
55
|
+
- @forge/bundler@4.22.0-next.30
|
|
56
|
+
|
|
57
|
+
## 5.10.1-next.30
|
|
58
|
+
|
|
59
|
+
### Patch Changes
|
|
60
|
+
|
|
61
|
+
- Updated dependencies [7f46df4]
|
|
62
|
+
- @forge/bundler@4.22.0-next.29
|
|
63
|
+
|
|
64
|
+
## 5.10.1-next.29
|
|
65
|
+
|
|
66
|
+
### Patch Changes
|
|
67
|
+
|
|
68
|
+
- Updated dependencies [d0cb567]
|
|
69
|
+
- @forge/cli-shared@6.8.0-next.27
|
|
70
|
+
- @forge/bundler@4.22.0-next.28
|
|
71
|
+
|
|
72
|
+
## 5.10.1-next.28
|
|
73
|
+
|
|
74
|
+
### Patch Changes
|
|
75
|
+
|
|
76
|
+
- Updated dependencies [2c0e151]
|
|
77
|
+
- @forge/cli-shared@6.8.0-next.26
|
|
78
|
+
- @forge/bundler@4.22.0-next.27
|
|
79
|
+
|
|
80
|
+
## 5.10.1-next.27
|
|
81
|
+
|
|
82
|
+
### Patch Changes
|
|
83
|
+
|
|
84
|
+
- @forge/bundler@4.22.0-next.26
|
|
85
|
+
- @forge/cli-shared@6.8.0-next.25
|
|
86
|
+
|
|
87
|
+
## 5.10.1-next.26
|
|
88
|
+
|
|
89
|
+
### Patch Changes
|
|
90
|
+
|
|
91
|
+
- 8c34ca3: Changed manifest to allow egress objects to be a list of string, egress objects containing at least the 'address' field, or a remote reference
|
|
92
|
+
- Updated dependencies [1a9af0b]
|
|
93
|
+
- Updated dependencies [8c34ca3]
|
|
94
|
+
- @forge/cli-shared@6.8.0-next.24
|
|
95
|
+
- @forge/csp@3.7.0-next.1
|
|
96
|
+
- @forge/bundler@4.22.0-next.25
|
|
97
|
+
|
|
98
|
+
## 5.10.1-next.25
|
|
99
|
+
|
|
100
|
+
### Patch Changes
|
|
101
|
+
|
|
102
|
+
- 0dfb15d: Revert CustomUITunnellingResourceHandler change
|
|
103
|
+
- @forge/bundler@4.22.0-next.24
|
|
104
|
+
- @forge/cli-shared@6.8.0-next.23
|
|
105
|
+
|
|
106
|
+
## 5.10.1-next.24
|
|
107
|
+
|
|
108
|
+
### Patch Changes
|
|
109
|
+
|
|
110
|
+
- @forge/bundler@4.22.0-next.23
|
|
111
|
+
- @forge/cli-shared@6.8.0-next.22
|
|
112
|
+
|
|
113
|
+
## 5.10.1-next.23
|
|
114
|
+
|
|
115
|
+
### Patch Changes
|
|
116
|
+
|
|
117
|
+
- Updated dependencies [8410c2d]
|
|
118
|
+
- @forge/bundler@4.22.0-next.22
|
|
119
|
+
- @forge/cli-shared@6.8.0-next.21
|
|
120
|
+
|
|
121
|
+
## 5.10.1-next.22
|
|
122
|
+
|
|
123
|
+
### Patch Changes
|
|
124
|
+
|
|
125
|
+
- Updated dependencies [3a510c5]
|
|
126
|
+
- @forge/cli-shared@6.8.0-next.20
|
|
127
|
+
- @forge/bundler@4.22.0-next.21
|
|
128
|
+
|
|
129
|
+
## 5.10.1-next.21
|
|
130
|
+
|
|
131
|
+
### Patch Changes
|
|
132
|
+
|
|
133
|
+
- Updated dependencies [61f499c]
|
|
134
|
+
- @forge/cli-shared@6.8.0-next.19
|
|
135
|
+
- @forge/bundler@4.22.0-next.20
|
|
136
|
+
|
|
137
|
+
## 5.10.1-next.20
|
|
138
|
+
|
|
139
|
+
### Patch Changes
|
|
140
|
+
|
|
141
|
+
- f9c2880: Add support for --no-verify during tunnel
|
|
142
|
+
- Updated dependencies [f9c2880]
|
|
143
|
+
- @forge/cli-shared@6.8.0-next.18
|
|
144
|
+
- @forge/bundler@4.22.0-next.19
|
|
145
|
+
|
|
146
|
+
## 5.10.1-next.19
|
|
147
|
+
|
|
148
|
+
### Patch Changes
|
|
149
|
+
|
|
150
|
+
- Updated dependencies [7d8339b]
|
|
151
|
+
- @forge/cli-shared@6.8.0-next.17
|
|
152
|
+
- @forge/bundler@4.22.0-next.18
|
|
153
|
+
|
|
154
|
+
## 5.10.1-next.18
|
|
155
|
+
|
|
156
|
+
### Patch Changes
|
|
157
|
+
|
|
158
|
+
- Updated dependencies [2204d8d]
|
|
159
|
+
- @forge/cli-shared@6.8.0-next.16
|
|
160
|
+
- @forge/bundler@4.22.0-next.17
|
|
161
|
+
|
|
162
|
+
## 5.10.1-next.17
|
|
163
|
+
|
|
164
|
+
### Patch Changes
|
|
165
|
+
|
|
166
|
+
- bd12e28: Fix tunnelling with handlers not in default location
|
|
167
|
+
|
|
168
|
+
## 5.10.1-next.16
|
|
169
|
+
|
|
170
|
+
### Patch Changes
|
|
171
|
+
|
|
172
|
+
- Updated dependencies [4b083be]
|
|
173
|
+
- @forge/bundler@4.22.0-next.16
|
|
174
|
+
- @forge/cli-shared@6.8.0-next.15
|
|
175
|
+
|
|
176
|
+
## 5.10.1-next.15
|
|
177
|
+
|
|
178
|
+
### Patch Changes
|
|
179
|
+
|
|
180
|
+
- Updated dependencies [7a83fd9]
|
|
181
|
+
- @forge/cli-shared@6.8.0-next.14
|
|
182
|
+
- @forge/bundler@4.21.1-next.15
|
|
183
|
+
|
|
184
|
+
## 5.10.1-next.14
|
|
185
|
+
|
|
186
|
+
### Patch Changes
|
|
187
|
+
|
|
188
|
+
- Updated dependencies [c57e34a]
|
|
189
|
+
- @forge/cli-shared@6.8.0-next.13
|
|
190
|
+
- @forge/bundler@4.21.1-next.14
|
|
191
|
+
|
|
192
|
+
## 5.10.1-next.13
|
|
193
|
+
|
|
194
|
+
### Patch Changes
|
|
195
|
+
|
|
196
|
+
- Updated dependencies [7243788]
|
|
197
|
+
- @forge/cli-shared@6.8.0-next.12
|
|
198
|
+
- @forge/bundler@4.21.1-next.13
|
|
199
|
+
|
|
200
|
+
## 5.10.1-next.12
|
|
201
|
+
|
|
202
|
+
### Patch Changes
|
|
203
|
+
|
|
204
|
+
- 336f74f: Support serving i18n resources while using `forge tunnel`
|
|
205
|
+
- Updated dependencies [336f74f]
|
|
206
|
+
- @forge/bundler@4.21.1-next.12
|
|
207
|
+
- @forge/cli-shared@6.8.0-next.11
|
|
208
|
+
|
|
209
|
+
## 5.10.1-next.11
|
|
210
|
+
|
|
211
|
+
### Patch Changes
|
|
212
|
+
|
|
213
|
+
- Updated dependencies [a779dc3]
|
|
214
|
+
- @forge/csp@3.7.0-next.0
|
|
215
|
+
- @forge/bundler@4.21.1-next.11
|
|
216
|
+
|
|
217
|
+
## 5.10.1-next.10
|
|
218
|
+
|
|
219
|
+
### Patch Changes
|
|
220
|
+
|
|
221
|
+
- de0bf46: Fix tunnel for non index.html custom ui resources
|
|
222
|
+
- @forge/bundler@4.21.1-next.10
|
|
223
|
+
- @forge/cli-shared@6.8.0-next.10
|
|
224
|
+
|
|
3
225
|
## 5.10.1-next.9
|
|
4
226
|
|
|
5
227
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAyC,MAAM,EAAQ,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAEpC,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAyC,MAAM,EAAQ,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAEpC,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CA4DpC;CACH"}
|
|
@@ -62,7 +62,9 @@ class TunnelInteractor {
|
|
|
62
62
|
const onBuildWillStart = async () => {
|
|
63
63
|
this.logger.info('');
|
|
64
64
|
this.logger.info(cli_shared_1.Text.bundle.detectedChanges);
|
|
65
|
-
|
|
65
|
+
if (tunnelOptions.verify) {
|
|
66
|
+
await (0, bundler_1.runLinter)();
|
|
67
|
+
}
|
|
66
68
|
this.logger.info(cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.tunnel.bundlingHeader));
|
|
67
69
|
};
|
|
68
70
|
const onBuildFinished = (kind) => async (err, output) => {
|
|
@@ -77,7 +79,9 @@ class TunnelInteractor {
|
|
|
77
79
|
this.logger.info(cli_shared_1.Text.tunnel.startedServer(localPort, this.logger.debugEnabled) + '\n');
|
|
78
80
|
};
|
|
79
81
|
const multiCompiler = new multi_compiler_watcher_1.MultiCompilerWatcher(faasServer, uiServers);
|
|
80
|
-
|
|
82
|
+
if (tunnelOptions.verify) {
|
|
83
|
+
await (0, bundler_1.runLinter)();
|
|
84
|
+
}
|
|
81
85
|
this.logger.info(cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.tunnel.bundlingHeader));
|
|
82
86
|
try {
|
|
83
87
|
const output = await multiCompiler.compileAndWatch({
|
|
@@ -31,7 +31,7 @@ class NodeSandbox {
|
|
|
31
31
|
else {
|
|
32
32
|
fileName = path_1.default.join(appPath, `${modName}.cjs`);
|
|
33
33
|
handlerName = handler;
|
|
34
|
-
handlerEnv =
|
|
34
|
+
handlerEnv = `${modName}.${handler}`;
|
|
35
35
|
}
|
|
36
36
|
const process = (0, child_process_1.fork)(RUNNER, [fileName, handlerName], {
|
|
37
37
|
stdio: ['ignore', 'pipe', 2, 'ipc'],
|
|
@@ -4,7 +4,7 @@ import http from 'http';
|
|
|
4
4
|
import { URL } from 'url';
|
|
5
5
|
import express from 'express';
|
|
6
6
|
import { BundlerWatch, BundlerOutput } from '@forge/bundler';
|
|
7
|
-
import { ConfigFile, FileSystemReader, Logger, StatsigService, TunnelOptions } from '@forge/cli-shared';
|
|
7
|
+
import { ConfigFile, FileSystemReader, I18nResourceBundlingService, Logger, StatsigService, TunnelOptions } from '@forge/cli-shared';
|
|
8
8
|
import { ExternalRequestBody } from '@forge/runtime';
|
|
9
9
|
import { Permissions, Remotes } from '@forge/manifest';
|
|
10
10
|
export interface DevelopmentServer {
|
|
@@ -28,11 +28,12 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
|
|
|
28
28
|
private readonly configFile;
|
|
29
29
|
private readonly fileSystemReader;
|
|
30
30
|
private readonly statsigService;
|
|
31
|
+
private readonly i18nResourceBundlingService;
|
|
31
32
|
private app;
|
|
32
33
|
private httpServer;
|
|
33
34
|
private permissions;
|
|
34
35
|
private remotes;
|
|
35
|
-
constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService);
|
|
36
|
+
constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService, i18nResourceBundlingService: I18nResourceBundlingService);
|
|
36
37
|
start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
|
|
37
38
|
stop(): Promise<void>;
|
|
38
39
|
compileAndWatch(watch: BundlerWatch, tunnelOptions?: TunnelOptions): Promise<BundlerOutput>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAKL,YAAY,EACZ,aAAa,EAEd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EAEV,gBAAgB,EAChB,MAAM,EAEN,cAAc,EAEd,aAAa,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAIvD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrE;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/E;AAED,qBAAa,sBAAuB,YAAW,iBAAiB;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAKL,YAAY,EACZ,aAAa,EAEd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EAEV,gBAAgB,EAChB,2BAA2B,EAC3B,MAAM,EAEN,cAAc,EAEd,aAAa,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAIvD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrE;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/E;AAED,qBAAa,sBAAuB,YAAW,iBAAiB;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,2BAA2B;IAX9C,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,OAAO,CAAsB;gBAGlB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EAC9B,2BAA2B,EAAE,2BAA2B;IAQ9D,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAIJ,eAAe,CAC1B,KAAK,EAAE,YAAY,EACnB,aAAa,GAAE,aAA2C,GACzD,OAAO,CAAC,aAAa,CAAC;IAkClB,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CA6CtC;CACH"}
|
|
@@ -22,16 +22,18 @@ class LocalDevelopmentServer {
|
|
|
22
22
|
configFile;
|
|
23
23
|
fileSystemReader;
|
|
24
24
|
statsigService;
|
|
25
|
+
i18nResourceBundlingService;
|
|
25
26
|
app;
|
|
26
27
|
httpServer;
|
|
27
28
|
permissions;
|
|
28
29
|
remotes;
|
|
29
|
-
constructor(invocationService, logger, configFile, fileSystemReader, statsigService) {
|
|
30
|
+
constructor(invocationService, logger, configFile, fileSystemReader, statsigService, i18nResourceBundlingService) {
|
|
30
31
|
this.invocationService = invocationService;
|
|
31
32
|
this.logger = logger;
|
|
32
33
|
this.configFile = configFile;
|
|
33
34
|
this.fileSystemReader = fileSystemReader;
|
|
34
35
|
this.statsigService = statsigService;
|
|
36
|
+
this.i18nResourceBundlingService = i18nResourceBundlingService;
|
|
35
37
|
this.app = (0, express_1.default)();
|
|
36
38
|
this.app.use(express_1.default.json({ limit: '6mb' }));
|
|
37
39
|
this.app.post(`/:fnKey`, this.handleInvocation);
|
|
@@ -62,11 +64,14 @@ class LocalDevelopmentServer {
|
|
|
62
64
|
const bundler = isNodeJsRuntime
|
|
63
65
|
? (0, bundler_1.getNodeBundler)(this.logger, (0, bundler_1.getWrapperProvider)({ fileSystemReader: this.fileSystemReader, statsigService: this.statsigService }), this.configFile, this.statsigService)
|
|
64
66
|
: new bundler_1.SandboxBundler(this.logger);
|
|
67
|
+
const { translations, modules } = await this.configFile.readConfig();
|
|
68
|
+
const i18nResourceBundle = await this.i18nResourceBundlingService.bundle(modules, translations);
|
|
65
69
|
const { result } = await bundler.watch({
|
|
66
70
|
appDirectory: process.cwd(),
|
|
67
71
|
entryPoints,
|
|
68
72
|
watchMode,
|
|
69
|
-
successMessage: cli_shared_1.Text.tunnel.functionsBundlingSucceeded
|
|
73
|
+
successMessage: cli_shared_1.Text.tunnel.functionsBundlingSucceeded,
|
|
74
|
+
i18nResourceBundle
|
|
70
75
|
}, watch);
|
|
71
76
|
return result;
|
|
72
77
|
}
|
|
@@ -86,6 +91,8 @@ class LocalDevelopmentServer {
|
|
|
86
91
|
?.map((item) => {
|
|
87
92
|
if (typeof item === 'string')
|
|
88
93
|
return item;
|
|
94
|
+
if ('address' in item)
|
|
95
|
+
return item.address;
|
|
89
96
|
return this.remotes?.find((remote) => remote.key === item.remote)?.baseUrl;
|
|
90
97
|
})
|
|
91
98
|
.filter((item) => typeof item === 'string') ?? undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/resource-tunnel-server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,EAMR,MAAM,EAGP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA6C,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG1E,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAQxF,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/resource-tunnel-server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,EAMR,MAAM,EAGP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA6C,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG1E,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAQxF,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;IAejF,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAMvF,SAAS,CAAC,YAAY,gBAAiB,UAAU,KAAG,MAAM,CAO1C;IAEhB,SAAS,CAAC,wBAAwB,gBAAiB,MAAM,YAGpD;IAEL,SAAS,CAAC,yBAAyB,gBAAiB,MAAM,YAGrD;IAEL,SAAS,CAAC,kCAAkC,gBAAiB,WAAW,uBAAqB,cAAc,CAqBpG;IAEP,SAAS,CAAC,0BAA0B,eAAgB,YAAY,WAI3C,OAAO,QAAQ,QAAQ,QAAQ,YAAY,mBAU9D;CACH"}
|
|
@@ -22,6 +22,8 @@ class ResourceTunnelServer {
|
|
|
22
22
|
?.map((item) => {
|
|
23
23
|
if (typeof item === 'string')
|
|
24
24
|
return item;
|
|
25
|
+
if ('address' in item)
|
|
26
|
+
return item.address;
|
|
25
27
|
return remotes?.find((remote) => remote.key === item.remote)?.baseUrl;
|
|
26
28
|
})
|
|
27
29
|
.filter((item) => typeof item === 'string') ?? undefined;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "5.10.1
|
|
3
|
+
"version": "5.10.1",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -11,9 +11,9 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "4.
|
|
15
|
-
"@forge/cli-shared": "6.8.0
|
|
16
|
-
"@forge/csp": "3.
|
|
14
|
+
"@forge/bundler": "4.22.0",
|
|
15
|
+
"@forge/cli-shared": "6.8.0",
|
|
16
|
+
"@forge/csp": "3.7.0",
|
|
17
17
|
"@forge/runtime": "5.10.7",
|
|
18
18
|
"cloudflared": "^0.7.0",
|
|
19
19
|
"chokidar": "^3.6.0",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@atlassian/xen-test-util": "^4.2.0",
|
|
33
|
-
"@forge/manifest": "
|
|
33
|
+
"@forge/manifest": "9.0.0",
|
|
34
34
|
"@types/express": "^4.17.21",
|
|
35
35
|
"@types/jest": "^29.5.12",
|
|
36
36
|
"@types/node": "14.18.63",
|