@forge/tunnel 3.8.10-next.2 → 3.8.10-next.3
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 +9 -0
- package/out/command/interactors/multi-compiler-watcher.d.ts.map +1 -1
- package/out/command/interactors/multi-compiler-watcher.js +9 -1
- package/out/servers/dev-server.d.ts +2 -2
- package/out/servers/dev-server.d.ts.map +1 -1
- package/out/servers/dev-server.js +1 -1
- package/out/servers/native-ui-tunnel-server.d.ts +2 -1
- package/out/servers/native-ui-tunnel-server.d.ts.map +1 -1
- package/out/servers/native-ui-tunnel-server.js +7 -5
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
+
## 3.8.10-next.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 35d83ed: Don't crash tunnel if no functions are defined
|
|
8
|
+
- Updated dependencies [0344667]
|
|
9
|
+
- @forge/bundler@4.14.4-next.3
|
|
10
|
+
- @forge/cli-shared@3.23.0-next.2
|
|
11
|
+
|
|
3
12
|
## 3.8.10-next.2
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-compiler-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/multi-compiler-watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE9D,qBAAa,oBAAqB,YAAW,cAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB,EAAE;IAE5C,eAAe,CAAC,EAC3B,QAAQ,EAAE,EAAE,gBAAgB,EAAE,eAAe,EAAE,EAChD,EAAE;QACD,QAAQ,EAAE,UAAU,CAAC;KACtB,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"multi-compiler-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/multi-compiler-watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE9D,qBAAa,oBAAqB,YAAW,cAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB,EAAE;IAE5C,eAAe,CAAC,EAC3B,QAAQ,EAAE,EAAE,gBAAgB,EAAE,eAAe,EAAE,EAChD,EAAE;QACD,QAAQ,EAAE,UAAU,CAAC;KACtB,GAAG,OAAO,CAAC,aAAa,CAAC;IAgCb,IAAI;CAGlB"}
|
|
@@ -10,7 +10,15 @@ class MultiCompilerWatcher {
|
|
|
10
10
|
onBuildWillStart,
|
|
11
11
|
onBuildFinished
|
|
12
12
|
})));
|
|
13
|
-
|
|
13
|
+
const multiResult = {
|
|
14
|
+
output: {}
|
|
15
|
+
};
|
|
16
|
+
for (const result of results) {
|
|
17
|
+
multiResult.output = Object.assign(Object.assign({}, multiResult.output), result.output);
|
|
18
|
+
multiResult.sourceMap = Object.assign(Object.assign({}, multiResult.sourceMap), result.sourceMap);
|
|
19
|
+
multiResult.metadata = Object.assign(Object.assign({}, multiResult.metadata), result.metadata);
|
|
20
|
+
}
|
|
21
|
+
return multiResult;
|
|
14
22
|
}
|
|
15
23
|
async stop() {
|
|
16
24
|
await Promise.all(this.servers.map((server) => server.stop()));
|
|
@@ -14,7 +14,7 @@ export interface WatchHooks<T = any> {
|
|
|
14
14
|
export interface DevelopmentServer {
|
|
15
15
|
start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
|
|
16
16
|
stop(): Promise<void>;
|
|
17
|
-
compileAndWatch(hooks: WatchHooks<BundlerOutput>): Promise<
|
|
17
|
+
compileAndWatch(hooks: WatchHooks<BundlerOutput>): Promise<BundlerOutput>;
|
|
18
18
|
}
|
|
19
19
|
export interface StartDevServerResult {
|
|
20
20
|
port: number;
|
|
@@ -38,7 +38,7 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
|
|
|
38
38
|
constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, fileSystemReader: FileSystemReader);
|
|
39
39
|
start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
|
|
40
40
|
stop(): Promise<void>;
|
|
41
|
-
compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks<BundlerOutput>): Promise<BundlerOutput
|
|
41
|
+
compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks<BundlerOutput>): Promise<BundlerOutput>;
|
|
42
42
|
getApp(): express.Application;
|
|
43
43
|
handleInvocation: express.Handler;
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAY,MAAM,EAAqB,MAAM,mBAAmB,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,aAAa,EAMd,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,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,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAY,MAAM,EAAqB,MAAM,mBAAmB,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,aAAa,EAMd,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,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,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC3E;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;IATnC,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;IAQxC,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAIJ,eAAe,CAAC,EAC3B,gBAAgB,EAChB,eAAe,EAChB,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAsD9C,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CA2CtC;CACH"}
|
|
@@ -80,7 +80,7 @@ class LocalDevelopmentServer {
|
|
|
80
80
|
const handlers = await this.configFile.getAppHandlers();
|
|
81
81
|
const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
|
|
82
82
|
if (!entryPoints.length) {
|
|
83
|
-
return;
|
|
83
|
+
return { output: {} };
|
|
84
84
|
}
|
|
85
85
|
const getConfig = (await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs
|
|
86
86
|
? (0, bundler_2.getNodeRuntimeBuildConfig)((0, bundler_1.getWrapperProvider)({ fileSystemReader: this.fileSystemReader }))
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BundlerOutput } from '@forge/bundler';
|
|
1
2
|
import { ResourceTunnelServer, ResourceTunnelServerArgs } from './resource-tunnel-server';
|
|
2
3
|
import { DevelopmentServer, StartDevServerResult, WatchHooks } from './dev-server';
|
|
3
4
|
export declare class NativeUITunnelServer extends ResourceTunnelServer implements DevelopmentServer {
|
|
@@ -5,7 +6,7 @@ export declare class NativeUITunnelServer extends ResourceTunnelServer implement
|
|
|
5
6
|
private readonly server;
|
|
6
7
|
constructor(tunnelArgs: ResourceTunnelServerArgs);
|
|
7
8
|
start(): Promise<Required<StartDevServerResult>>;
|
|
8
|
-
compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks): Promise<
|
|
9
|
+
compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks): Promise<BundlerOutput>;
|
|
9
10
|
stop(): Promise<void>;
|
|
10
11
|
}
|
|
11
12
|
//# sourceMappingURL=native-ui-tunnel-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-ui-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/native-ui-tunnel-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"native-ui-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/native-ui-tunnel-server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAuE,MAAM,gBAAgB,CAAC;AACpH,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAG1F,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEnF,qBAAa,oBAAqB,SAAQ,oBAAqB,YAAW,iBAAiB;IAG7E,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;gBAEb,UAAU,EAAE,wBAAwB;IAoD3D,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAWzC,eAAe,CAAC,EAAE,gBAAgB,EAAE,eAAe,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAwCjG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5B"}
|
|
@@ -57,24 +57,26 @@ class NativeUITunnelServer extends resource_tunnel_server_1.ResourceTunnelServer
|
|
|
57
57
|
await onBuildWillStart();
|
|
58
58
|
watchRunCallback();
|
|
59
59
|
});
|
|
60
|
-
let
|
|
60
|
+
let isFirstCompilation = true;
|
|
61
61
|
return new Promise((resolve, reject) => {
|
|
62
62
|
compiler.hooks.done.tapAsync('done', async (stats, doneCallback) => {
|
|
63
63
|
const maybeError = stats.hasErrors() ? stats.compilation.getErrors()[0] : undefined;
|
|
64
64
|
try {
|
|
65
65
|
(0, bundler_1.handleWebpackCompilationResult)(this.logger, maybeError, stats);
|
|
66
66
|
this.logger.info(cli_shared_1.LogColor.trace(cli_shared_1.Text.tunnel.resourcesBundlingSucceeded));
|
|
67
|
-
if (!
|
|
67
|
+
if (!isFirstCompilation) {
|
|
68
68
|
await onBuildFinished(null);
|
|
69
69
|
}
|
|
70
70
|
else {
|
|
71
|
-
|
|
71
|
+
isFirstCompilation = false;
|
|
72
72
|
}
|
|
73
|
-
resolve({
|
|
73
|
+
resolve({
|
|
74
|
+
output: {}
|
|
75
|
+
});
|
|
74
76
|
}
|
|
75
77
|
catch (err) {
|
|
76
78
|
await onBuildFinished(err);
|
|
77
|
-
|
|
79
|
+
isFirstCompilation = false;
|
|
78
80
|
reject(err);
|
|
79
81
|
}
|
|
80
82
|
finally {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "3.8.10-next.
|
|
3
|
+
"version": "3.8.10-next.3",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "4.14.4-next.
|
|
15
|
-
"@forge/cli-shared": "3.23.0-next.
|
|
14
|
+
"@forge/bundler": "4.14.4-next.3",
|
|
15
|
+
"@forge/cli-shared": "3.23.0-next.2",
|
|
16
16
|
"@forge/csp": "3.1.3",
|
|
17
17
|
"@forge/runtime": "5.3.0-next.0",
|
|
18
18
|
"express": "^4.18.2",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@atlassian/xen-test-util": "^3.1.3",
|
|
30
|
-
"@forge/manifest": "5.4.1-next.
|
|
30
|
+
"@forge/manifest": "5.4.1-next.2",
|
|
31
31
|
"@types/express": "^4.17.21",
|
|
32
32
|
"@types/jest": "^29.5.11",
|
|
33
33
|
"@types/node": "14.18.63",
|