@ms-cloudpack/cli 0.3.1 → 0.4.0
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.json +36 -1
- package/CHANGELOG.md +16 -2
- package/lib/commands/start/startApiServer.d.ts +27 -29
- package/lib/commands/start/startApiServer.js +83 -36
- package/lib/commands/start/startApiServer.js.map +1 -1
- package/lib/commands/start/startAppServer.js +1 -1
- package/lib/commands/start/startAppServer.js.map +1 -1
- package/lib/commands/start/startBundleServer.js +19 -20
- package/lib/commands/start/startBundleServer.js.map +1 -1
- package/package.json +4 -4
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,42 @@
|
|
|
2
2
|
"name": "@ms-cloudpack/cli",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Sat, 13 Aug 2022 08:13:57 GMT",
|
|
6
|
+
"tag": "@ms-cloudpack/cli_v0.4.0",
|
|
7
|
+
"version": "0.4.0",
|
|
8
|
+
"comments": {
|
|
9
|
+
"minor": [
|
|
10
|
+
{
|
|
11
|
+
"author": "dzearing@microsoft.com",
|
|
12
|
+
"package": "@ms-cloudpack/cli",
|
|
13
|
+
"commit": "69781360664cac5e13e889efa2dc02bc55a60315",
|
|
14
|
+
"comment": "Updates to the CLI to host the overlay."
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@ms-cloudpack/cli",
|
|
19
|
+
"comment": "Bump @ms-cloudpack/bundler to v0.3.2",
|
|
20
|
+
"commit": "64ce73b69d840630fd4330720cdd5141f664535c"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "beachball",
|
|
24
|
+
"package": "@ms-cloudpack/cli",
|
|
25
|
+
"comment": "Bump @ms-cloudpack/overlay to v0.1.0",
|
|
26
|
+
"commit": "64ce73b69d840630fd4330720cdd5141f664535c"
|
|
27
|
+
}
|
|
28
|
+
],
|
|
29
|
+
"patch": [
|
|
30
|
+
{
|
|
31
|
+
"author": "email not defined",
|
|
32
|
+
"package": "@ms-cloudpack/cli",
|
|
33
|
+
"commit": "de8a826010b5c4db76b73057199dc860e2f59c36",
|
|
34
|
+
"comment": "Pin devDependencies to 2.1.3"
|
|
35
|
+
}
|
|
36
|
+
]
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
"date": "Fri, 12 Aug 2022 08:12:39 GMT",
|
|
6
41
|
"tag": "@ms-cloudpack/cli_v0.3.1",
|
|
7
42
|
"version": "0.3.1",
|
|
8
43
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
# Change Log - @ms-cloudpack/cli
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Sat, 13 Aug 2022 08:13:57 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.4.0
|
|
8
|
+
|
|
9
|
+
Sat, 13 Aug 2022 08:13:57 GMT
|
|
10
|
+
|
|
11
|
+
### Minor changes
|
|
12
|
+
|
|
13
|
+
- Updates to the CLI to host the overlay. (dzearing@microsoft.com)
|
|
14
|
+
- Bump @ms-cloudpack/bundler to v0.3.2
|
|
15
|
+
- Bump @ms-cloudpack/overlay to v0.1.0
|
|
16
|
+
|
|
17
|
+
### Patches
|
|
18
|
+
|
|
19
|
+
- Pin devDependencies to 2.1.3 (email not defined)
|
|
20
|
+
|
|
7
21
|
## 0.3.1
|
|
8
22
|
|
|
9
|
-
Fri, 12 Aug 2022 08:12:
|
|
23
|
+
Fri, 12 Aug 2022 08:12:39 GMT
|
|
10
24
|
|
|
11
25
|
### Patches
|
|
12
26
|
|
|
@@ -1,41 +1,38 @@
|
|
|
1
1
|
import type { Session } from './types.js';
|
|
2
|
-
import { type BundlerResult } from '@ms-cloudpack/bundler-types';
|
|
3
|
-
export interface ReportStartOptions {
|
|
4
|
-
sessionId: string;
|
|
5
|
-
bundleId: string;
|
|
6
|
-
packageName: string;
|
|
7
|
-
packageVersion: string;
|
|
8
|
-
packagePath: string;
|
|
9
|
-
outputPath: string;
|
|
10
|
-
}
|
|
11
|
-
export interface ReportEndOptions {
|
|
12
|
-
sessionId: string;
|
|
13
|
-
bundleId: string;
|
|
14
|
-
resultType: 'cached' | 'bundled';
|
|
15
|
-
result: BundlerResult | undefined;
|
|
16
|
-
}
|
|
17
|
-
export declare type SessionStatus = 'unknown' | 'idle' | 'building' | 'success' | 'warning' | 'error' | 'cancelled';
|
|
18
2
|
export interface SessionStats {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
totalWarningJobs: number;
|
|
25
|
-
pendingJobs: ReportStartOptions[];
|
|
26
|
-
allJobs: Record<string, {
|
|
27
|
-
start: ReportStartOptions;
|
|
28
|
-
end: ReportEndOptions;
|
|
29
|
-
}>;
|
|
3
|
+
status: 'idle' | 'pending';
|
|
4
|
+
remainingTasks: number;
|
|
5
|
+
totalTasks: number;
|
|
6
|
+
totalErrors: number;
|
|
7
|
+
totalWarnings: number;
|
|
30
8
|
}
|
|
31
9
|
export interface ApiServer {
|
|
32
10
|
url: string;
|
|
33
11
|
port: number;
|
|
34
12
|
notifyReload: () => void;
|
|
35
|
-
reportStart: (options:
|
|
36
|
-
reportEnd: (options:
|
|
13
|
+
reportStart: (options: TaskStartDescription) => void;
|
|
14
|
+
reportEnd: (options: TaskEndDescription) => void;
|
|
37
15
|
close: () => void;
|
|
38
16
|
}
|
|
17
|
+
interface TaskError {
|
|
18
|
+
message: string;
|
|
19
|
+
pluginName: string;
|
|
20
|
+
stack: string;
|
|
21
|
+
fileLocation: string;
|
|
22
|
+
lineNumber: number;
|
|
23
|
+
columnNumber: number;
|
|
24
|
+
}
|
|
25
|
+
interface TaskStartDescription {
|
|
26
|
+
id: string;
|
|
27
|
+
name: string;
|
|
28
|
+
inputPath: string;
|
|
29
|
+
outputPath: string;
|
|
30
|
+
}
|
|
31
|
+
interface TaskEndDescription {
|
|
32
|
+
id: string;
|
|
33
|
+
errors?: TaskError[];
|
|
34
|
+
warnings?: TaskError[];
|
|
35
|
+
}
|
|
39
36
|
/**
|
|
40
37
|
* The api server handles the data pub/sub (for things like reporting build status)
|
|
41
38
|
* and hosting the dashboard verb backend (for executing actions like loading vscode,
|
|
@@ -53,3 +50,4 @@ export interface ApiServer {
|
|
|
53
50
|
export declare function startApiServer({ session }: {
|
|
54
51
|
session: Session;
|
|
55
52
|
}): Promise<ApiServer>;
|
|
53
|
+
export {};
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import os from 'os';
|
|
1
2
|
import getPort from 'get-port';
|
|
3
|
+
import path from 'path';
|
|
2
4
|
import WebSocket, { WebSocketServer } from 'ws';
|
|
3
5
|
import { createDataBus } from '@ms-cloudpack/data-bus';
|
|
6
|
+
import { execSync } from 'child_process';
|
|
4
7
|
/**
|
|
5
8
|
* The api server handles the data pub/sub (for things like reporting build status)
|
|
6
9
|
* and hosting the dashboard verb backend (for executing actions like loading vscode,
|
|
@@ -19,39 +22,69 @@ export async function startApiServer({ session }) {
|
|
|
19
22
|
const port = await getPort({ port: [9890, 9891, 9892, 9893] });
|
|
20
23
|
const bus = createDataBus();
|
|
21
24
|
const sessionStats = {
|
|
22
|
-
status: '
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
status: 'idle',
|
|
26
|
+
remainingTasks: 0,
|
|
27
|
+
totalTasks: 0,
|
|
28
|
+
totalErrors: 0,
|
|
29
|
+
totalWarnings: 0,
|
|
27
30
|
};
|
|
28
|
-
const
|
|
31
|
+
const allTasks = new Map();
|
|
29
32
|
bus.publish([session.id, 'status'], sessionStats);
|
|
30
33
|
// Create a websocket server which listens for subscriptions and verb requests,
|
|
31
34
|
// and broadcasts the data to all connected clients.
|
|
32
35
|
const server = new WebSocketServer({ port }, () => {
|
|
33
36
|
// console.log(`ApiServer: Started on port ${port}`);
|
|
34
37
|
}).on('connection', (socket) => {
|
|
35
|
-
const disposables =
|
|
36
|
-
//
|
|
38
|
+
const disposables = new Map();
|
|
39
|
+
// console.log('ApiServer: Client connected');
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
41
|
+
function sendMessage(message) {
|
|
42
|
+
socket.send(JSON.stringify(message, null, 2));
|
|
43
|
+
}
|
|
37
44
|
socket
|
|
38
45
|
.on('message', async (rawData) => {
|
|
39
46
|
const request = JSON.parse(rawData.toString());
|
|
40
|
-
//
|
|
47
|
+
// console.log(`ApiServer: Received message: ${JSON.stringify(request, null, 2)}`);
|
|
41
48
|
switch (request.type) {
|
|
42
49
|
case 'subscribe': {
|
|
43
|
-
|
|
50
|
+
const { path: subscriptionPath, id } = request.data;
|
|
51
|
+
disposables.set(id, bus.subscribe(subscriptionPath,
|
|
44
52
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
|
-
(data) => {
|
|
46
|
-
|
|
47
|
-
|
|
53
|
+
(data) => sendMessage({ type: 'notify', id, path: subscriptionPath, data })));
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
case 'unsubscribe': {
|
|
57
|
+
const { id } = request.data;
|
|
58
|
+
if (id) {
|
|
59
|
+
const dispose = disposables.get(id);
|
|
60
|
+
if (dispose) {
|
|
61
|
+
dispose();
|
|
62
|
+
disposables.delete(id);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
case 'openSource': {
|
|
68
|
+
const { rootPath, relativePath = '', line, column } = request.data;
|
|
69
|
+
const fullPath = path.join(rootPath, relativePath);
|
|
70
|
+
console.log(`Opening VSCode with path: ${fullPath}`);
|
|
71
|
+
execSync(`code --goto ${fullPath}:${line}:${column}`, { cwd: process.cwd() });
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
case 'open': {
|
|
75
|
+
const { rootPath, relativePath = '' } = request.data;
|
|
76
|
+
const fullPath = path.join(rootPath, relativePath);
|
|
77
|
+
console.log(`Opening path: ${fullPath}`);
|
|
78
|
+
const openCommand = os.platform() == 'win32' ? 'start' : 'open';
|
|
79
|
+
execSync(`${openCommand} ${fullPath}`, { cwd: process.cwd() });
|
|
48
80
|
break;
|
|
49
81
|
}
|
|
50
82
|
}
|
|
51
83
|
})
|
|
52
84
|
.on('close', () => {
|
|
53
|
-
|
|
54
|
-
|
|
85
|
+
for (const d of disposables.values()) {
|
|
86
|
+
d();
|
|
87
|
+
}
|
|
55
88
|
});
|
|
56
89
|
});
|
|
57
90
|
return {
|
|
@@ -67,32 +100,46 @@ export async function startApiServer({ session }) {
|
|
|
67
100
|
}
|
|
68
101
|
});
|
|
69
102
|
},
|
|
70
|
-
reportStart(
|
|
71
|
-
const previousResult =
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
sessionStats.
|
|
75
|
-
sessionStats.completeJobCount--;
|
|
103
|
+
reportStart(taskStart) {
|
|
104
|
+
const previousResult = allTasks.get(taskStart.id);
|
|
105
|
+
const now = new Date().getTime();
|
|
106
|
+
if (!previousResult) {
|
|
107
|
+
sessionStats.totalTasks++;
|
|
76
108
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
109
|
+
if (previousResult?.status === 'complete') {
|
|
110
|
+
sessionStats.totalErrors -= previousResult.errors?.length || 0;
|
|
111
|
+
sessionStats.totalWarnings -= previousResult.warnings?.length || 0;
|
|
112
|
+
}
|
|
113
|
+
sessionStats.remainingTasks++;
|
|
114
|
+
sessionStats.status = 'pending';
|
|
115
|
+
allTasks.set(taskStart.id, {
|
|
116
|
+
...taskStart,
|
|
117
|
+
status: 'pending',
|
|
118
|
+
startTime: now,
|
|
119
|
+
});
|
|
80
120
|
bus.publish([session.id, 'status'], sessionStats);
|
|
121
|
+
bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });
|
|
81
122
|
},
|
|
82
123
|
reportEnd: (end) => {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
sessionStats.
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
124
|
+
const previousResult = allTasks.get(end.id);
|
|
125
|
+
const now = new Date().getTime();
|
|
126
|
+
if (previousResult) {
|
|
127
|
+
sessionStats.remainingTasks--;
|
|
128
|
+
sessionStats.totalErrors += end.errors?.length || 0;
|
|
129
|
+
sessionStats.totalWarnings += end.warnings?.length || 0;
|
|
130
|
+
allTasks.set(end.id, {
|
|
131
|
+
...previousResult,
|
|
132
|
+
...end,
|
|
133
|
+
status: 'complete',
|
|
134
|
+
durationMilliseconds: now - previousResult.startTime,
|
|
135
|
+
lastUpdated: now,
|
|
136
|
+
});
|
|
137
|
+
if (sessionStats.remainingTasks === 0) {
|
|
138
|
+
sessionStats.status = 'idle';
|
|
139
|
+
}
|
|
140
|
+
bus.publish([session.id, 'status'], sessionStats);
|
|
141
|
+
bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });
|
|
93
142
|
}
|
|
94
|
-
allJobs[end.bundleId].end = end;
|
|
95
|
-
bus.publish([session.id, 'status'], sessionStats);
|
|
96
143
|
},
|
|
97
144
|
close: () => server.close(),
|
|
98
145
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../../../src/commands/start/startApiServer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,SAAS,EAAE,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../../../src/commands/start/startApiServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ export async function startAppServer({ session, bundleServer, apiServer, }) {
|
|
|
40
40
|
}
|
|
41
41
|
const requestPath = slash(req.path.substring(1));
|
|
42
42
|
const requestExt = path.extname(requestPath);
|
|
43
|
-
const entryScript =
|
|
43
|
+
const entryScript = importMap.imports[definition.name || ''];
|
|
44
44
|
log(`App server: Request: ${requestPath}, ext: ${requestExt}, ${port}`);
|
|
45
45
|
sendHtmlResponse({
|
|
46
46
|
session,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../src/commands/start/startAppServer.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAkB,MAAM,iCAAiC,CAAC;AACxG,OAAO,EAAE,gBAAgB,EAA+B,MAAM,kCAAkC,CAAC;AAKjG,6DAA6D;AAC7D,MAAM,GAAG,GAAG,CAAC,QAAiB,EAAE,EAAE;IAChC,6CAA6C;AAC/C,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,GAKV;IACC,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,MAAM,qBAAqB,GAAG,SAAS,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,SAAS,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAEnE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;QAChF,iCAAiC;QACjC,GAAG;aACA,GAAG,CAAC,eAAe,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;YACpD,gBAAgB,CAAC;gBACf,OAAO;gBACP,KAAK,EAAE,qBAAqB;gBAC5B,SAAS;gBACT,SAAS;gBACT,WAAW,EAAE,CAAC,qBAAqB,EAAE,eAAe,CAAC;gBACrD,GAAG;aACJ,CAAC,CAAC;QACL,CAAC,CAAC;aACD,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;YAC9C,IAAI,CAAC,UAAU,EAAE;gBACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yCAAyC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;gBACnF,OAAO;aACR;YAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../src/commands/start/startAppServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,12 +93,9 @@ export async function startBundleServer({ session, apiServer, }) {
|
|
|
93
93
|
async function createBundle() {
|
|
94
94
|
// Start tracking work.
|
|
95
95
|
apiServer.reportStart({
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
packageVersion: version,
|
|
100
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
101
|
-
packagePath: packagePath,
|
|
96
|
+
id: bundleId,
|
|
97
|
+
name: `Bundle ${packageName}@${version}`,
|
|
98
|
+
inputPath: packagePath || '',
|
|
102
99
|
outputPath,
|
|
103
100
|
});
|
|
104
101
|
try {
|
|
@@ -130,11 +127,13 @@ export async function startBundleServer({ session, apiServer, }) {
|
|
|
130
127
|
}
|
|
131
128
|
createdBundles[bundleId] = bundleRequest;
|
|
132
129
|
delete pendingBundles[bundleId];
|
|
130
|
+
// TODO: errors and warnings typings don't match up. We need to reconcile.
|
|
133
131
|
apiServer.reportEnd({
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
132
|
+
id: bundleId,
|
|
133
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
134
|
+
errors: bundleRequest.result?.errors,
|
|
135
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
136
|
+
warnings: bundleRequest.result?.warnings,
|
|
138
137
|
});
|
|
139
138
|
resolve(bundleRequest);
|
|
140
139
|
});
|
|
@@ -215,15 +214,13 @@ function initializeFileWatcher(session, bundleId, outputPath, bundleRequest, pen
|
|
|
215
214
|
pendingBundles[id] = new Promise(async (resolveIncremental) => {
|
|
216
215
|
do {
|
|
217
216
|
bundleRequest.isRebuildRequired = false;
|
|
218
|
-
log(`[Start] >> Bundling "${packageName}@${version}"`);
|
|
217
|
+
log(`[Start] >> Bundling "${packageName}@${version}" to "${outputPath}"`);
|
|
219
218
|
// Start tracking work.
|
|
220
219
|
apiServer.reportStart({
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
packageName,
|
|
224
|
-
packageVersion: version,
|
|
220
|
+
id: bundleId,
|
|
221
|
+
name: `Rebundle ${packageName}@${version}`,
|
|
225
222
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
226
|
-
|
|
223
|
+
inputPath: packagePath,
|
|
227
224
|
outputPath,
|
|
228
225
|
});
|
|
229
226
|
if (!bundleOutput?.rebuild) {
|
|
@@ -232,11 +229,13 @@ function initializeFileWatcher(session, bundleId, outputPath, bundleRequest, pen
|
|
|
232
229
|
else if (bundleOutput?.rebuild) {
|
|
233
230
|
bundleOutput = await bundleOutput.rebuild();
|
|
234
231
|
}
|
|
232
|
+
// TODO: Fix typings
|
|
235
233
|
apiServer.reportEnd({
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
234
|
+
id: bundleId,
|
|
235
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
236
|
+
errors: bundleOutput?.errors,
|
|
237
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
238
|
+
warnings: bundleOutput?.warnings,
|
|
240
239
|
});
|
|
241
240
|
log(`[ End ] << Bundled "${packageName}@${version}" (${bundleOutput?.outputFiles?.length || 0} file(s), ${bundleOutput?.errors?.length || 0} errors)`);
|
|
242
241
|
} while (bundleRequest.isRebuildRequired);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;AAE9B,2FAA2F;AAE3F,MAAM,GAAG,GAAG,CAAC,GAAG,QAAmB,EAAE,EAAE;IACrC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,QAAQ,CAAC,CAAC;AAC5C,CAAC,CAAC;AAwBF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,SAAS,GAIV;IACC,MAAM,cAAc,GAAkC,EAAE,CAAC;IACzD,MAAM,cAAc,GAA2C,EAAE,CAAC;IAClE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAY,EAAE,EAAE;QACzF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzE,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,WAAW,GACf,CAAC,CAAC,OAAO,IAAI,YAAY,EAAE,OAAO,KAAK,OAAO;gBAC5C,CAAC,CAAC,YAAY,EAAE,IAAI;gBACpB,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;YACpD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC;YAE5C,GAAG,CAAC,aAAa,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;YAEvD,gDAAgD;YAChD,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE;gBAChC,GAAG,CAAC,oBAAoB,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAE9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;gBACjG,OAAO;aACR;YAED,8DAA8D;YAC9D,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;gBAEhD,IAAI,CAAC,eAAe,EAAE;oBACpB,GAAG,CAAC,yCAAyC,WAAW,GAAG,CAAC,CAAC;oBAE7D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,CAAC,CAAC;oBAC/D,OAAO;iBACR;gBAED,GAAG,CAAC,QAAQ,CAAC,IAAI,WAAW,IAAI,eAAe,CAAC,OAAO,GAAG,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO;aACR;YAED,wCAAwC;YACxC,IAAI,CAAC,WAAW,EAAE;gBAChB,GAAG,CAAC,kCAAkC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAE5E,GAAG;qBACA,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CAAC,0BAA0B,WAAW,IAAI,OAAO,GAAG,QAAQ,qCAAqC,CAAC,CAAC;gBAE1G,OAAO;aACR;YAED,uCAAuC;YACvC,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;gBAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;YAEH,qCAAqC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,EAAE,CAAC,MAAM,EAAE,EACX,kBAAkB,EAClB,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CACpD,CAAC;YAEF,IAAI,MAAM,GAA8B,cAAc,CAAC,QAAQ,CAAC,CAAC;YAEjE,6FAA6F;YAC7F,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBACnC,MAAM,GAAG,SAAS,CAAC;gBACnB,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;aACjC;YAED,mFAAmF;YACnF,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE;gBACpB,IAAI,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE7C,4DAA4D;gBAC5D,IAAI,CAAC,aAAa,EAAE;oBAClB,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;wBAChF,MAAM,aAAa,GAAkB;4BACnC,EAAE,EAAE,QAAQ;4BACZ,WAAW;4BACX,OAAO,EAAE,OAAO;4BAChB,WAAW;4BACX,UAAU;4BACV,UAAU;yBACX,CAAC;wBAEF,sDAAsD;wBACtD,KAAK,UAAU,YAAY;4BACzB,uBAAuB;4BACvB,SAAS,CAAC,WAAW,CAAC;gCACpB,EAAE,EAAE,QAAQ;gCACZ,IAAI,EAAE,UAAU,WAAW,IAAI,OAAO,EAAE;gCACxC,SAAS,EAAE,WAAW,IAAI,EAAE;gCAC5B,UAAU;6BACX,CAAC,CAAC;4BAEH,IAAI;gCACF,GAAG,CAAC,wCAAwC,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;gCAEvE,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;gCAE5B,GAAG,CAAC,wBAAwB,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;gCAEvD,uFAAuF;gCACvF,0CAA0C;gCAC1C,IAAI,WAAW,EAAE;oCACf,GAAG,CAAC,qBAAqB,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;oCACpD,MAAM,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;oCAEnC,+EAA+E;oCAC/E,WAAW;oCACX,IAAI,CAAC,UAAU,EAAE;wCACf,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;wCAC/F,GAAG,CAAC,oBAAoB,UAAU,EAAE,CAAC,CAAC;qCACvC;iCACF;6BACF;4BAAC,OAAO,CAAC,EAAE;gCACV,WAAW;6BACZ;wBACH,CAAC;wBAED,0DAA0D;wBAC1D,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;4BACvB,8CAA8C;4BAC9C,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE;gCAC5B,cAAc,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;6BACtC;4BAED,cAAc,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC;4BACzC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;4BAEhC,0EAA0E;4BAC1E,SAAS,CAAC,SAAS,CAAC;gCAClB,EAAE,EAAE,QAAQ;gCACZ,8DAA8D;gCAC9D,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,MAAa;gCAC3C,8DAA8D;gCAC9D,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,QAAe;6BAChD,CAAC,CAAC;4BAEH,OAAO,CAAC,aAAa,CAAC,CAAC;wBACzB,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,GAAG,CAAC,kDAAkD,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;iBAC7F;gBAED,MAAM,GAAG,MAAM,aAAa,CAAC;aAC9B;iBAAM;gBACL,GAAG,CAAC,4CAA4C,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;aACvF;YAED,4FAA4F;YAC5F,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBAClC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;aACzF;YAED,oDAAoD;YACpD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC5C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3C;iBAAM;gBACL,GAAG,CAAC,oCAAoC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAC9E,4BAA4B;gBAC5B,IAAI,UAAU,EAAE;oBACd,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;iBAC5D;gBAED,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,oBAAoB,IAAI,EAAE,CAAC;IACvC,GAAG,CAAC,0BAA0B,GAAG,GAAG,CAAC,CAAC;IAEtC,OAAO;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,qDAAqD;YACrD,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;QACD,IAAI;QACJ,GAAG;KACJ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,aAA4B,EAAE,KAAe;IACjE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAE9D,2CAA2C;IAC3C,IAAI,UAAU,IAAI,CAAC,KAAK,EAAE;QACxB,aAAa,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;KAC7E;IAED,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC;IAEjE,6CAA6C;IAC7C,IAAI,CAAC,aAAa,EAAE;QAClB,aAAa,CAAC,MAAM,GAAG,MAAM,aAAa,CAAC;YACzC,WAAW;YACX,UAAU;YACV,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,CAAC,UAAU;SACzB,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,UAAU,EAAE;YACd,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;SAC7E;KACF;SAAM;QACL,GAAG,CAAC,8BAA8B,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,GAAG,CAAC,CAAC;KAC1F;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,aAA4B,EAC5B,cAAsD,EACtD,SAAoB;IAEpB,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAChE,IAAI,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC;IAExC,GAAG,CAAC,iCAAiC,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC;IAE/D,sGAAsG;IACtG,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC3F,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;YACvB,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC;YACvC,GAAG,CAAC,oBAAoB,KAAK,kBAAkB,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;YAE1E,qDAAqD;YACrD,cAAc,CAAC,EAAE,CAAC,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBAC5D,GAAG;oBACD,aAAa,CAAC,iBAAiB,GAAG,KAAK,CAAC;oBAExC,GAAG,CAAC,wBAAwB,WAAW,IAAI,OAAO,SAAS,UAAU,GAAG,CAAC,CAAC;oBAC1E,uBAAuB;oBACvB,SAAS,CAAC,WAAW,CAAC;wBACpB,EAAE,EAAE,QAAQ;wBACZ,IAAI,EAAE,YAAY,WAAW,IAAI,OAAO,EAAE;wBAC1C,oEAAoE;wBACpE,SAAS,EAAE,WAAY;wBACvB,UAAU;qBACX,CAAC,CAAC;oBAEH,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE;wBAC1B,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;qBACrD;yBAAM,IAAI,YAAY,EAAE,OAAO,EAAE;wBAChC,YAAY,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;qBAC7C;oBAED,oBAAoB;oBACpB,SAAS,CAAC,SAAS,CAAC;wBAClB,EAAE,EAAE,QAAQ;wBACZ,8DAA8D;wBAC9D,MAAM,EAAE,YAAY,EAAE,MAAa;wBACnC,8DAA8D;wBAC9D,QAAQ,EAAE,YAAY,EAAE,QAAe;qBACxC,CAAC,CAAC;oBAEH,GAAG,CACD,uBAAuB,WAAW,IAAI,OAAO,MAAM,YAAY,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,aACvF,YAAY,EAAE,MAAM,EAAE,MAAM,IAAI,CAClC,UAAU,CACX,CAAC;iBACH,QAAQ,aAAa,CAAC,iBAAiB,EAAE;gBAE1C,OAAO,cAAc,CAAC,EAAE,CAAC,CAAC;gBAC1B,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE;oBACjC,GAAG,CAAC,sBAAsB,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC;oBACpD,SAAS,CAAC,YAAY,EAAE,CAAC;iBAC1B;gBAED,kBAAkB,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,4EAA4E;YAC5E,0CAA0C;YAC1C,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAEvC,GAAG,CAAC,oBAAoB,KAAK,2BAA2B,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;SACpF;IACH,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
"cloudpack": "./lib/cloudpack.js"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@ms-cloudpack/bundler": "^0.3.
|
|
19
|
+
"@ms-cloudpack/bundler": "^0.3.2",
|
|
20
20
|
"@ms-cloudpack/create-express-app": "^0.1.0",
|
|
21
21
|
"@ms-cloudpack/data-bus": "^0.1.0",
|
|
22
22
|
"@ms-cloudpack/json-utilities": "^0.0.3",
|
|
23
|
-
"@ms-cloudpack/overlay": "^0.0
|
|
23
|
+
"@ms-cloudpack/overlay": "^0.1.0",
|
|
24
24
|
"@ms-cloudpack/package-utilities": "^0.6.1",
|
|
25
25
|
"@ms-cloudpack/path-utilities": "^0.3.1",
|
|
26
26
|
"chokidar": "^3.5.3",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@ms-cloudpack/bundler-types": "*",
|
|
37
37
|
"@ms-cloudpack/eslint-config-base": "*",
|
|
38
38
|
"@ms-cloudpack/scripts": "*",
|
|
39
|
-
"@types/chokidar": "
|
|
39
|
+
"@types/chokidar": "2.1.3",
|
|
40
40
|
"@types/fs-extra": "9.0.13",
|
|
41
41
|
"@types/glob": "7.2.0",
|
|
42
42
|
"@types/object-hash": "2.2.1",
|