@ms-cloudpack/storybook-builder 0.5.21 → 0.6.0

package/lib/index.js

@@ -33,7 +33,7 @@ export const bail = async (error) => {
         }
     }));
 };
-export const start = async ({ options, startTime, router, server: devServer }) => {
+export const start = async ({ options, startTime, router, server: expressServer }) => {
     const previewResolvedDir = await resolve('@storybook/preview', currentDir);
     if (!previewResolvedDir) {
         throw new Error(`Could not resolve @storybook/preview from ${currentDir}`);
@@ -105,7 +105,7 @@ export const start = async ({ options, startTime, router, server: devServer }) =
     // Start bundle and app servers for hosting the app.
     const { appServer, bundleServer } = await startServers({
         definition: appDefinition,
-        server: devServer,
+        expressServer,
         // TODO: Get options and enable this.
         bundleServerOptions: { disableCache: false },
     }, apiContext);

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { startServers } from '@ms-cloudpack/app-server';\nimport type { PackageJsonExportsObject } from '@ms-cloudpack/common-types';\nimport { getLocalCachePath } from '@ms-cloudpack/config';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { resolve } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { findPackageRoot, normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport { loadPreviewOrConfigFile } from '@storybook/core-common';\nimport type { Builder, Options } from '@storybook/types';\nimport fsExtra from 'fs-extra';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { generateIframeHtml } from './generateIFrameHtml.js';\nimport { listStories } from './listStories.js';\nimport { createApiContext } from './createApiContext.js';\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url));\n\ntype CloudpackBuilder = Builder<Options>;\n\ntype ClosableServer = {\n  close: () => Promise<void>;\n  url: string;\n};\n\nconst servers: Record<string, ClosableServer | undefined> = {};\n\nexport const bail: CloudpackBuilder['bail'] = async (error) => {\n  if (error) {\n    console.error('Error:', error);\n  }\n\n  await Promise.all(\n    Object.entries(servers).map(async ([name, server]) => {\n      if (!server) return;\n\n      const desc = `${name} (${server.url})`;\n      console.info(`Closing ${desc}`);\n      try {\n        await server.close();\n        console.info(`Closed ${desc}`);\n      } catch (err) {\n        console.warn(`Error closing ${desc}:`, err);\n      }\n    }),\n  );\n};\n\nexport const start: CloudpackBuilder['start'] = async ({ options, startTime, router, server: devServer }) => {\n  const previewResolvedDir = await resolve('@storybook/preview', currentDir);\n  if (!previewResolvedDir) {\n    throw new Error(`Could not resolve @storybook/preview from ${currentDir}`);\n  }\n  const previewDirOrigin = path.join(previewResolvedDir, 'dist');\n\n  router.use('/sb-preview', express.static(previewDirOrigin, { immutable: true, maxAge: '5m' }));\n\n  // TODO: This might be useful later on.\n  // const env = await options.presets.apply<Record<string, string>>('env');\n\n  // eslint-disable-next-line no-restricted-properties -- this is where we find the appPath\n  const cwd = process.cwd();\n  const appPath = findPackageRoot(cwd);\n  if (!appPath) {\n    throw new Error(`Could not find package.json relative to ${cwd}`);\n  }\n\n  const apiContext = await createApiContext({ appPath, storybookOptions: options });\n  const { packages, session } = apiContext;\n  const { config } = session;\n\n  // Resolve the story files, and find the preview/config file.\n  const { storySpecifiers, resolvedStories } = await listStories({ storybookOptions: options, appPath });\n  const previewOrConfigFile = loadPreviewOrConfigFile(options);\n\n  // Overwrite the exports of the app package to just contain the stories and preview/config file.\n  packages.registerTransform(() => ({ definition, packagePath }) => {\n    if (slash(appPath) !== slash(packagePath)) {\n      return;\n    }\n\n    // We just need a simple path mapping for the stories, so it's not necessary to use addExportsMapEntry.\n    const exports: PackageJsonExportsObject = {};\n\n    for (const story of resolvedStories) {\n      if (!story.startsWith('./')) {\n        // Not sure if this is even allowed by Storybook, but check just in case...\n        // In theory we could handle this by either modifying the exports of the other package too,\n        // or possibly by enabling autoUpdateEntries so the file will be bundled on import.\n        throw new Error(`Cloudpack does not support stories outside of the package root: ${story}`);\n      }\n      exports[story] = story;\n    }\n\n    if (previewOrConfigFile) {\n      const normalizedPreview = normalizedPathRelativeTo(appPath, previewOrConfigFile);\n      if (!normalizedPreview.startsWith('./')) {\n        // Not sure if this is allowed by storybook either\n        throw new Error(\n          `Cloudpack does not support preview/config files outside of the package root: ${previewOrConfigFile}`,\n        );\n      }\n      exports[normalizedPreview] = normalizedPreview;\n    }\n\n    return { ...definition, exports };\n  });\n\n  const appDefinition = await packages.get(appPath);\n\n  // Storybook set up is mostly done here.\n  const generated = await generateIframeHtml(\n    { storybookOptions: options, storySpecifiers, resolvedStories, appDefinition, previewOrConfigFile },\n    apiContext,\n  );\n\n  // TODO: Currently saving it to disk as the config only accepts a path.\n  const cachePath = getLocalCachePath(appPath);\n  await fsExtra.ensureDir(cachePath);\n  const iFramePath = path.join(cachePath, 'iframe.html');\n  await fsPromises.writeFile(iFramePath, generated, { encoding: 'utf-8' });\n\n  // iFrame script is required for storybook to work.\n  config.routes ??= [];\n  config.routes.push({\n    match: '/iframe.html',\n    renderScript: iFramePath,\n  });\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  // Start api server for tracking status and handling remote requests.\n  servers.apiServer = await createCloudpackServer({}, apiContext);\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({\n    input: { name: appDefinition.name, version: appDefinition.version },\n    ctx: apiContext,\n  });\n\n  // Start bundle and app servers for hosting the app.\n  const { appServer, bundleServer } = await startServers(\n    {\n      definition: appDefinition,\n      server: devServer,\n      // TODO: Get options and enable this.\n      bundleServerOptions: { disableCache: false },\n    },\n    apiContext,\n  );\n  servers.appServer = appServer;\n  servers.bundleServer = bundleServer;\n\n  router.use(appServer.app);\n\n  // TODO: Figure out if it is possible to know when browser will open.\n  // performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n\n  return {\n    bail,\n    totalTime: process.hrtime(startTime),\n  };\n};\n\nexport const build: CloudpackBuilder['build'] = () => {\n  console.log('Cloudpack Storybook build is not implemented yet.');\n  process.exit(1);\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { startServers } from '@ms-cloudpack/app-server';\nimport type { PackageJsonExportsObject } from '@ms-cloudpack/common-types';\nimport { getLocalCachePath } from '@ms-cloudpack/config';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { resolve } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { findPackageRoot, normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport { loadPreviewOrConfigFile } from '@storybook/core-common';\nimport type { Builder, Options } from '@storybook/types';\nimport fsExtra from 'fs-extra';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { generateIframeHtml } from './generateIFrameHtml.js';\nimport { listStories } from './listStories.js';\nimport { createApiContext } from './createApiContext.js';\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url));\n\ntype CloudpackBuilder = Builder<Options>;\n\ntype ClosableServer = {\n  close: () => Promise<void>;\n  url: string;\n};\n\nconst servers: Record<string, ClosableServer | undefined> = {};\n\nexport const bail: CloudpackBuilder['bail'] = async (error) => {\n  if (error) {\n    console.error('Error:', error);\n  }\n\n  await Promise.all(\n    Object.entries(servers).map(async ([name, server]) => {\n      if (!server) return;\n\n      const desc = `${name} (${server.url})`;\n      console.info(`Closing ${desc}`);\n      try {\n        await server.close();\n        console.info(`Closed ${desc}`);\n      } catch (err) {\n        console.warn(`Error closing ${desc}:`, err);\n      }\n    }),\n  );\n};\n\nexport const start: CloudpackBuilder['start'] = async ({ options, startTime, router, server: expressServer }) => {\n  const previewResolvedDir = await resolve('@storybook/preview', currentDir);\n  if (!previewResolvedDir) {\n    throw new Error(`Could not resolve @storybook/preview from ${currentDir}`);\n  }\n  const previewDirOrigin = path.join(previewResolvedDir, 'dist');\n\n  router.use('/sb-preview', express.static(previewDirOrigin, { immutable: true, maxAge: '5m' }));\n\n  // TODO: This might be useful later on.\n  // const env = await options.presets.apply<Record<string, string>>('env');\n\n  // eslint-disable-next-line no-restricted-properties -- this is where we find the appPath\n  const cwd = process.cwd();\n  const appPath = findPackageRoot(cwd);\n  if (!appPath) {\n    throw new Error(`Could not find package.json relative to ${cwd}`);\n  }\n\n  const apiContext = await createApiContext({ appPath, storybookOptions: options });\n  const { packages, session } = apiContext;\n  const { config } = session;\n\n  // Resolve the story files, and find the preview/config file.\n  const { storySpecifiers, resolvedStories } = await listStories({ storybookOptions: options, appPath });\n  const previewOrConfigFile = loadPreviewOrConfigFile(options);\n\n  // Overwrite the exports of the app package to just contain the stories and preview/config file.\n  packages.registerTransform(() => ({ definition, packagePath }) => {\n    if (slash(appPath) !== slash(packagePath)) {\n      return;\n    }\n\n    // We just need a simple path mapping for the stories, so it's not necessary to use addExportsMapEntry.\n    const exports: PackageJsonExportsObject = {};\n\n    for (const story of resolvedStories) {\n      if (!story.startsWith('./')) {\n        // Not sure if this is even allowed by Storybook, but check just in case...\n        // In theory we could handle this by either modifying the exports of the other package too,\n        // or possibly by enabling autoUpdateEntries so the file will be bundled on import.\n        throw new Error(`Cloudpack does not support stories outside of the package root: ${story}`);\n      }\n      exports[story] = story;\n    }\n\n    if (previewOrConfigFile) {\n      const normalizedPreview = normalizedPathRelativeTo(appPath, previewOrConfigFile);\n      if (!normalizedPreview.startsWith('./')) {\n        // Not sure if this is allowed by storybook either\n        throw new Error(\n          `Cloudpack does not support preview/config files outside of the package root: ${previewOrConfigFile}`,\n        );\n      }\n      exports[normalizedPreview] = normalizedPreview;\n    }\n\n    return { ...definition, exports };\n  });\n\n  const appDefinition = await packages.get(appPath);\n\n  // Storybook set up is mostly done here.\n  const generated = await generateIframeHtml(\n    { storybookOptions: options, storySpecifiers, resolvedStories, appDefinition, previewOrConfigFile },\n    apiContext,\n  );\n\n  // TODO: Currently saving it to disk as the config only accepts a path.\n  const cachePath = getLocalCachePath(appPath);\n  await fsExtra.ensureDir(cachePath);\n  const iFramePath = path.join(cachePath, 'iframe.html');\n  await fsPromises.writeFile(iFramePath, generated, { encoding: 'utf-8' });\n\n  // iFrame script is required for storybook to work.\n  config.routes ??= [];\n  config.routes.push({\n    match: '/iframe.html',\n    renderScript: iFramePath,\n  });\n\n  const { createCloudpackServer } = await import('@ms-cloudpack/api-server');\n\n  // Start api server for tracking status and handling remote requests.\n  servers.apiServer = await createCloudpackServer({}, apiContext);\n\n  // Kick off bundling app package as soon as api server is ready.\n  void ensurePackageBundled({\n    input: { name: appDefinition.name, version: appDefinition.version },\n    ctx: apiContext,\n  });\n\n  // Start bundle and app servers for hosting the app.\n  const { appServer, bundleServer } = await startServers(\n    {\n      definition: appDefinition,\n      expressServer,\n      // TODO: Get options and enable this.\n      bundleServerOptions: { disableCache: false },\n    },\n    apiContext,\n  );\n  servers.appServer = appServer;\n  servers.bundleServer = bundleServer;\n\n  router.use(appServer.app);\n\n  // TODO: Figure out if it is possible to know when browser will open.\n  // performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n\n  return {\n    bail,\n    totalTime: process.hrtime(startTime),\n  };\n};\n\nexport const build: CloudpackBuilder['build'] = () => {\n  console.log('Cloudpack Storybook build is not implemented yet.');\n  process.exit(1);\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/storybook-builder",
-  "version": "0.5.21",
+  "version": "0.6.0",
   "description": "A tool for building storybook bundles for the cloudpack ecosystem.",
   "license": "MIT",
   "type": "module",
@@ -22,17 +22,17 @@
     "lint": "cloudpack-scripts lint"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.52.3",
-    "@ms-cloudpack/app-server": "^0.15.18",
-    "@ms-cloudpack/common-types": "^0.20.0",
-    "@ms-cloudpack/config": "^0.29.2",
-    "@ms-cloudpack/create-express-app": "^1.9.1",
-    "@ms-cloudpack/overlay": "^0.17.71",
-    "@ms-cloudpack/package-utilities": "^10.1.2",
+    "@ms-cloudpack/api-server": "^0.53.0",
+    "@ms-cloudpack/app-server": "^0.16.0",
+    "@ms-cloudpack/common-types": "^0.21.0",
+    "@ms-cloudpack/config": "^0.30.0",
+    "@ms-cloudpack/create-express-app": "^1.9.2",
+    "@ms-cloudpack/overlay": "^0.17.72",
+    "@ms-cloudpack/package-utilities": "^10.1.3",
     "@ms-cloudpack/path-string-parsing": "^1.2.4",
-    "@ms-cloudpack/path-utilities": "^2.7.45",
+    "@ms-cloudpack/path-utilities": "^2.7.46",
     "@ms-cloudpack/task-reporter": "^0.14.5",
-    "@ms-cloudpack/telemetry": "^0.6.2",
+    "@ms-cloudpack/telemetry": "^0.6.3",
     "@storybook/core-common": "^7.0.0",
     "@storybook/node-logger": "^7.0.0",
     "@storybook/preview": "^7.0.0",
@@ -42,7 +42,7 @@
     "ts-dedent": "^2.2.0"
   },
   "devDependencies": {
-    "@ms-cloudpack/common-types": "^0.20.0",
+    "@ms-cloudpack/common-types": "^0.21.0",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@storybook/types": "^7.0.0"