@ms-cloudpack/cli 0.1.0 → 0.1.1

package/CHANGELOG.json

@@ -2,7 +2,34 @@
   "name": "@ms-cloudpack/cli",
   "entries": [
     {
-      "date": "Fri, 20 May 2022 04:25:53 GMT",
+      "date": "Sat, 21 May 2022 00:31:20 GMT",
+      "tag": "@ms-cloudpack/cli_v0.1.1",
+      "version": "0.1.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/cli",
+            "commit": "c26c7bcc7abda501d07180598e3da003b435b03b",
+            "comment": "Adding call to burn import map on the page and placeholder html rendering logic."
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.1.1",
+            "commit": "c26c7bcc7abda501d07180598e3da003b435b03b"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/package-utilities to v0.3.0",
+            "commit": "c26c7bcc7abda501d07180598e3da003b435b03b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 20 May 2022 04:26:15 GMT",
       "tag": "@ms-cloudpack/cli_v0.1.0",
       "version": "0.1.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Change Log - @ms-cloudpack/cli
 
-This log was last generated on Fri, 20 May 2022 04:25:53 GMT and should not be manually modified.
+This log was last generated on Sat, 21 May 2022 00:31:20 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.1.1
+
+Sat, 21 May 2022 00:31:20 GMT
+
+### Patches
+
+- Adding call to burn import map on the page and placeholder html rendering logic. (dzearing@microsoft.com)
+- Bump @ms-cloudpack/bundler to v0.1.1
+- Bump @ms-cloudpack/package-utilities to v0.3.0
+
 ## 0.1.0
 
-Fri, 20 May 2022 04:25:53 GMT
+Fri, 20 May 2022 04:26:15 GMT
 
 ### Minor changes
 

package/lib/commands/start/start.js

@@ -1,5 +1,7 @@
 import { createSession } from './createSession.js';
 import { startBundleServer } from './startBundleServer.js';
+import { startAppServer } from './startAppServer.js';
+import { openBrowser } from './openBrowser.js';
 /**
  * Defines the "start" verb entry point.
  */
@@ -8,15 +10,14 @@ export async function start() {
     // Initialize session definition.
     const session = await createSession({ appPath });
     const bundleServer = await startBundleServer(session);
-    // TODO: Re-enable the app server once it's online.
-    // const [bundleServer, appServer] = await Promise.all([startBundleServer(session), startAppServer()]);
+    const appServer = await startAppServer(session, `http://localhost:${bundleServer.port}`);
     // Close things on completion.
     process.on('SIGINT', async function () {
         bundleServer.close();
-        // appServer.close();
+        appServer.close();
         process.exit(0);
     });
     // TODO: Uncomment when app server is added back. Open the browser.
-    // openBrowser(`http://localhost:${appServer.port}`);
+    openBrowser(`http://localhost:${appServer.port}`);
 }
 //# sourceMappingURL=start.js.map

package/lib/commands/start/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE9B,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAEtD,mDAAmD;IACnD,uGAAuG;IAEvG,8BAA8B;IAC9B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK;QACxB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,qBAAqB;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,qDAAqD;AACvD,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE9B,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,oBAAoB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEzF,8BAA8B;IAC9B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK;QACxB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,WAAW,CAAC,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC"}

package/lib/commands/start/startAppServer.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
+import type { Session } from './types.js';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.
@@ -7,7 +8,7 @@
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export declare function startAppServer(): Promise<{
+export declare function startAppServer(session: Session, bundleServerUrl: string): Promise<{
     close: () => import("http").Server;
     port: number;
 }>;

package/lib/commands/start/startAppServer.js

@@ -1,6 +1,7 @@
 // import type { Session } from './types.js';
 import path from 'path';
 import { slash } from '@ms-cloudpack/path-utilities';
+import { createImportMap } from '@ms-cloudpack/package-utilities';
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
@@ -10,14 +11,27 @@ import { createExpressApp } from '@ms-cloudpack/create-express-app';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export async function startAppServer() {
+export async function startAppServer(session, bundleServerUrl) {
+    const importMap = await createImportMap(session.resolveMap, bundleServerUrl);
     const { server, port } = await createExpressApp([5000, 5001, 5002, 5003], (app) => {
         // Set up the express app routes.
         app.get('*', async (req, res) => {
             const requestPath = slash(req.path.substring(1));
             const requestExt = path.extname(requestPath);
+            const entryScript = `${bundleServerUrl}/session/app/lib/index.js`; // getEntryScript(requestPath);
             console.log(`App server: Request: ${requestPath}, ext: ${requestExt}, ${port}`);
-            res.send(`<html><body>hello</body></html>`);
+            res.cookie('cloudpack-session-id', session.id);
+            res.set('Content-Security-Policy', `connect-src 'self' ws:;`);
+            res.send(`
+      <html>
+        <head>
+          <script type="importmap">${JSON.stringify(importMap, null, 2)}</script>
+        </head>
+        <body>
+          <script type="module" src="${entryScript}"></script>
+        </body>
+      </html>
+      `);
         });
     });
     return {

package/lib/commands/start/startAppServer.js.map

@@ -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,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,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,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,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE7C,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,UAAU,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC;YAEhF,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,IAAI;KACL,CAAC;AACJ,CAAC"}
+{"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,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,eAAuB;IAC5E,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAE7E,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,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,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,GAAG,eAAe,2BAA2B,CAAC,CAAC,+BAA+B;YAElG,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,UAAU,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC;YAEhF,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,yBAAyB,CAAC,CAAC;YAE9D,GAAG,CAAC,IAAI,CAAC;;;qCAGsB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;;;uCAGhC,WAAW;;;OAG3C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,IAAI;KACL,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -16,10 +16,10 @@
     "cloudpack": "./lib/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.1.0",
+    "@ms-cloudpack/bundler": "^0.1.1",
     "@ms-cloudpack/create-express-app": "^0.1.0",
     "@ms-cloudpack/json-utilities": "^0.0.3",
-    "@ms-cloudpack/package-utilities": "^0.2.0",
+    "@ms-cloudpack/package-utilities": "^0.3.0",
     "@ms-cloudpack/path-utilities": "^0.2.0",
     "commander": "^9.1.0",
     "filenamify": "^5.1.0",