@ms-cloudpack/storybook-builder 0.5.4 → 0.5.6

package/lib/createApiContext.d.ts

@@ -0,0 +1,8 @@
+import { type Context } from '@ms-cloudpack/api-server';
+import type { Options } from '@storybook/types';
+/** Create the Cloudpack context. */
+export declare function createApiContext(options: {
+    appPath: string;
+    storybookOptions: Options;
+}): Promise<Context>;
+//# sourceMappingURL=createApiContext.d.ts.map

package/lib/createApiContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createApiContext.d.ts","sourceRoot":"","sources":["../src/createApiContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAYjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,oCAAoC;AACpC,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAyEhH"}

package/lib/createApiContext.js

@@ -0,0 +1,71 @@
+import { createPartialApiContext } from '@ms-cloudpack/api-server';
+import { readConfig } from '@ms-cloudpack/config';
+import { getDisplayVersion, getVersion, isExternalPackage, resolve } from '@ms-cloudpack/package-utilities';
+import { bold, debugLoggingConfig, defaultLoggingConfig, noLoggingConfig, TaskReporter, verboseLoggingConfig, } from '@ms-cloudpack/task-reporter';
+import { createTelemetryClient } from '@ms-cloudpack/telemetry';
+import path from 'path';
+import { fileURLToPath } from 'url';
+const currentDir = path.dirname(fileURLToPath(import.meta.url));
+/** Create the Cloudpack context. */
+export async function createApiContext(options) {
+    const { appPath, storybookOptions } = options;
+    const { loglevel } = storybookOptions;
+    const config = await readConfig(appPath);
+    // TODO: Move to won package.
+    // runPrerequisites(config, appPath);
+    // This part should be almost identical to the cli start command.
+    const reporter = new TaskReporter({
+        productName: 'Storybook + Cloudpack',
+        version: getDisplayVersion(import.meta.url),
+        description: () => `Running "${bold('storybook')}"`,
+        helpMessage: config.helpMessage,
+        // TODO: Get options and enable this.
+        plainTextMode: storybookOptions.ci,
+        ...(loglevel === 'debug'
+            ? debugLoggingConfig
+            : loglevel === 'verbose'
+                ? verboseLoggingConfig
+                : storybookOptions.quiet || loglevel === 'quiet'
+                    ? noLoggingConfig
+                    : defaultLoggingConfig),
+    });
+    const connectionString = storybookOptions.disableTelemetry
+        ? undefined
+        : config.telemetry?.connectionString || process.env.CLOUDPACK_TELEMETRY_CONNECTION_STRING;
+    if (loglevel !== 'debug') {
+        reporter.ignoreLogMessage('ApplicationInsights:');
+    }
+    const telemetryClient = await createTelemetryClient({
+        productVersion: getVersion(import.meta.url),
+        connectionString,
+        logLevel: loglevel === 'verbose' ? 'VERBOSE' : loglevel === 'debug' ? 'DEBUG' : undefined,
+        serviceNamespace: 'cloudpack',
+        serviceName: 'storybook',
+        rootSpanName: 'storybook',
+    });
+    // Register performance observers to track performance metrics as events of CLI span.
+    // registerPerformanceObservers(telemetryClient);
+    let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);
+    // If overlay is an internal package, resolve the overlay from the current package's linked node modules
+    // to "externalize" it, so that we always use the bundled version of the overlay instead of the source.
+    if (overlayPath && !isExternalPackage(overlayPath)) {
+        overlayPath = path.resolve(currentDir, '../node_modules/@ms-cloudpack/overlay');
+    }
+    const apiContext = await createPartialApiContext({
+        appPath,
+        config,
+        reporter,
+        telemetryClient,
+        items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
+        overlayPath,
+    });
+    // TODO: Get options and enable this.
+    // Increment the session version if caching is disabled.
+    // if (options.cache === false) {
+    //   session.incrementSessionVersion();
+    // }
+    // Set shared telemetry attributes which will be sent with all telemetry events.
+    apiContext.telemetryClient.setSharedSpanAttribute('sessionId', apiContext.session.id);
+    return apiContext;
+}
+//# sourceMappingURL=createApiContext.js.map

package/lib/createApiContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createApiContext.js","sourceRoot":"","sources":["../src/createApiContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAgB,MAAM,0BAA0B,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC5G,OAAO,EACL,IAAI,EACJ,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEhE,oCAAoC;AACpC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAuD;IAC5F,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAC9C,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IAEzC,6BAA6B;IAC7B,qCAAqC;IAErC,iEAAiE;IACjE,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC;QAChC,WAAW,EAAE,uBAAuB;QACpC,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,GAAG;QACnD,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,qCAAqC;QACrC,aAAa,EAAE,gBAAgB,CAAC,EAAE;QAClC,GAAG,CAAC,QAAQ,KAAK,OAAO;YACtB,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,QAAQ,KAAK,SAAS;gBACtB,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,gBAAgB,CAAC,KAAK,IAAI,QAAQ,KAAK,OAAO;oBAC9C,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,oBAAoB,CAAC;KAC9B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB;QACxD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC;IAE5F,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,QAAQ,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC;QAClD,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,gBAAgB;QAChB,QAAQ,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QACzF,gBAAgB,EAAE,WAAW;QAC7B,WAAW,EAAE,WAAW;QACxB,YAAY,EAAE,WAAW;KAC1B,CAAC,CAAC;IAEH,qFAAqF;IACrF,iDAAiD;IAEjD,IAAI,WAAW,GAAG,MAAM,OAAO,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAC;IAErE,wGAAwG;IACxG,uGAAuG;IACvG,IAAI,WAAW,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,uCAAuC,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC;QAC/C,OAAO;QACP,MAAM;QACN,QAAQ;QACR,eAAe;QACf,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,eAAe,CAAC;QACrG,WAAW;KACZ,CAAC,CAAC;IAEH,qCAAqC;IACrC,wDAAwD;IACxD,iCAAiC;IACjC,uCAAuC;IACvC,IAAI;IAEJ,gFAAgF;IAChF,UAAU,CAAC,eAAe,CAAC,sBAAsB,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEtF,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import { createPartialApiContext, type Context } from '@ms-cloudpack/api-server';\nimport { readConfig } from '@ms-cloudpack/config';\nimport { getDisplayVersion, getVersion, isExternalPackage, resolve } from '@ms-cloudpack/package-utilities';\nimport {\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  noLoggingConfig,\n  TaskReporter,\n  verboseLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { createTelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { Options } from '@storybook/types';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url));\n\n/** Create the Cloudpack context. */\nexport async function createApiContext(options: { appPath: string; storybookOptions: Options }): Promise<Context> {\n  const { appPath, storybookOptions } = options;\n  const { loglevel } = storybookOptions;\n\n  const config = await readConfig(appPath);\n\n  // TODO: Move to won package.\n  // runPrerequisites(config, appPath);\n\n  // This part should be almost identical to the cli start command.\n  const reporter = new TaskReporter({\n    productName: 'Storybook + Cloudpack',\n    version: getDisplayVersion(import.meta.url),\n    description: () => `Running \"${bold('storybook')}\"`,\n    helpMessage: config.helpMessage,\n    // TODO: Get options and enable this.\n    plainTextMode: storybookOptions.ci,\n    ...(loglevel === 'debug'\n      ? debugLoggingConfig\n      : loglevel === 'verbose'\n        ? verboseLoggingConfig\n        : storybookOptions.quiet || loglevel === 'quiet'\n          ? noLoggingConfig\n          : defaultLoggingConfig),\n  });\n\n  const connectionString = storybookOptions.disableTelemetry\n    ? undefined\n    : config.telemetry?.connectionString || process.env.CLOUDPACK_TELEMETRY_CONNECTION_STRING;\n\n  if (loglevel !== 'debug') {\n    reporter.ignoreLogMessage('ApplicationInsights:');\n  }\n\n  const telemetryClient = await createTelemetryClient({\n    productVersion: getVersion(import.meta.url),\n    connectionString,\n    logLevel: loglevel === 'verbose' ? 'VERBOSE' : loglevel === 'debug' ? 'DEBUG' : undefined,\n    serviceNamespace: 'cloudpack',\n    serviceName: 'storybook',\n    rootSpanName: 'storybook',\n  });\n\n  // Register performance observers to track performance metrics as events of CLI span.\n  // registerPerformanceObservers(telemetryClient);\n\n  let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);\n\n  // If overlay is an internal package, resolve the overlay from the current package's linked node modules\n  // to \"externalize\" it, so that we always use the bundled version of the overlay instead of the source.\n  if (overlayPath && !isExternalPackage(overlayPath)) {\n    overlayPath = path.resolve(currentDir, '../node_modules/@ms-cloudpack/overlay');\n  }\n\n  const apiContext = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    overlayPath,\n  });\n\n  // TODO: Get options and enable this.\n  // Increment the session version if caching is disabled.\n  // if (options.cache === false) {\n  //   session.incrementSessionVersion();\n  // }\n\n  // Set shared telemetry attributes which will be sent with all telemetry events.\n  apiContext.telemetryClient.setSharedSpanAttribute('sessionId', apiContext.session.id);\n\n  return apiContext;\n}\n"]}

package/lib/generateIFrameHtml.d.ts

@@ -1,9 +1,14 @@
-import type { Options } from '@storybook/types';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { Session } from '@ms-cloudpack/api-server';
+import type { NormalizedStoriesSpecifier, Options } from '@storybook/types';
+import type { PartialContext } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
 export type PreviewHtml = string | undefined;
-export declare function generateIframeHtml(options: Options, context: {
-    packages: PackageDefinitionsCache;
-    session: Session;
-}): Promise<string>;
+export declare function generateIframeHtml(options: {
+    storybookOptions: Options;
+    appDefinition: PackageJson;
+    storySpecifiers: NormalizedStoriesSpecifier[];
+    /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */
+    resolvedStories: string[];
+    /** Absolute path to storybook preview or config file for the app */
+    previewOrConfigFile: string | undefined;
+}, context: PartialContext<'packages', 'config'>): Promise<string>;
 //# sourceMappingURL=generateIFrameHtml.d.ts.map

package/lib/generateIFrameHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateIFrameHtml.d.ts","sourceRoot":"","sources":["../src/generateIFrameHtml.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAA2B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKzE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAIxD,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,SAAS,CAAC;AAE7C,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAC/D,OAAO,CAAC,MAAM,CAAC,CAmDjB"}
+{"version":3,"file":"generateIFrameHtml.d.ts","sourceRoot":"","sources":["../src/generateIFrameHtml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA2B,0BAA0B,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKrG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,SAAS,CAAC;AAE7C,wBAAsB,kBAAkB,CACtC,OAAO,EAAE;IACP,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,WAAW,CAAC;IAC3B,eAAe,EAAE,0BAA0B,EAAE,CAAC;IAC9C,oGAAoG;IACpG,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,oEAAoE;IACpE,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,EACD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,GAC5C,OAAO,CAAC,MAAM,CAAC,CAgDjB"}

package/lib/generateIFrameHtml.js

@@ -1,17 +1,17 @@
 // based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/transform-iframe-html.ts
-import { normalizeStories } from '@storybook/core-common';
 import { readFile } from 'fs/promises';
 import { fileURLToPath } from 'url';
 import path from 'path';
 import { generateModernIframeScriptCode } from './generateModernIframeScriptCode.js';
 let generatedIframeHtml = undefined;
 export async function generateIframeHtml(options, context) {
-    if (options.features?.storyStoreV7 === false) {
+    const { storybookOptions, storySpecifiers } = options;
+    const { configType, features, presets, serverChannelUrl } = storybookOptions;
+    if (features?.storyStoreV7 === false) {
         throw new Error('Cloudpack only supports storyStoreV7');
     }
     const iFramePath = path.join(path.dirname(fileURLToPath(import.meta.url)), '../static/iframeTemplate.html');
     const iframeHtmlTemplate = await readFile(iFramePath, { encoding: 'utf-8' });
-    const { configType, features, presets, serverChannelUrl, configDir } = options;
     const build = await presets.apply('build');
     const frameworkOptions = await presets.apply('frameworkOptions');
     const headHtmlSnippet = await presets.apply('previewHead');
@@ -19,10 +19,7 @@ export async function generateIframeHtml(options, context) {
     const logLevel = await presets.apply('logLevel', undefined);
     const docsOptions = await presets.apply('docs');
     const coreOptions = await presets.apply('core');
-    const stories = normalizeStories(await presets.apply('stories', [], options), {
-        configDir,
-        workingDir: context.session.config.appPath,
-    }).map((specifier) => ({
+    const stories = storySpecifiers.map((specifier) => ({
         ...specifier,
         importPathMatcher: specifier.importPathMatcher.source,
     }));

package/lib/generateIFrameHtml.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateIFrameHtml.js","sourceRoot":"","sources":["../src/generateIFrameHtml.ts"],"names":[],"mappings":"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","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/transform-iframe-html.ts\n\nimport { normalizeStories } from '@storybook/core-common';\nimport type { CoreConfig, DocsOptions, Options } from '@storybook/types';\nimport { readFile } from 'fs/promises';\nimport { fileURLToPath } from 'url';\nimport path from 'path';\nimport { generateModernIframeScriptCode } from './generateModernIframeScriptCode.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { Session } from '@ms-cloudpack/api-server';\n\nlet generatedIframeHtml: string | undefined = undefined;\n\nexport type PreviewHtml = string | undefined;\n\nexport async function generateIframeHtml(\n  options: Options,\n  context: { packages: PackageDefinitionsCache; session: Session },\n): Promise<string> {\n  if (options.features?.storyStoreV7 === false) {\n    throw new Error('Cloudpack only supports storyStoreV7');\n  }\n\n  const iFramePath = path.join(path.dirname(fileURLToPath(import.meta.url)), '../static/iframeTemplate.html');\n  const iframeHtmlTemplate = await readFile(iFramePath, { encoding: 'utf-8' });\n  const { configType, features, presets, serverChannelUrl, configDir } = options;\n  const build = await presets.apply('build');\n  const frameworkOptions = await presets.apply<Record<string, unknown> | null>('frameworkOptions');\n  const headHtmlSnippet = await presets.apply<PreviewHtml>('previewHead');\n  const bodyHtmlSnippet = await presets.apply<PreviewHtml>('previewBody');\n  const logLevel = await presets.apply('logLevel', undefined);\n  const docsOptions = await presets.apply<DocsOptions>('docs');\n\n  const coreOptions = await presets.apply<CoreConfig>('core');\n  const stories = normalizeStories(await presets.apply('stories', [], options), {\n    configDir,\n    workingDir: context.session.config.appPath,\n  }).map((specifier) => ({\n    ...specifier,\n    importPathMatcher: specifier.importPathMatcher.source,\n  }));\n\n  const otherGlobals = {\n    ...(build?.test?.disableBlocks ? { __STORYBOOK_BLOCKS_EMPTY_MODULE__: {} } : {}),\n  };\n\n  generatedIframeHtml = iframeHtmlTemplate\n    .replace('[CONFIG_TYPE HERE]', configType || '')\n    .replace('[LOGLEVEL HERE]', logLevel || '')\n    .replace(`'[FRAMEWORK_OPTIONS HERE]'`, JSON.stringify(frameworkOptions))\n    .replace(\n      `('OTHER_GLOBLALS HERE');`,\n      Object.entries(otherGlobals)\n        .map(([k, v]) => `window[\"${k}\"] = ${JSON.stringify(v)};`)\n        .join(''),\n    )\n    .replace(\n      `'[CHANNEL_OPTIONS HERE]'`,\n      JSON.stringify(coreOptions && coreOptions.channelOptions ? coreOptions.channelOptions : {}),\n    )\n    .replace(`'[FEATURES HERE]'`, JSON.stringify(features || {}))\n    .replace(`'[STORIES HERE]'`, JSON.stringify(stories || {}))\n    .replace(`'[DOCS_OPTIONS HERE]'`, JSON.stringify(docsOptions || {}))\n    .replace(`'[SERVER_CHANNEL_URL HERE]'`, JSON.stringify(serverChannelUrl))\n    .replace('<!-- [HEAD HTML SNIPPET HERE] -->', headHtmlSnippet || '')\n    .replace('<!-- [BODY HTML SNIPPET HERE] -->', bodyHtmlSnippet || '')\n    .replace(`('[APP MODULE SRC HERE]');`, await generateModernIframeScriptCode(options, context));\n\n  return generatedIframeHtml;\n}\n"]}
+{"version":3,"file":"generateIFrameHtml.js","sourceRoot":"","sources":["../src/generateIFrameHtml.ts"],"names":[],"mappings":"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","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/transform-iframe-html.ts\n\nimport type { CoreConfig, DocsOptions, NormalizedStoriesSpecifier, Options } from '@storybook/types';\nimport { readFile } from 'fs/promises';\nimport { fileURLToPath } from 'url';\nimport path from 'path';\nimport { generateModernIframeScriptCode } from './generateModernIframeScriptCode.js';\nimport type { PartialContext } from '@ms-cloudpack/api-server';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\n\nlet generatedIframeHtml: string | undefined = undefined;\n\nexport type PreviewHtml = string | undefined;\n\nexport async function generateIframeHtml(\n  options: {\n    storybookOptions: Options;\n    appDefinition: PackageJson;\n    storySpecifiers: NormalizedStoriesSpecifier[];\n    /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */\n    resolvedStories: string[];\n    /** Absolute path to storybook preview or config file for the app */\n    previewOrConfigFile: string | undefined;\n  },\n  context: PartialContext<'packages', 'config'>,\n): Promise<string> {\n  const { storybookOptions, storySpecifiers } = options;\n  const { configType, features, presets, serverChannelUrl } = storybookOptions;\n  if (features?.storyStoreV7 === false) {\n    throw new Error('Cloudpack only supports storyStoreV7');\n  }\n\n  const iFramePath = path.join(path.dirname(fileURLToPath(import.meta.url)), '../static/iframeTemplate.html');\n  const iframeHtmlTemplate = await readFile(iFramePath, { encoding: 'utf-8' });\n  const build = await presets.apply('build');\n  const frameworkOptions = await presets.apply<Record<string, unknown> | null>('frameworkOptions');\n  const headHtmlSnippet = await presets.apply<PreviewHtml>('previewHead');\n  const bodyHtmlSnippet = await presets.apply<PreviewHtml>('previewBody');\n  const logLevel = await presets.apply('logLevel', undefined);\n  const docsOptions = await presets.apply<DocsOptions>('docs');\n  const coreOptions = await presets.apply<CoreConfig>('core');\n  const stories = storySpecifiers.map((specifier) => ({\n    ...specifier,\n    importPathMatcher: specifier.importPathMatcher.source,\n  }));\n\n  const otherGlobals = {\n    ...(build?.test?.disableBlocks ? { __STORYBOOK_BLOCKS_EMPTY_MODULE__: {} } : {}),\n  };\n\n  generatedIframeHtml = iframeHtmlTemplate\n    .replace('[CONFIG_TYPE HERE]', configType || '')\n    .replace('[LOGLEVEL HERE]', logLevel || '')\n    .replace(`'[FRAMEWORK_OPTIONS HERE]'`, JSON.stringify(frameworkOptions))\n    .replace(\n      `('OTHER_GLOBLALS HERE');`,\n      Object.entries(otherGlobals)\n        .map(([k, v]) => `window[\"${k}\"] = ${JSON.stringify(v)};`)\n        .join(''),\n    )\n    .replace(\n      `'[CHANNEL_OPTIONS HERE]'`,\n      JSON.stringify(coreOptions && coreOptions.channelOptions ? coreOptions.channelOptions : {}),\n    )\n    .replace(`'[FEATURES HERE]'`, JSON.stringify(features || {}))\n    .replace(`'[STORIES HERE]'`, JSON.stringify(stories || {}))\n    .replace(`'[DOCS_OPTIONS HERE]'`, JSON.stringify(docsOptions || {}))\n    .replace(`'[SERVER_CHANNEL_URL HERE]'`, JSON.stringify(serverChannelUrl))\n    .replace('<!-- [HEAD HTML SNIPPET HERE] -->', headHtmlSnippet || '')\n    .replace('<!-- [BODY HTML SNIPPET HERE] -->', bodyHtmlSnippet || '')\n    .replace(`('[APP MODULE SRC HERE]');`, await generateModernIframeScriptCode(options, context));\n\n  return generatedIframeHtml;\n}\n"]}

package/lib/generateImportFnScriptCode.d.ts

@@ -1,14 +1,13 @@
-import type { Options } from '@storybook/types';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { Session } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
 /**
  * This function takes an array of stories and creates a mapping between the stories' relative paths
  * to the working directory and their dynamic imports. The import is done in an asynchronous function
  * to delay loading. It then creates a function, `importFn(path)`, which resolves a path to an import
  * function and this is called by Storybook to fetch a story dynamically when needed.
  */
-export declare function generateImportFnScriptCode(options: Options, context: {
-    packages: PackageDefinitionsCache;
-    session: Session;
-}): Promise<string>;
+export declare function generateImportFnScriptCode(options: {
+    appDefinition: PackageJson;
+    /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */
+    resolvedStories: string[];
+}): string;
 //# sourceMappingURL=generateImportFnScriptCode.d.ts.map

package/lib/generateImportFnScriptCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateImportFnScriptCode.d.ts","sourceRoot":"","sources":["../src/generateImportFnScriptCode.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKhD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAYxD;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAC/D,OAAO,CAAC,MAAM,CAAC,CA8BjB"}
+{"version":3,"file":"generateImportFnScriptCode.d.ts","sourceRoot":"","sources":["../src/generateImportFnScriptCode.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE;IAClD,aAAa,EAAE,WAAW,CAAC;IAC3B,oGAAoG;IACpG,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,GAAG,MAAM,CAuBT"}

package/lib/generateImportFnScriptCode.js

@@ -1,39 +1,23 @@
 // based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/codegen-importfn-script.ts
-import { listStories } from './listStories.js';
-import { slash } from '@ms-cloudpack/path-string-parsing';
 import path from 'path';
 import { logger } from '@storybook/node-logger';
 import { dedent } from 'ts-dedent';
-/**
- * Paths get passed either with no leading './' - e.g. `src/Foo.stories.js`,
- * or with a leading `../` (etc), e.g. `../src/Foo.stories.js`.
- * We want to deal in importPaths relative to the working dir, so we normalize
- */
-function toImportPath(relativePath) {
-    return relativePath.startsWith('../') ? relativePath : `./${relativePath}`;
-}
 /**
  * This function takes an array of stories and creates a mapping between the stories' relative paths
  * to the working directory and their dynamic imports. The import is done in an asynchronous function
  * to delay loading. It then creates a function, `importFn(path)`, which resolves a path to an import
  * function and this is called by Storybook to fetch a story dynamically when needed.
  */
-export async function generateImportFnScriptCode(options, context) {
-    const { packages, session } = context;
-    const { appPath } = session.config;
-    const definition = await packages.get(appPath);
-    if (!definition) {
-        throw new Error('Could not find package definition for the current app');
-    }
-    const stories = await listStories(options);
-    const objectEntries = stories.map((file) => {
-        const ext = path.extname(file);
-        const relativeStoryPath = slash(path.relative(appPath, file));
+export function generateImportFnScriptCode(options) {
+    const { resolvedStories, appDefinition } = options;
+    const objectEntries = resolvedStories.map((story) => {
+        const ext = path.extname(story);
         // TODO: Add support for '.mdx',
         if (!['.js', '.jsx', '.ts', '.tsx'].includes(ext)) {
-            logger.warn(`Cannot process ${ext} file: ${relativeStoryPath}`);
+            logger.warn(`Cannot process ${ext} file: ${story}`);
         }
-        return `  '${toImportPath(relativeStoryPath)}': async () => import('${definition.name}/${relativeStoryPath}')`;
+        // Add the package name and remove the ./ from the story path
+        return `  '${story}': async () => import('${appDefinition.name}/${story.slice(2)}')`;
     });
     return dedent `
     const importers = {

package/lib/generateImportFnScriptCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateImportFnScriptCode.js","sourceRoot":"","sources":["../src/generateImportFnScriptCode.ts"],"names":[],"mappings":"AAAA,0HAA0H;AAG1H,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,SAAS,YAAY,CAAC,YAAoB;IACxC,OAAO,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC;AAC7E,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAgB,EAChB,OAAgE;IAEhE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IACnC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9D,gCAAgC;QAChC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,UAAU,iBAAiB,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,MAAM,YAAY,CAAC,iBAAiB,CAAC,0BAA0B,UAAU,CAAC,IAAI,IAAI,iBAAiB,IAAI,CAAC;IACjH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAA;;QAEP,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;;;;;;KAM5B,CAAC;AACN,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/codegen-importfn-script.ts\n\nimport type { Options } from '@storybook/types';\nimport { listStories } from './listStories.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { logger } from '@storybook/node-logger';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport { dedent } from 'ts-dedent';\n\n/**\n * Paths get passed either with no leading './' - e.g. `src/Foo.stories.js`,\n * or with a leading `../` (etc), e.g. `../src/Foo.stories.js`.\n * We want to deal in importPaths relative to the working dir, so we normalize\n */\nfunction toImportPath(relativePath: string) {\n  return relativePath.startsWith('../') ? relativePath : `./${relativePath}`;\n}\n\n/**\n * This function takes an array of stories and creates a mapping between the stories' relative paths\n * to the working directory and their dynamic imports. The import is done in an asynchronous function\n * to delay loading. It then creates a function, `importFn(path)`, which resolves a path to an import\n * function and this is called by Storybook to fetch a story dynamically when needed.\n */\nexport async function generateImportFnScriptCode(\n  options: Options,\n  context: { packages: PackageDefinitionsCache; session: Session },\n): Promise<string> {\n  const { packages, session } = context;\n  const { appPath } = session.config;\n  const definition = await packages.get(appPath);\n\n  if (!definition) {\n    throw new Error('Could not find package definition for the current app');\n  }\n\n  const stories = await listStories(options);\n  const objectEntries = stories.map((file) => {\n    const ext = path.extname(file);\n    const relativeStoryPath = slash(path.relative(appPath, file));\n    // TODO: Add support for '.mdx',\n    if (!['.js', '.jsx', '.ts', '.tsx'].includes(ext)) {\n      logger.warn(`Cannot process ${ext} file: ${relativeStoryPath}`);\n    }\n\n    return `  '${toImportPath(relativeStoryPath)}': async () => import('${definition.name}/${relativeStoryPath}')`;\n  });\n\n  return dedent`\n    const importers = {\n      ${objectEntries.join(',\\n')}\n    };\n\n    export async function importFn(path) {\n        return importers[path]();\n    }\n    `;\n}\n"]}
+{"version":3,"file":"generateImportFnScriptCode.js","sourceRoot":"","sources":["../src/generateImportFnScriptCode.ts"],"names":[],"mappings":"AAAA,0HAA0H;AAE1H,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CAAC,OAI1C;IACC,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAClD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,gCAAgC;QAChC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,UAAU,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,6DAA6D;QAC7D,OAAO,MAAM,KAAK,0BAA0B,aAAa,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAA;;QAEP,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;;;;;;KAM5B,CAAC;AACN,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/codegen-importfn-script.ts\n\nimport path from 'path';\nimport { logger } from '@storybook/node-logger';\nimport { dedent } from 'ts-dedent';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\n\n/**\n * This function takes an array of stories and creates a mapping between the stories' relative paths\n * to the working directory and their dynamic imports. The import is done in an asynchronous function\n * to delay loading. It then creates a function, `importFn(path)`, which resolves a path to an import\n * function and this is called by Storybook to fetch a story dynamically when needed.\n */\nexport function generateImportFnScriptCode(options: {\n  appDefinition: PackageJson;\n  /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */\n  resolvedStories: string[];\n}): string {\n  const { resolvedStories, appDefinition } = options;\n\n  const objectEntries = resolvedStories.map((story) => {\n    const ext = path.extname(story);\n    // TODO: Add support for '.mdx',\n    if (!['.js', '.jsx', '.ts', '.tsx'].includes(ext)) {\n      logger.warn(`Cannot process ${ext} file: ${story}`);\n    }\n\n    // Add the package name and remove the ./ from the story path\n    return `  '${story}': async () => import('${appDefinition.name}/${story.slice(2)}')`;\n  });\n\n  return dedent`\n    const importers = {\n      ${objectEntries.join(',\\n')}\n    };\n\n    export async function importFn(path) {\n        return importers[path]();\n    }\n    `;\n}\n"]}

package/lib/generateModernIframeScriptCode.d.ts

@@ -1,8 +1,12 @@
-import type { Session } from '@ms-cloudpack/api-server';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
 import type { Options } from '@storybook/types';
-export declare function generateModernIframeScriptCode(options: Options, context: {
-    packages: PackageDefinitionsCache;
-    session: Session;
-}): Promise<string>;
+import type { PartialContext } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
+export declare function generateModernIframeScriptCode(options: {
+    storybookOptions: Pick<Options, 'presets'>;
+    appDefinition: PackageJson;
+    /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */
+    resolvedStories: string[];
+    /** Absolute path to storybook preview or config file for the app */
+    previewOrConfigFile: string | undefined;
+}, context: PartialContext<'packages', 'config'>): Promise<string>;
 //# sourceMappingURL=generateModernIframeScriptCode.d.ts.map

package/lib/generateModernIframeScriptCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateModernIframeScriptCode.d.ts","sourceRoot":"","sources":["../src/generateModernIframeScriptCode.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAI1E,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kBAAkB,CAAC;AAOnE,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAC/D,OAAO,CAAC,MAAM,CAAC,CAqDjB"}
+{"version":3,"file":"generateModernIframeScriptCode.d.ts","sourceRoot":"","sources":["../src/generateModernIframeScriptCode.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kBAAkB,CAAC;AAKnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,wBAAsB,8BAA8B,CAClD,OAAO,EAAE;IACP,gBAAgB,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,aAAa,EAAE,WAAW,CAAC;IAC3B,oGAAoG;IACpG,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,oEAAoE;IACpE,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,EACD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,GAC5C,OAAO,CAAC,MAAM,CAAC,CAsCjB"}

package/lib/generateModernIframeScriptCode.js

@@ -1,50 +1,36 @@
 // based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/codegen-modern-iframe-script.ts
-import { addExportsMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';
-import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
-import { loadPreviewOrConfigFile } from '@storybook/core-common';
-import { relative } from 'path';
 import { dedent } from 'ts-dedent';
 import { generateAddonSetupCode } from './generateAddonSetupCode.js';
 import { generateImportFnScriptCode } from './generateImportFnScriptCode.js';
 import { processPreviewAnnotation } from './utils/processPreviewAnnotation.js';
 export async function generateModernIframeScriptCode(options, context) {
-    const { presets, configDir } = options;
-    const { session, packages } = context;
-    const { appPath } = session.config;
-    const previewOrConfigFile = loadPreviewOrConfigFile({ configDir });
-    if (previewOrConfigFile) {
-        const exports = await getExportsMap({ packagePath: appPath }, { packages, config: session.config });
-        await addExportsMapEntry({
-            exports,
-            packagePath: appPath,
-            importPath: normalizeRelativePath(relative(appPath, previewOrConfigFile)),
-        }, { packages, config: session.config });
-    }
+    const { storybookOptions, previewOrConfigFile, appDefinition } = options;
+    const { presets } = storybookOptions;
     const previewAnnotations = await presets.apply('previewAnnotations', [], options);
     const previewAnnotationURLs = await Promise.all([...previewAnnotations, previewOrConfigFile]
         .filter((path) => !!path)
-        .map(async (path) => await processPreviewAnnotation(path, context)));
+        .map((previewPath) => processPreviewAnnotation({ previewPath, appDefinition }, context)));
     const getPreviewAnnotationsFunction = dedent `
-  const getProjectAnnotations = async () => {
-    const configs = await Promise.all([${previewAnnotationURLs
+    const getProjectAnnotations = async () => {
+      const configs = await Promise.all([${previewAnnotationURLs
         .map((previewAnnotation) => `import('${previewAnnotation.split('\\').join('\\\\')}')`)
         .join(',\n')}]);
-    return composeConfigs(configs);
-  }`;
+      return composeConfigs(configs);
+    }`;
     return dedent `
-  import { composeConfigs, PreviewWeb, ClientApi } from '@storybook/preview-api';
+    import { composeConfigs, PreviewWeb, ClientApi } from '@storybook/preview-api';
 
-  ${generateAddonSetupCode()};
+    ${generateAddonSetupCode()};
 
-    ${await generateImportFnScriptCode(options, context)}
+    ${generateImportFnScriptCode(options)}
 
-  ${getPreviewAnnotationsFunction}
+    ${getPreviewAnnotationsFunction}
 
-  window.__STORYBOOK_PREVIEW__ = window.__STORYBOOK_PREVIEW__ || new PreviewWeb();
+    window.__STORYBOOK_PREVIEW__ = window.__STORYBOOK_PREVIEW__ || new PreviewWeb();
 
-  window.__STORYBOOK_STORY_STORE__ = window.__STORYBOOK_STORY_STORE__ || window.__STORYBOOK_PREVIEW__.storyStore;
-  window.__STORYBOOK_CLIENT_API__ = window.__STORYBOOK_CLIENT_API__ || new ClientApi({ storyStore: window.__STORYBOOK_PREVIEW__.storyStore });
-  window.__STORYBOOK_PREVIEW__.initialize({ importFn, getProjectAnnotations });
+    window.__STORYBOOK_STORY_STORE__ = window.__STORYBOOK_STORY_STORE__ || window.__STORYBOOK_PREVIEW__.storyStore;
+    window.__STORYBOOK_CLIENT_API__ = window.__STORYBOOK_CLIENT_API__ || new ClientApi({ storyStore: window.__STORYBOOK_PREVIEW__.storyStore });
+    window.__STORYBOOK_PREVIEW__.initialize({ importFn, getProjectAnnotations });
 
     if (import.meta.hot) {
       // Cloudpack doesn't currently support HMR

package/lib/generateModernIframeScriptCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateModernIframeScriptCode.js","sourceRoot":"","sources":["../src/generateModernIframeScriptCode.ts"],"names":[],"mappings":"AAAA,+HAA+H;AAI/H,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,OAAgB,EAChB,OAAgE;IAEhE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnC,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEnE,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACpG,MAAM,kBAAkB,CACtB;YACE,OAAO;YACP,WAAW,EAAE,OAAO;YACpB,UAAU,EAAE,qBAAqB,CAAC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;SAC1E,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CACrC,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,KAAK,CAAsB,oBAAoB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACvG,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,CAAC,GAAG,kBAAkB,EAAE,mBAAmB,CAAC;SACzC,MAAM,CAAC,CAAC,IAAI,EAA6B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACnD,GAAG,CAAC,KAAK,EAAE,IAAuB,EAAE,EAAE,CAAC,MAAM,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CACzF,CAAC;IAEF,MAAM,6BAA6B,GAAG,MAAM,CAAA;;yCAEL,qBAAqB;SACvD,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,WAAW,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SACrF,IAAI,CAAC,KAAK,CAAC;;IAEd,CAAC;IAEH,OAAO,MAAM,CAAA;;;IAGX,sBAAsB,EAAE;;MAEtB,MAAM,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC;;IAEpD,6BAA6B;;;;;;;;;;;MAW3B,CAAC;AACP,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/codegen-modern-iframe-script.ts\n\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { addExportsMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { loadPreviewOrConfigFile } from '@storybook/core-common';\nimport type { Options, PreviewAnnotation } from '@storybook/types';\nimport { relative } from 'path';\nimport { dedent } from 'ts-dedent';\nimport { generateAddonSetupCode } from './generateAddonSetupCode.js';\nimport { generateImportFnScriptCode } from './generateImportFnScriptCode.js';\nimport { processPreviewAnnotation } from './utils/processPreviewAnnotation.js';\n\nexport async function generateModernIframeScriptCode(\n  options: Options,\n  context: { packages: PackageDefinitionsCache; session: Session },\n): Promise<string> {\n  const { presets, configDir } = options;\n  const { session, packages } = context;\n  const { appPath } = session.config;\n\n  const previewOrConfigFile = loadPreviewOrConfigFile({ configDir });\n\n  if (previewOrConfigFile) {\n    const exports = await getExportsMap({ packagePath: appPath }, { packages, config: session.config });\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath: appPath,\n        importPath: normalizeRelativePath(relative(appPath, previewOrConfigFile)),\n      },\n      { packages, config: session.config },\n    );\n  }\n\n  const previewAnnotations = await presets.apply<PreviewAnnotation[]>('previewAnnotations', [], options);\n  const previewAnnotationURLs = await Promise.all(\n    [...previewAnnotations, previewOrConfigFile]\n      .filter((path): path is PreviewAnnotation => !!path)\n      .map(async (path: PreviewAnnotation) => await processPreviewAnnotation(path, context)),\n  );\n\n  const getPreviewAnnotationsFunction = dedent`\n  const getProjectAnnotations = async () => {\n    const configs = await Promise.all([${previewAnnotationURLs\n      .map((previewAnnotation) => `import('${previewAnnotation.split('\\\\').join('\\\\\\\\')}')`)\n      .join(',\\n')}]);\n    return composeConfigs(configs);\n  }`;\n\n  return dedent`\n  import { composeConfigs, PreviewWeb, ClientApi } from '@storybook/preview-api';\n\n  ${generateAddonSetupCode()};\n\n    ${await generateImportFnScriptCode(options, context)}\n\n  ${getPreviewAnnotationsFunction}\n\n  window.__STORYBOOK_PREVIEW__ = window.__STORYBOOK_PREVIEW__ || new PreviewWeb();\n\n  window.__STORYBOOK_STORY_STORE__ = window.__STORYBOOK_STORY_STORE__ || window.__STORYBOOK_PREVIEW__.storyStore;\n  window.__STORYBOOK_CLIENT_API__ = window.__STORYBOOK_CLIENT_API__ || new ClientApi({ storyStore: window.__STORYBOOK_PREVIEW__.storyStore });\n  window.__STORYBOOK_PREVIEW__.initialize({ importFn, getProjectAnnotations });\n\n    if (import.meta.hot) {\n      // Cloudpack doesn't currently support HMR\n      import.meta.hot.decline();\n    }`;\n}\n"]}
+{"version":3,"file":"generateModernIframeScriptCode.js","sourceRoot":"","sources":["../src/generateModernIframeScriptCode.ts"],"names":[],"mappings":"AAAA,+HAA+H;AAG/H,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAI/E,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,OAOC,EACD,OAA6C;IAE7C,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACzE,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;IAErC,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,KAAK,CAAsB,oBAAoB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACvG,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,CAAC,GAAG,kBAAkB,EAAE,mBAAmB,CAAC;SACzC,MAAM,CAAC,CAAC,IAAI,EAA6B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACnD,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,wBAAwB,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC,CAC3F,CAAC;IAEF,MAAM,6BAA6B,GAAG,MAAM,CAAA;;2CAEH,qBAAqB;SACvD,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,WAAW,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SACrF,IAAI,CAAC,KAAK,CAAC;;MAEd,CAAC;IAEL,OAAO,MAAM,CAAA;;;MAGT,sBAAsB,EAAE;;MAExB,0BAA0B,CAAC,OAAO,CAAC;;MAEnC,6BAA6B;;;;;;;;;;;MAW7B,CAAC;AACP,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/codegen-modern-iframe-script.ts\n\nimport type { Options, PreviewAnnotation } from '@storybook/types';\nimport { dedent } from 'ts-dedent';\nimport { generateAddonSetupCode } from './generateAddonSetupCode.js';\nimport { generateImportFnScriptCode } from './generateImportFnScriptCode.js';\nimport { processPreviewAnnotation } from './utils/processPreviewAnnotation.js';\nimport type { PartialContext } from '@ms-cloudpack/api-server';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\n\nexport async function generateModernIframeScriptCode(\n  options: {\n    storybookOptions: Pick<Options, 'presets'>;\n    appDefinition: PackageJson;\n    /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */\n    resolvedStories: string[];\n    /** Absolute path to storybook preview or config file for the app */\n    previewOrConfigFile: string | undefined;\n  },\n  context: PartialContext<'packages', 'config'>,\n): Promise<string> {\n  const { storybookOptions, previewOrConfigFile, appDefinition } = options;\n  const { presets } = storybookOptions;\n\n  const previewAnnotations = await presets.apply<PreviewAnnotation[]>('previewAnnotations', [], options);\n  const previewAnnotationURLs = await Promise.all(\n    [...previewAnnotations, previewOrConfigFile]\n      .filter((path): path is PreviewAnnotation => !!path)\n      .map((previewPath) => processPreviewAnnotation({ previewPath, appDefinition }, context)),\n  );\n\n  const getPreviewAnnotationsFunction = dedent`\n    const getProjectAnnotations = async () => {\n      const configs = await Promise.all([${previewAnnotationURLs\n        .map((previewAnnotation) => `import('${previewAnnotation.split('\\\\').join('\\\\\\\\')}')`)\n        .join(',\\n')}]);\n      return composeConfigs(configs);\n    }`;\n\n  return dedent`\n    import { composeConfigs, PreviewWeb, ClientApi } from '@storybook/preview-api';\n\n    ${generateAddonSetupCode()};\n\n    ${generateImportFnScriptCode(options)}\n\n    ${getPreviewAnnotationsFunction}\n\n    window.__STORYBOOK_PREVIEW__ = window.__STORYBOOK_PREVIEW__ || new PreviewWeb();\n\n    window.__STORYBOOK_STORY_STORE__ = window.__STORYBOOK_STORY_STORE__ || window.__STORYBOOK_PREVIEW__.storyStore;\n    window.__STORYBOOK_CLIENT_API__ = window.__STORYBOOK_CLIENT_API__ || new ClientApi({ storyStore: window.__STORYBOOK_PREVIEW__.storyStore });\n    window.__STORYBOOK_PREVIEW__.initialize({ importFn, getProjectAnnotations });\n\n    if (import.meta.hot) {\n      // Cloudpack doesn't currently support HMR\n      import.meta.hot.decline();\n    }`;\n}\n"]}

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AASzD,KAAK,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AASzC,eAAO,MAAM,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAmBzC,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAoK3C,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAG3C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAWzD,KAAK,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AASzC,eAAO,MAAM,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAmBzC,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAkH3C,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAG3C,CAAC"}

package/lib/index.js

@@ -1,18 +1,19 @@
-import { getLocalCachePath, createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';
+import { ensurePackageBundled } from '@ms-cloudpack/api-server';
 import { startServers } from '@ms-cloudpack/app-server';
-import { readConfig } from '@ms-cloudpack/config';
+import { getLocalCachePath } from '@ms-cloudpack/config';
 import { express } from '@ms-cloudpack/create-express-app';
-import { addExportsMapEntry, getDisplayVersion, getExportsMap, getVersion, isExternalPackage, resolve, } from '@ms-cloudpack/package-utilities';
-import { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';
-import { TaskReporter, bold, debugLoggingConfig, defaultLoggingConfig, noLoggingConfig, verboseLoggingConfig, } from '@ms-cloudpack/task-reporter';
-import { createTelemetryClient } from '@ms-cloudpack/telemetry';
+import { resolve } from '@ms-cloudpack/package-utilities';
+import { slash } from '@ms-cloudpack/path-string-parsing';
+import { findPackageRoot, normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';
+import { loadPreviewOrConfigFile } from '@storybook/core-common';
 import fsExtra from 'fs-extra';
 import fsPromises from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { generateIframeHtml } from './generateIFrameHtml.js';
-import { getNodeModuleDir } from './getNodeModuleDir.js';
 import { listStories } from './listStories.js';
+import { createApiContext } from './createApiContext.js';
+const currentDir = path.dirname(fileURLToPath(import.meta.url));
 const servers = {};
 export const bail = async (error) => {
     if (error) {
@@ -33,119 +34,77 @@ export const bail = async (error) => {
     }));
 };
 export const start = async ({ options, startTime, router, server: devServer }) => {
-    const previewResolvedDir = getNodeModuleDir('@storybook/preview');
+    const previewResolvedDir = await resolve('@storybook/preview', currentDir);
+    if (!previewResolvedDir) {
+        throw new Error(`Could not resolve @storybook/preview from ${currentDir}`);
+    }
     const previewDirOrigin = path.join(previewResolvedDir, 'dist');
     router.use('/sb-preview', express.static(previewDirOrigin, { immutable: true, maxAge: '5m' }));
     // TODO: This might be useful later on.
     // const env = await options.presets.apply<Record<string, string>>('env');
-    // eslint-disable-next-line no-restricted-properties -- this is the one place we need cwd (for a default)
-    const appPath = process.cwd();
-    const config = await readConfig(appPath);
-    // TODO: Move to won package.
-    // runPrerequisites(config, appPath);
-    // This part should be almost identical to the cli start command.
-    const reporter = new TaskReporter({
-        productName: 'Storybook + Cloudpack',
-        version: getDisplayVersion(import.meta.url),
-        description: () => `Running "${bold('storybook')}"`,
-        helpMessage: config.helpMessage,
-        // TODO: Get options and enable this.
-        plainTextMode: options.ci,
-        ...(options.loglevel === 'debug'
-            ? debugLoggingConfig
-            : options.loglevel === 'verbose'
-                ? verboseLoggingConfig
-                : options.quiet || options.loglevel === 'quiet'
-                    ? noLoggingConfig
-                    : defaultLoggingConfig),
-    });
-    const connectionString = options.disableTelemetry
-        ? undefined
-        : config.telemetry?.connectionString || process.env.CLOUDPACK_TELEMETRY_CONNECTION_STRING;
-    const logLevel = options.loglevel === 'verbose' ? 'VERBOSE' : options.loglevel === 'debug' ? 'DEBUG' : undefined;
-    if (options.loglevel !== 'debug') {
-        reporter.ignoreLogMessage('ApplicationInsights:');
+    // eslint-disable-next-line no-restricted-properties -- this is where we find the appPath
+    const cwd = process.cwd();
+    const appPath = findPackageRoot(cwd);
+    if (!appPath) {
+        throw new Error(`Could not find package.json relative to ${cwd}`);
     }
-    const telemetryClient = await createTelemetryClient({
-        productVersion: getVersion(import.meta.url),
-        connectionString,
-        logLevel,
-        serviceNamespace: 'cloudpack',
-        serviceName: 'storybook',
-        rootSpanName: 'storybook',
-    });
-    // Register performance observers to track performance metrics as events of CLI span.
-    // registerPerformanceObservers(telemetryClient);
-    const currentDir = path.dirname(fileURLToPath(import.meta.url));
-    let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);
-    // If overlay is an internal package, resolve the overlay from the current package's linked node modules
-    // to "externalize" it, so that we always use the bundled version of the overlay instead of the source.
-    if (overlayPath && !isExternalPackage(overlayPath)) {
-        overlayPath = path.join(currentDir, '/../', 'node_modules', '@ms-cloudpack/overlay');
-    }
-    const apiContext = await createPartialApiContext({
-        appPath,
-        config,
-        reporter,
-        telemetryClient,
-        items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],
-        overlayPath,
-    });
+    const apiContext = await createApiContext({ appPath, storybookOptions: options });
     const { packages, session } = apiContext;
-    // Overwrite the exports of the app package to an empty object, since we only care about stories.
+    const { config } = session;
+    // Resolve the story files, and find the preview/config file.
+    const { storySpecifiers, resolvedStories } = await listStories({ storybookOptions: options, appPath });
+    const previewOrConfigFile = loadPreviewOrConfigFile(options);
+    // Overwrite the exports of the app package to just contain the stories and preview/config file.
     packages.registerTransform(() => ({ definition, packagePath }) => {
-        if (slash(appPath) === slash(packagePath)) {
-            return { ...definition, exports: {} };
+        if (slash(appPath) !== slash(packagePath)) {
+            return;
+        }
+        // We just need a simple path mapping for the stories, so it's not necessary to use addExportsMapEntry.
+        const exports = {};
+        for (const story of resolvedStories) {
+            if (!story.startsWith('./')) {
+                // Not sure if this is even allowed by Storybook, but check just in case...
+                // In theory we could handle this by either modifying the exports of the other package too,
+                // or possibly by enabling autoUpdateEntries so the file will be bundled on import.
+                throw new Error(`Cloudpack does not support stories outside of the package root: ${story}`);
+            }
+            exports[story] = story;
+        }
+        if (previewOrConfigFile) {
+            const normalizedPreview = normalizedPathRelativeTo(appPath, previewOrConfigFile);
+            if (!normalizedPreview.startsWith('./')) {
+                // Not sure if this is allowed by storybook either
+                throw new Error(`Cloudpack does not support preview/config files outside of the package root: ${previewOrConfigFile}`);
+            }
+            exports[normalizedPreview] = normalizedPreview;
         }
+        return { ...definition, exports };
     });
-    // Make sure the package has a valid definition.
-    const definition = await packages.get(appPath);
-    if (!definition?.name || !definition.version) {
-        throw new Error(`The package.json at "${appPath}" did not have a name and/or version.`);
-    }
-    // TODO: Get options and enable this.
-    // Increment the session version if caching is disabled.
-    // if (options.cache === false) {
-    //   session.incrementSessionVersion();
-    // }
-    // Set shared telemetry attributes which will be sent with all telemetry events.
-    telemetryClient.setSharedSpanAttribute('sessionId', session.id);
-    // TODO: Get options and enable this.
-    // if (options.logResolveMap) {
-    //   // Write the resolve map to disk.
-    //   await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);
-    // }
+    const appDefinition = await packages.get(appPath);
     // Storybook set up is mostly done here.
-    const generated = await generateIframeHtml(options, { packages, session });
-    await fsExtra.ensureDir(getLocalCachePath(appPath));
+    const generated = await generateIframeHtml({ storybookOptions: options, storySpecifiers, resolvedStories, appDefinition, previewOrConfigFile }, apiContext);
     // TODO: Currently saving it to disk as the config only accepts a path.
-    const iFramePath = path.join(getLocalCachePath(appPath), 'iframe.html');
+    const cachePath = getLocalCachePath(appPath);
+    await fsExtra.ensureDir(cachePath);
+    const iFramePath = path.join(cachePath, 'iframe.html');
     await fsPromises.writeFile(iFramePath, generated, { encoding: 'utf-8' });
     // iFrame script is required for storybook to work.
-    config.devServer ??= {};
     config.routes ??= [];
     config.routes.push({
         match: '/iframe.html',
         renderScript: iFramePath,
     });
-    // Add an exports entry for each story file
-    const exports = await getExportsMap({ packagePath: appPath }, { packages, config: session.config });
-    const stories = await listStories(options);
-    for (const story of stories) {
-        const importPath = normalizeRelativePath(path.relative(appPath, story));
-        await addExportsMapEntry({ exports, packagePath: appPath, importPath, filePath: importPath }, { packages, config: session.config });
-    }
     const { createCloudpackServer } = await import('@ms-cloudpack/api-server');
     // Start api server for tracking status and handling remote requests.
     servers.apiServer = await createCloudpackServer(apiContext);
     // Kick off bundling app package as soon as api server is ready.
     void ensurePackageBundled({
-        input: { name: definition.name, version: definition.version },
+        input: { name: appDefinition.name, version: appDefinition.version },
         ctx: apiContext,
     });
     // Start bundle and app servers for hosting the app.
     const { appServer, bundleServer } = await startServers({
-        definition,
+        definition: appDefinition,
         server: devServer,
         // TODO: Get options and enable this.
         bundleServerOptions: { disableCache: false },

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 { getLocalCachePath, createPartialApiContext, ensurePackageBundled } from '@ms-cloudpack/api-server';\nimport { startServers } from '@ms-cloudpack/app-server';\nimport { readConfig } from '@ms-cloudpack/config';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport {\n  addExportsMapEntry,\n  getDisplayVersion,\n  getExportsMap,\n  getVersion,\n  isExternalPackage,\n  resolve,\n} from '@ms-cloudpack/package-utilities';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport {\n  TaskReporter,\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  noLoggingConfig,\n  verboseLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { createTelemetryClient } from '@ms-cloudpack/telemetry';\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 { getNodeModuleDir } from './getNodeModuleDir.js';\nimport { listStories } from './listStories.js';\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 = getNodeModuleDir('@storybook/preview');\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 the one place we need cwd (for a default)\n  const appPath = process.cwd();\n\n  const config = await readConfig(appPath);\n\n  // TODO: Move to won package.\n  // runPrerequisites(config, appPath);\n\n  // This part should be almost identical to the cli start command.\n  const reporter = new TaskReporter({\n    productName: 'Storybook + Cloudpack',\n    version: getDisplayVersion(import.meta.url),\n    description: () => `Running \"${bold('storybook')}\"`,\n    helpMessage: config.helpMessage,\n    // TODO: Get options and enable this.\n    plainTextMode: options.ci,\n    ...(options.loglevel === 'debug'\n      ? debugLoggingConfig\n      : options.loglevel === 'verbose'\n        ? verboseLoggingConfig\n        : options.quiet || options.loglevel === 'quiet'\n          ? noLoggingConfig\n          : defaultLoggingConfig),\n  });\n\n  const connectionString = options.disableTelemetry\n    ? undefined\n    : config.telemetry?.connectionString || process.env.CLOUDPACK_TELEMETRY_CONNECTION_STRING;\n\n  const logLevel = options.loglevel === 'verbose' ? 'VERBOSE' : options.loglevel === 'debug' ? 'DEBUG' : undefined;\n  if (options.loglevel !== 'debug') {\n    reporter.ignoreLogMessage('ApplicationInsights:');\n  }\n\n  const telemetryClient = await createTelemetryClient({\n    productVersion: getVersion(import.meta.url),\n    connectionString,\n    logLevel,\n    serviceNamespace: 'cloudpack',\n    serviceName: 'storybook',\n    rootSpanName: 'storybook',\n  });\n\n  // Register performance observers to track performance metrics as events of CLI span.\n  // registerPerformanceObservers(telemetryClient);\n\n  const currentDir = path.dirname(fileURLToPath(import.meta.url));\n  let overlayPath = await resolve('@ms-cloudpack/overlay', currentDir);\n\n  // If overlay is an internal package, resolve the overlay from the current package's linked node modules\n  // to \"externalize\" it, so that we always use the bundled version of the overlay instead of the source.\n  if (overlayPath && !isExternalPackage(overlayPath)) {\n    overlayPath = path.join(currentDir, '/../', 'node_modules', '@ms-cloudpack/overlay');\n  }\n\n  const apiContext = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'watcher', 'taskRunner', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    overlayPath,\n  });\n\n  const { packages, session } = apiContext;\n\n  // Overwrite the exports of the app package to an empty object, since we only care about stories.\n  packages.registerTransform(() => ({ definition, packagePath }) => {\n    if (slash(appPath) === slash(packagePath)) {\n      return { ...definition, exports: {} };\n    }\n  });\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.get(appPath);\n  if (!definition?.name || !definition.version) {\n    throw new Error(`The package.json at \"${appPath}\" did not have a name and/or version.`);\n  }\n\n  // TODO: Get options and enable this.\n  // Increment the session version if caching is disabled.\n  // if (options.cache === false) {\n  //   session.incrementSessionVersion();\n  // }\n\n  // Set shared telemetry attributes which will be sent with all telemetry events.\n  telemetryClient.setSharedSpanAttribute('sessionId', session.id);\n\n  // TODO: Get options and enable this.\n  // if (options.logResolveMap) {\n  //   // Write the resolve map to disk.\n  //   await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n  // }\n\n  // Storybook set up is mostly done here.\n  const generated = await generateIframeHtml(options, { packages, session });\n  await fsExtra.ensureDir(getLocalCachePath(appPath));\n\n  // TODO: Currently saving it to disk as the config only accepts a path.\n  const iFramePath = path.join(getLocalCachePath(appPath), 'iframe.html');\n  await fsPromises.writeFile(iFramePath, generated, { encoding: 'utf-8' });\n\n  // iFrame script is required for storybook to work.\n  config.devServer ??= {};\n  config.routes ??= [];\n  config.routes.push({\n    match: '/iframe.html',\n    renderScript: iFramePath,\n  });\n\n  // Add an exports entry for each story file\n  const exports = await getExportsMap({ packagePath: appPath }, { packages, config: session.config });\n  const stories = await listStories(options);\n\n  for (const story of stories) {\n    const importPath = normalizeRelativePath(path.relative(appPath, story));\n    await addExportsMapEntry(\n      { exports, packagePath: appPath, importPath, filePath: importPath },\n      { packages, config: session.config },\n    );\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: definition.name, version: definition.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,\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: 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"]}

package/lib/listStories.d.ts

@@ -1,3 +1,13 @@
-import type { Options } from '@storybook/types';
-export declare function listStories(options: Options): Promise<string[]>;
+import type { NormalizedStoriesSpecifier, Options } from '@storybook/types';
+/**
+ * Get the stories from the storybook config.
+ */
+export declare function listStories(params: {
+    storybookOptions: Options;
+    appPath: string;
+}): Promise<{
+    storySpecifiers: NormalizedStoriesSpecifier[];
+    /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */
+    resolvedStories: string[];
+}>;
 //# sourceMappingURL=listStories.d.ts.map

package/lib/listStories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listStories.d.ts","sourceRoot":"","sources":["../src/listStories.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,qBAuBjD"}
+{"version":3,"file":"listStories.d.ts","sourceRoot":"","sources":["../src/listStories.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG5E;;GAEG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE;IAAE,gBAAgB,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC;IACjG,eAAe,EAAE,0BAA0B,EAAE,CAAC;IAC9C,oGAAoG;IACpG,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC,CA4BD"}

package/lib/listStories.js

@@ -3,21 +3,29 @@ import path from 'path';
 import glob from 'fast-glob';
 import { normalizeStories, commonGlobOptions } from '@storybook/core-common';
 import { slash } from '@ms-cloudpack/path-string-parsing';
-export async function listStories(options) {
-    return ((await Promise.all(normalizeStories(await options.presets.apply('stories', [], options), {
-        configDir: options.configDir,
-        workingDir: options.configDir,
-    }).map(({ directory, files }) => {
+import { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';
+/**
+ * Get the stories from the storybook config.
+ */
+export async function listStories(params) {
+    const { storybookOptions, appPath } = params;
+    const storySpecifiers = normalizeStories(await storybookOptions.presets.apply('stories', [], storybookOptions), {
+        configDir: storybookOptions.configDir,
+        workingDir: appPath,
+    });
+    const resolvedStories = (await Promise.all(storySpecifiers.map(({ directory, files }) => {
         const pattern = path.join(directory, files);
-        const absolutePattern = path.isAbsolute(pattern) ? pattern : path.join(options.configDir, pattern);
+        const absolutePattern = path.isAbsolute(pattern) ? pattern : path.join(appPath, pattern);
         return glob(slash(absolutePattern), {
             ...commonGlobOptions(absolutePattern),
             followSymbolicLinks: true,
         });
     })))
-        .reduce((carry, stories) => carry.concat(stories.map(slash)), [])
+        .flat()
+        .map((story) => normalizedPathRelativeTo(appPath, story))
         // Sort stories to prevent a non-deterministic build. The result of Glob is not sorted an may differ
         // for each invocation. This results in a different bundle file hashes from one build to the next.
-        .sort());
+        .sort();
+    return { storySpecifiers, resolvedStories };
 }
 //# sourceMappingURL=listStories.js.map

package/lib/listStories.js.map

@@ -1 +1 @@
-{"version":3,"file":"listStories.js","sourceRoot":"","sources":["../src/listStories.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAE1G,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAG1D,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAgB;IAChD,OAAO,CACL,CACE,MAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE;QACpE,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,UAAU,EAAE,OAAO,CAAC,SAAS;KAC9B,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEnG,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;YAClC,GAAG,iBAAiB,CAAC,eAAe,CAAC;YACrC,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CACF;SACE,MAAM,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QACjE,oGAAoG;QACpG,kGAAkG;SACjG,IAAI,EAAE,CACV,CAAC;AACJ,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/lib/builder-vite/src/list-stories.ts\n\nimport path from 'path';\nimport glob from 'fast-glob';\nimport { normalizeStories, commonGlobOptions } from '@storybook/core-common';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { Options } from '@storybook/types';\n\nexport async function listStories(options: Options) {\n  return (\n    (\n      await Promise.all(\n        normalizeStories(await options.presets.apply('stories', [], options), {\n          configDir: options.configDir,\n          workingDir: options.configDir,\n        }).map(({ directory, files }) => {\n          const pattern = path.join(directory, files);\n          const absolutePattern = path.isAbsolute(pattern) ? pattern : path.join(options.configDir, pattern);\n\n          return glob(slash(absolutePattern), {\n            ...commonGlobOptions(absolutePattern),\n            followSymbolicLinks: true,\n          });\n        }),\n      )\n    )\n      .reduce((carry, stories) => carry.concat(stories.map(slash)), [])\n      // Sort stories to prevent a non-deterministic build. The result of Glob is not sorted an may differ\n      // for each invocation. This results in a different bundle file hashes from one build to the next.\n      .sort()\n  );\n}\n"]}
+{"version":3,"file":"listStories.js","sourceRoot":"","sources":["../src/listStories.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAE1G,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAsD;IAKtF,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE7C,MAAM,eAAe,GAAG,gBAAgB,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE;QAC9G,SAAS,EAAE,gBAAgB,CAAC,SAAS;QACrC,UAAU,EAAE,OAAO;KACpB,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,CACtB,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEzF,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;YAClC,GAAG,iBAAiB,CAAC,eAAe,CAAC;YACrC,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CACF;SACE,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACzD,oGAAoG;QACpG,kGAAkG;SACjG,IAAI,EAAE,CAAC;IAEV,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAC9C,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/lib/builder-vite/src/list-stories.ts\n\nimport path from 'path';\nimport glob from 'fast-glob';\nimport { normalizeStories, commonGlobOptions } from '@storybook/core-common';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { NormalizedStoriesSpecifier, Options } from '@storybook/types';\nimport { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\n\n/**\n * Get the stories from the storybook config.\n */\nexport async function listStories(params: { storybookOptions: Options; appPath: string }): Promise<{\n  storySpecifiers: NormalizedStoriesSpecifier[];\n  /** Actual paths to all story files, relative to `appPath` with leading `./` and forward slashes. */\n  resolvedStories: string[];\n}> {\n  const { storybookOptions, appPath } = params;\n\n  const storySpecifiers = normalizeStories(await storybookOptions.presets.apply('stories', [], storybookOptions), {\n    configDir: storybookOptions.configDir,\n    workingDir: appPath,\n  });\n\n  const resolvedStories = (\n    await Promise.all(\n      storySpecifiers.map(({ directory, files }) => {\n        const pattern = path.join(directory, files);\n        const absolutePattern = path.isAbsolute(pattern) ? pattern : path.join(appPath, pattern);\n\n        return glob(slash(absolutePattern), {\n          ...commonGlobOptions(absolutePattern),\n          followSymbolicLinks: true,\n        });\n      }),\n    )\n  )\n    .flat()\n    .map((story) => normalizedPathRelativeTo(appPath, story))\n    // Sort stories to prevent a non-deterministic build. The result of Glob is not sorted an may differ\n    // for each invocation. This results in a different bundle file hashes from one build to the next.\n    .sort();\n\n  return { storySpecifiers, resolvedStories };\n}\n"]}

package/lib/utils/processPreviewAnnotation.d.ts

@@ -1,6 +1,6 @@
+import type { PartialContext } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
 import type { PreviewAnnotation } from '@storybook/types';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { Session } from '@ms-cloudpack/api-server';
 /**
  * Preview annotations can take several forms, and cloudpack needs them to be
  * a bit more restrained.
@@ -8,8 +8,8 @@ import type { Session } from '@ms-cloudpack/api-server';
  * For node_modules, we want bare imports (so cloudpack can process them),
  * and for files in the user's source, we want URLs absolute relative to project root.
  */
-export declare function processPreviewAnnotation(previewPath: PreviewAnnotation | undefined, context: {
-    packages: PackageDefinitionsCache;
-    session: Session;
-}): Promise<string>;
+export declare function processPreviewAnnotation(options: {
+    previewPath: PreviewAnnotation;
+    appDefinition: PackageJson;
+}, context: PartialContext<'packages', 'config'>): Promise<string>;
 //# sourceMappingURL=processPreviewAnnotation.d.ts.map

package/lib/utils/processPreviewAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processPreviewAnnotation.d.ts","sourceRoot":"","sources":["../../src/utils/processPreviewAnnotation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,iBAAiB,GAAG,SAAS,EAC1C,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,mBAgEjE"}
+{"version":3,"file":"processPreviewAnnotation.d.ts","sourceRoot":"","sources":["../../src/utils/processPreviewAnnotation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAG1D;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE;IACP,WAAW,EAAE,iBAAiB,CAAC;IAC/B,aAAa,EAAE,WAAW,CAAC;CAC5B,EACD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,mBA8C9C"}

package/lib/utils/processPreviewAnnotation.js

@@ -1,8 +1,8 @@
 // based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/utils/process-preview-annotation.ts
-import path from 'path';
-import { slash } from '@ms-cloudpack/path-string-parsing';
+import { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';
+import { findPackageRoot, normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';
 import { stripAbsNodeModulesPath } from '@storybook/core-common';
-import { findPackageRoot } from '@ms-cloudpack/path-utilities';
+import path from 'path';
 /**
  * Preview annotations can take several forms, and cloudpack needs them to be
  * a bit more restrained.
@@ -10,62 +10,43 @@ import { findPackageRoot } from '@ms-cloudpack/path-utilities';
  * For node_modules, we want bare imports (so cloudpack can process them),
  * and for files in the user's source, we want URLs absolute relative to project root.
  */
-export async function processPreviewAnnotation(previewPath, context) {
+export async function processPreviewAnnotation(options, context) {
+    let { previewPath } = options;
     const { packages, session } = context;
     const { appPath } = session.config;
-    // If entry is an object, take the first, which is the
-    // bare (non-absolute) specifier.
-    // This is so that webpack can use an absolute path, and
-    // continue supporting super-addons in pnp/pnpm without
-    // requiring them to re-export their sub-addons as we do
-    // in addon-essentials.
+    // If entry is an object, take the first, which is the bare (non-absolute) specifier.
+    // This is so that webpack can use an absolute path, and continue supporting super-addons in
+    // pnp/pnpm without requiring them to re-export their sub-addons as we do in addon-essentials.
     if (typeof previewPath === 'object') {
         return previewPath.bare;
     }
-    // This should not occur, since we use `.filter(Boolean)` prior to
-    // calling this function, but this makes typescript happy
-    if (!previewPath) {
-        throw new Error('Could not determine path for previewAnnotation');
-    }
+    // Get rid of any extra segments
+    previewPath = path.normalize(previewPath);
     // For addon dependencies that use require.resolve(), we need to convert to a bare path
     // so that cloudpack will process it as a dependency (cjs -> esm, etc).
+    // If this is a dependency in a standard (non-store) layout, take the path after the last
+    // node_modules segment.
     // TODO: Evaluate if searching for node_modules in a yarn pnp environment is correct
     if (previewPath.includes('node_modules') && !previewPath.includes('.store')) {
         return stripAbsNodeModulesPath(previewPath);
     }
-    // resolve absolute paths relative to project root
-    const relativePath = path.isAbsolute(previewPath) ? slash(path.relative(appPath, previewPath)) : previewPath;
-    // resolve relative paths into absolute urls
-    // note: this only works if cloudpack's appPath === cwd.
-    // Add package root to relative paths.
-    if (relativePath.startsWith('./')) {
-        const definition = await packages.get(appPath);
-        if (!definition) {
-            throw new Error(`Could not find package definition for ${appPath}`);
-        }
-        return slash(`${definition.name}/${relativePath.replace(/^\.\//, '')}`);
+    // Resolve absolute paths relative to the project root, and normalize to start with ./
+    const normalizedPath = path.isAbsolute(previewPath)
+        ? normalizedPathRelativeTo(appPath, previewPath)
+        : normalizeRelativePath(previewPath);
+    if (normalizedPath.startsWith('./')) {
+        // For a path within the app package, add the package name.
+        return slash(`${options.appDefinition.name}/${normalizedPath.slice(2)}`);
     }
-    // If something is outside of root, convert to absolute.
+    // For paths outside the app package, find which package it's in, and add that package name.
     // This can happen with a store installation layout:
     // /<repo>/node_modules/.store/@storybook-react-virtual-acd5c7bee4/package
-    if (relativePath.startsWith('../')) {
-        // Find package and add to root.
-        const packagePath = findPackageRoot(path.resolve(appPath, relativePath));
-        if (!packagePath) {
-            throw new Error(`Could not find package root for ${relativePath}`);
-        }
-        const definition = await packages.get(packagePath);
-        if (!definition) {
-            throw new Error(`Could not find package definition for ${relativePath}`);
-        }
-        return slash(`${definition.name}/${path.relative(packagePath, path.resolve(appPath, relativePath))}`);
-    }
-    // At this point, it must be relative to the root but not start with a ./ or ../
-    // Add package root to relative paths.
-    const definition = await packages.get(appPath);
-    if (!definition) {
-        throw new Error(`Could not find package definition for ${appPath}`);
+    const absPath = path.resolve(appPath, normalizedPath);
+    const packagePath = findPackageRoot(absPath);
+    if (!packagePath) {
+        throw new Error(`Could not find package root for ${absPath}`);
     }
-    return slash(`${definition.name}/${relativePath}`);
+    const definition = await packages.get(packagePath);
+    return slash(`${definition.name}/${path.relative(packagePath, absPath)}`);
 }
 //# sourceMappingURL=processPreviewAnnotation.js.map

package/lib/utils/processPreviewAnnotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"processPreviewAnnotation.js","sourceRoot":"","sources":["../../src/utils/processPreviewAnnotation.ts"],"names":[],"mappings":"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","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/utils/process-preview-annotation.ts\n\nimport type { PreviewAnnotation } from '@storybook/types';\nimport path from 'path';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { stripAbsNodeModulesPath } from '@storybook/core-common';\nimport { findPackageRoot } from '@ms-cloudpack/path-utilities';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { Session } from '@ms-cloudpack/api-server';\n\n/**\n * Preview annotations can take several forms, and cloudpack needs them to be\n * a bit more restrained.\n *\n * For node_modules, we want bare imports (so cloudpack can process them),\n * and for files in the user's source, we want URLs absolute relative to project root.\n */\nexport async function processPreviewAnnotation(\n  previewPath: PreviewAnnotation | undefined,\n  context: { packages: PackageDefinitionsCache; session: Session },\n) {\n  const { packages, session } = context;\n  const { appPath } = session.config;\n  // If entry is an object, take the first, which is the\n  // bare (non-absolute) specifier.\n  // This is so that webpack can use an absolute path, and\n  // continue supporting super-addons in pnp/pnpm without\n  // requiring them to re-export their sub-addons as we do\n  // in addon-essentials.\n  if (typeof previewPath === 'object') {\n    return previewPath.bare;\n  }\n\n  // This should not occur, since we use `.filter(Boolean)` prior to\n  // calling this function, but this makes typescript happy\n  if (!previewPath) {\n    throw new Error('Could not determine path for previewAnnotation');\n  }\n\n  // For addon dependencies that use require.resolve(), we need to convert to a bare path\n  // so that cloudpack will process it as a dependency (cjs -> esm, etc).\n  // TODO: Evaluate if searching for node_modules in a yarn pnp environment is correct\n  if (previewPath.includes('node_modules') && !previewPath.includes('.store')) {\n    return stripAbsNodeModulesPath(previewPath);\n  }\n\n  // resolve absolute paths relative to project root\n  const relativePath = path.isAbsolute(previewPath) ? slash(path.relative(appPath, previewPath)) : previewPath;\n\n  // resolve relative paths into absolute urls\n  // note: this only works if cloudpack's appPath === cwd.\n  // Add package root to relative paths.\n  if (relativePath.startsWith('./')) {\n    const definition = await packages.get(appPath);\n    if (!definition) {\n      throw new Error(`Could not find package definition for ${appPath}`);\n    }\n    return slash(`${definition.name}/${relativePath.replace(/^\\.\\//, '')}`);\n  }\n\n  // If something is outside of root, convert to absolute.\n  // This can happen with a store installation layout:\n  // /<repo>/node_modules/.store/@storybook-react-virtual-acd5c7bee4/package\n  if (relativePath.startsWith('../')) {\n    // Find package and add to root.\n    const packagePath = findPackageRoot(path.resolve(appPath, relativePath));\n    if (!packagePath) {\n      throw new Error(`Could not find package root for ${relativePath}`);\n    }\n    const definition = await packages.get(packagePath);\n    if (!definition) {\n      throw new Error(`Could not find package definition for ${relativePath}`);\n    }\n    return slash(`${definition.name}/${path.relative(packagePath, path.resolve(appPath, relativePath))}`);\n  }\n\n  // At this point, it must be relative to the root but not start with a ./ or ../\n  // Add package root to relative paths.\n  const definition = await packages.get(appPath);\n  if (!definition) {\n    throw new Error(`Could not find package definition for ${appPath}`);\n  }\n  return slash(`${definition.name}/${relativePath}`);\n}\n"]}
+{"version":3,"file":"processPreviewAnnotation.js","sourceRoot":"","sources":["../../src/utils/processPreviewAnnotation.ts"],"names":[],"mappings":"AAAA,mIAAmI;AAInI,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAGC,EACD,OAA6C;IAE7C,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnC,qFAAqF;IACrF,4FAA4F;IAC5F,8FAA8F;IAC9F,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,WAAW,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,gCAAgC;IAChC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE1C,uFAAuF;IACvF,uEAAuE;IAEvE,yFAAyF;IACzF,wBAAwB;IACxB,oFAAoF;IACpF,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;IAED,sFAAsF;IACtF,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QACjD,CAAC,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC;QAChD,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAEvC,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,2DAA2D;QAC3D,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,4FAA4F;IAC5F,oDAAoD;IACpD,0EAA0E;IAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;AAC5E,CAAC","sourcesContent":["// based on https://github.com/storybookjs/storybook/blob/v7.6.5/code/builders/builder-vite/src/utils/process-preview-annotation.ts\n\nimport type { PartialContext } from '@ms-cloudpack/api-server';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { findPackageRoot, normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport { stripAbsNodeModulesPath } from '@storybook/core-common';\nimport type { PreviewAnnotation } from '@storybook/types';\nimport path from 'path';\n\n/**\n * Preview annotations can take several forms, and cloudpack needs them to be\n * a bit more restrained.\n *\n * For node_modules, we want bare imports (so cloudpack can process them),\n * and for files in the user's source, we want URLs absolute relative to project root.\n */\nexport async function processPreviewAnnotation(\n  options: {\n    previewPath: PreviewAnnotation;\n    appDefinition: PackageJson;\n  },\n  context: PartialContext<'packages', 'config'>,\n) {\n  let { previewPath } = options;\n  const { packages, session } = context;\n  const { appPath } = session.config;\n\n  // If entry is an object, take the first, which is the bare (non-absolute) specifier.\n  // This is so that webpack can use an absolute path, and continue supporting super-addons in\n  // pnp/pnpm without requiring them to re-export their sub-addons as we do in addon-essentials.\n  if (typeof previewPath === 'object') {\n    return previewPath.bare;\n  }\n\n  // Get rid of any extra segments\n  previewPath = path.normalize(previewPath);\n\n  // For addon dependencies that use require.resolve(), we need to convert to a bare path\n  // so that cloudpack will process it as a dependency (cjs -> esm, etc).\n\n  // If this is a dependency in a standard (non-store) layout, take the path after the last\n  // node_modules segment.\n  // TODO: Evaluate if searching for node_modules in a yarn pnp environment is correct\n  if (previewPath.includes('node_modules') && !previewPath.includes('.store')) {\n    return stripAbsNodeModulesPath(previewPath);\n  }\n\n  // Resolve absolute paths relative to the project root, and normalize to start with ./\n  const normalizedPath = path.isAbsolute(previewPath)\n    ? normalizedPathRelativeTo(appPath, previewPath)\n    : normalizeRelativePath(previewPath);\n\n  if (normalizedPath.startsWith('./')) {\n    // For a path within the app package, add the package name.\n    return slash(`${options.appDefinition.name}/${normalizedPath.slice(2)}`);\n  }\n\n  // For paths outside the app package, find which package it's in, and add that package name.\n  // This can happen with a store installation layout:\n  // /<repo>/node_modules/.store/@storybook-react-virtual-acd5c7bee4/package\n  const absPath = path.resolve(appPath, normalizedPath);\n  const packagePath = findPackageRoot(absPath);\n  if (!packagePath) {\n    throw new Error(`Could not find package root for ${absPath}`);\n  }\n  const definition = await packages.get(packagePath);\n  return slash(`${definition.name}/${path.relative(packagePath, absPath)}`);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/storybook-builder",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "A tool for building storybook bundles for the cloudpack ecosystem.",
   "license": "MIT",
   "type": "module",
@@ -22,15 +22,15 @@
     "lint": "cloudpack-scripts lint"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.49.1",
-    "@ms-cloudpack/app-server": "^0.15.1",
-    "@ms-cloudpack/common-types": "^0.18.0",
-    "@ms-cloudpack/config": "^0.27.0",
-    "@ms-cloudpack/create-express-app": "^1.8.1",
-    "@ms-cloudpack/overlay": "^0.17.54",
-    "@ms-cloudpack/package-utilities": "^9.0.5",
+    "@ms-cloudpack/api-server": "^0.50.0",
+    "@ms-cloudpack/app-server": "^0.15.3",
+    "@ms-cloudpack/common-types": "^0.19.1",
+    "@ms-cloudpack/config": "^0.27.2",
+    "@ms-cloudpack/create-express-app": "^1.8.3",
+    "@ms-cloudpack/overlay": "^0.17.56",
+    "@ms-cloudpack/package-utilities": "^10.0.1",
     "@ms-cloudpack/path-string-parsing": "^1.2.4",
-    "@ms-cloudpack/path-utilities": "^2.7.36",
+    "@ms-cloudpack/path-utilities": "^2.7.38",
     "@ms-cloudpack/task-reporter": "^0.14.4",
     "@ms-cloudpack/telemetry": "^0.6.1",
     "@storybook/core-common": "^7.0.0",
@@ -42,7 +42,7 @@
     "ts-dedent": "^2.2.0"
   },
   "devDependencies": {
-    "@ms-cloudpack/common-types": "^0.18.0",
+    "@ms-cloudpack/common-types": "^0.19.1",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@storybook/types": "^7.0.0"

package/lib/getNodeModuleDir.d.ts

@@ -1,2 +0,0 @@
-export declare function getNodeModuleDir(moduleName: string): string;
-//# sourceMappingURL=getNodeModuleDir.d.ts.map

package/lib/getNodeModuleDir.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNodeModuleDir.d.ts","sourceRoot":"","sources":["../src/getNodeModuleDir.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG3D"}

package/lib/getNodeModuleDir.js

@@ -1,7 +0,0 @@
-import { createRequire } from 'module';
-import { dirname } from 'path';
-export function getNodeModuleDir(moduleName) {
-    const require = createRequire(import.meta.url);
-    return dirname(require.resolve(`${moduleName}/package.json`));
-}
-//# sourceMappingURL=getNodeModuleDir.js.map

package/lib/getNodeModuleDir.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNodeModuleDir.js","sourceRoot":"","sources":["../src/getNodeModuleDir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,UAAU,eAAe,CAAC,CAAC,CAAC;AAChE,CAAC","sourcesContent":["import { createRequire } from 'module';\nimport { dirname } from 'path';\n\nexport function getNodeModuleDir(moduleName: string): string {\n  const require = createRequire(import.meta.url);\n  return dirname(require.resolve(`${moduleName}/package.json`));\n}\n"]}