@storybook/core-server 7.0.0-alpha.45 → 7.0.0-alpha.46

package/dist/cjs/build-dev.js

@@ -57,6 +57,7 @@ async function buildDevStandalone(options) {
 
   var _await$Promise$all = await Promise.all([(0, _serverAddress.getServerPort)(options.port), versionUpdates ? (0, _updateCheck.updateCheck)(version) : Promise.resolve({
     success: false,
+    cached: false,
     data: {},
     time: Date.now()
   }), releaseNotes ? (0, _releaseNotes.getReleaseNotesData)(version, _coreCommon.cache) : Promise.resolve((0, _releaseNotes.getReleaseNotesFailedState)(version))]),

package/dist/cjs/build-static.js

@@ -33,6 +33,8 @@ var _metadata = require("./utils/metadata");
 
 var _StoryIndexGenerator = require("./utils/StoryIndexGenerator");
 
+var _summarizeIndex = require("./utils/summarizeIndex");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -181,10 +183,7 @@ async function buildStaticStandalone(options) {
     effects.push(initializedStoryIndexGenerator.then(async function (generator) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
       var payload = storyIndex ? {
-        storyIndex: {
-          storyCount: Object.keys(storyIndex.entries).length,
-          version: storyIndex.v
-        }
+        storyIndex: (0, _summarizeIndex.summarizeIndex)(storyIndex)
       } : undefined;
       await (0, _telemetry.telemetry)('build', payload, {
         configDir: options.configDir

package/dist/cjs/dev-server.js

@@ -34,6 +34,8 @@ var _getBuilders = require("./utils/get-builders");
 
 var _StoryIndexGenerator = require("./utils/StoryIndexGenerator");
 
+var _summarizeIndex = require("./utils/summarizeIndex");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -64,6 +66,12 @@ exports.router = router;
 var DEBOUNCE = 100;
 exports.DEBOUNCE = DEBOUNCE;
 
+var versionStatus = function (versionCheck) {
+  if (versionCheck.error) return 'error';
+  if (versionCheck.cached) return 'cached';
+  return 'success';
+};
+
 async function storybookDevServer(options) {
   var startTime = process.hrtime();
   var app = (0, _express.default)();
@@ -105,11 +113,11 @@ async function storybookDevServer(options) {
   if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
     initializedStoryIndexGenerator.then(async function (generator) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
+      var versionCheck = options.versionCheck,
+          versionUpdates = options.versionUpdates;
       var payload = storyIndex ? {
-        storyIndex: {
-          storyCount: Object.keys(storyIndex.entries).length,
-          version: storyIndex.v
-        }
+        versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled',
+        storyIndex: (0, _summarizeIndex.summarizeIndex)(storyIndex)
       } : undefined;
       (0, _telemetry.telemetry)('dev', payload, {
         configDir: options.configDir

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -209,7 +209,7 @@ class StoryIndexGenerator {
       var csf = await storyIndexer.indexer(absolutePath, {
         makeTitle: makeTitle
       });
-      var componentTags = csf.meta.tags;
+      var componentTags = csf.meta.tags || [];
       csf.stories.forEach(function ({
         id: id,
         name: name,
@@ -217,7 +217,7 @@ class StoryIndexGenerator {
         parameters: parameters
       }) {
         if (!(parameters !== null && parameters !== void 0 && parameters.docsOnly)) {
-          var tags = [...(storyTags || componentTags || []), 'story'];
+          var tags = [...(storyTags || componentTags), 'story'];
           entries.push({
             id: id,
             title: csf.meta.title,
@@ -232,7 +232,7 @@ class StoryIndexGenerator {
       if (this.options.docs.enabled && csf.stories.length) {
         // We always add a template for *.stories.mdx, but only if docs page is enabled for
         // regular CSF files
-        if (storyIndexer.addDocsTemplate || this.options.docs.docsPage) {
+        if (storyIndexer.addDocsTemplate || this.options.docs.docsPage && componentTags.includes('docsPage')) {
           var name = this.options.docs.defaultName;
           var id = (0, _csf.toId)(csf.meta.title, name);
           entries.unshift({
@@ -241,7 +241,7 @@ class StoryIndexGenerator {
             name: name,
             importPath: importPath,
             type: 'docs',
-            tags: [...(componentTags || []), 'docs'],
+            tags: [...componentTags, 'docs'],
             storiesImports: [],
             standalone: false
           });

package/dist/cjs/utils/__mockdata__/duplicate/A.stories.js

@@ -7,7 +7,8 @@ exports.default = exports.StoryOne = void 0;
 var component = {};
 var _default = {
   component: component,
-  title: 'duplicate/A'
+  title: 'duplicate/A',
+  tags: ['docsPage']
 };
 exports.default = _default;
 var StoryOne = {};

package/dist/cjs/utils/__mockdata__/duplicate/SecondA.stories.js

@@ -7,7 +7,8 @@ exports.default = exports.StoryTwo = void 0;
 var component = {};
 var _default = {
   component: component,
-  title: 'duplicate/A'
+  title: 'duplicate/A',
+  tags: ['docsPage']
 };
 exports.default = _default;
 var StoryTwo = {};

package/dist/cjs/utils/__mockdata__/src/A.stories.js

@@ -7,7 +7,7 @@ exports.default = exports.StoryOne = void 0;
 var component = {};
 var _default = {
   component: component,
-  tags: ['component-tag']
+  tags: ['component-tag', 'docsPage']
 };
 exports.default = _default;
 var StoryOne = {

package/dist/cjs/utils/__mockdata__/src/B.stories.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.StoryOne = void 0;
 var component = {};
 var _default = {
-  component: component
+  component: component,
+  tags: ['docsPage']
 };
 exports.default = _default;
 var StoryOne = {};

package/dist/cjs/utils/__mockdata__/src/D.stories.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.StoryOne = void 0;
 var component = {};
 var _default = {
-  component: component
+  component: component,
+  tags: ['docsPage']
 };
 exports.default = _default;
 var StoryOne = {};

package/dist/cjs/utils/summarizeIndex.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.summarizeIndex = summarizeIndex;
+
+function summarizeIndex(storyIndex) {
+  var storyCount = 0;
+  var docsPageCount = 0;
+  var storiesMdxCount = 0;
+  var mdxCount = 0;
+  Object.values(storyIndex.entries).forEach(function (entry) {
+    if (entry.type === 'story') {
+      storyCount += 1;
+    } else if (entry.type === 'docs') {
+      if (entry.standalone) {
+        mdxCount += 1;
+      } else if (entry.importPath.endsWith('.mdx')) {
+        storiesMdxCount += 1;
+      } else {
+        docsPageCount += 1;
+      }
+    }
+  });
+  return {
+    storyCount: storyCount,
+    docsPageCount: docsPageCount,
+    storiesMdxCount: storiesMdxCount,
+    mdxCount: mdxCount,
+    version: storyIndex.v
+  };
+}

package/dist/cjs/utils/update-check.js

@@ -20,6 +20,12 @@ var _coreCommon = require("@storybook/core-common");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var _process$env = process.env,
     _process$env$STORYBOO = _process$env.STORYBOOK_VERSION_BASE,
     STORYBOOK_VERSION_BASE = _process$env$STORYBOO === void 0 ? 'https://storybook.js.org' : _process$env$STORYBOO,
@@ -43,16 +49,20 @@ var updateCheck = async function (version) {
       var data = await fromFetch.json();
       result = {
         success: true,
+        cached: false,
         data: data,
         time: time
       };
       await _coreCommon.cache.set('lastUpdateCheck', result);
     } else {
-      result = fromCache;
+      result = _objectSpread(_objectSpread({}, fromCache), {}, {
+        cached: true
+      });
     }
   } catch (error) {
     result = {
       success: false,
+      cached: false,
       error: error,
       time: time
     };

package/dist/esm/build-dev.js

@@ -36,6 +36,7 @@ export async function buildDevStandalone(options) {
 
   var _await$Promise$all = await Promise.all([getServerPort(options.port), versionUpdates ? updateCheck(version) : Promise.resolve({
     success: false,
+    cached: false,
     data: {},
     time: Date.now()
   }), releaseNotes ? getReleaseNotesData(version, cache) : Promise.resolve(getReleaseNotesFailedState(version))]),

package/dist/esm/build-static.js

@@ -30,6 +30,7 @@ import { getBuilders } from './utils/get-builders';
 import { extractStoriesJson, convertToIndexV3 } from './utils/stories-json';
 import { extractStorybookMetadata } from './utils/metadata';
 import { StoryIndexGenerator } from './utils/StoryIndexGenerator';
+import { summarizeIndex } from './utils/summarizeIndex';
 export async function buildStaticStandalone(options) {
   var _options$staticDir;
 
@@ -157,10 +158,7 @@ export async function buildStaticStandalone(options) {
     effects.push(initializedStoryIndexGenerator.then(async function (generator) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
       var payload = storyIndex ? {
-        storyIndex: {
-          storyCount: Object.keys(storyIndex.entries).length,
-          version: storyIndex.v
-        }
+        storyIndex: summarizeIndex(storyIndex)
       } : undefined;
       await telemetry('build', payload, {
         configDir: options.configDir

package/dist/esm/dev-server.js

@@ -29,10 +29,18 @@ import { useStorybookMetadata } from './utils/metadata';
 import { getServerChannel } from './utils/get-server-channel';
 import { openInBrowser } from './utils/open-in-browser';
 import { getBuilders } from './utils/get-builders';
-import { StoryIndexGenerator } from './utils/StoryIndexGenerator'; // @ts-expect-error (Converted from ts-ignore)
+import { StoryIndexGenerator } from './utils/StoryIndexGenerator';
+import { summarizeIndex } from './utils/summarizeIndex'; // @ts-expect-error (Converted from ts-ignore)
 
 export var router = new Router();
 export var DEBOUNCE = 100;
+
+var versionStatus = function (versionCheck) {
+  if (versionCheck.error) return 'error';
+  if (versionCheck.cached) return 'cached';
+  return 'success';
+};
+
 export async function storybookDevServer(options) {
   var startTime = process.hrtime();
   var app = express();
@@ -74,11 +82,11 @@ export async function storybookDevServer(options) {
   if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
     initializedStoryIndexGenerator.then(async function (generator) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
+      var versionCheck = options.versionCheck,
+          versionUpdates = options.versionUpdates;
       var payload = storyIndex ? {
-        storyIndex: {
-          storyCount: Object.keys(storyIndex.entries).length,
-          version: storyIndex.v
-        }
+        versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled',
+        storyIndex: summarizeIndex(storyIndex)
       } : undefined;
       telemetry('dev', payload, {
         configDir: options.configDir

package/dist/esm/utils/StoryIndexGenerator.js

@@ -190,7 +190,7 @@ export class StoryIndexGenerator {
       var csf = await storyIndexer.indexer(absolutePath, {
         makeTitle: makeTitle
       });
-      var componentTags = csf.meta.tags;
+      var componentTags = csf.meta.tags || [];
       csf.stories.forEach(function ({
         id: id,
         name: name,
@@ -198,7 +198,7 @@ export class StoryIndexGenerator {
         parameters: parameters
       }) {
         if (!(parameters !== null && parameters !== void 0 && parameters.docsOnly)) {
-          var tags = [...(storyTags || componentTags || []), 'story'];
+          var tags = [...(storyTags || componentTags), 'story'];
           entries.push({
             id: id,
             title: csf.meta.title,
@@ -213,7 +213,7 @@ export class StoryIndexGenerator {
       if (this.options.docs.enabled && csf.stories.length) {
         // We always add a template for *.stories.mdx, but only if docs page is enabled for
         // regular CSF files
-        if (storyIndexer.addDocsTemplate || this.options.docs.docsPage) {
+        if (storyIndexer.addDocsTemplate || this.options.docs.docsPage && componentTags.includes('docsPage')) {
           var name = this.options.docs.defaultName;
           var id = toId(csf.meta.title, name);
           entries.unshift({
@@ -222,7 +222,7 @@ export class StoryIndexGenerator {
             name: name,
             importPath: importPath,
             type: 'docs',
-            tags: [...(componentTags || []), 'docs'],
+            tags: [...componentTags, 'docs'],
             storiesImports: [],
             standalone: false
           });

package/dist/esm/utils/__mockdata__/duplicate/A.stories.js

@@ -1,6 +1,7 @@
 var component = {};
 export default {
   component: component,
-  title: 'duplicate/A'
+  title: 'duplicate/A',
+  tags: ['docsPage']
 };
 export var StoryOne = {};

package/dist/esm/utils/__mockdata__/duplicate/SecondA.stories.js

@@ -1,6 +1,7 @@
 var component = {};
 export default {
   component: component,
-  title: 'duplicate/A'
+  title: 'duplicate/A',
+  tags: ['docsPage']
 };
 export var StoryTwo = {};

package/dist/esm/utils/__mockdata__/src/A.stories.js

@@ -1,7 +1,7 @@
 var component = {};
 export default {
   component: component,
-  tags: ['component-tag']
+  tags: ['component-tag', 'docsPage']
 };
 export var StoryOne = {
   tags: ['story-tag']

package/dist/esm/utils/__mockdata__/src/B.stories.js

@@ -1,5 +1,6 @@
 var component = {};
 export default {
-  component: component
+  component: component,
+  tags: ['docsPage']
 };
 export var StoryOne = {};

package/dist/esm/utils/__mockdata__/src/D.stories.js

@@ -1,5 +1,6 @@
 var component = {};
 export default {
-  component: component
+  component: component,
+  tags: ['docsPage']
 };
 export var StoryOne = {};

package/dist/esm/utils/summarizeIndex.js

@@ -0,0 +1,26 @@
+export function summarizeIndex(storyIndex) {
+  var storyCount = 0;
+  var docsPageCount = 0;
+  var storiesMdxCount = 0;
+  var mdxCount = 0;
+  Object.values(storyIndex.entries).forEach(function (entry) {
+    if (entry.type === 'story') {
+      storyCount += 1;
+    } else if (entry.type === 'docs') {
+      if (entry.standalone) {
+        mdxCount += 1;
+      } else if (entry.importPath.endsWith('.mdx')) {
+        storiesMdxCount += 1;
+      } else {
+        docsPageCount += 1;
+      }
+    }
+  });
+  return {
+    storyCount: storyCount,
+    docsPageCount: docsPageCount,
+    storiesMdxCount: storiesMdxCount,
+    mdxCount: mdxCount,
+    version: storyIndex.v
+  };
+}

package/dist/esm/utils/update-check.js

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import fetch from 'node-fetch';
 import chalk from 'chalk';
 import { colors } from '@storybook/node-logger';
@@ -26,16 +32,20 @@ export var updateCheck = async function (version) {
       var data = await fromFetch.json();
       result = {
         success: true,
+        cached: false,
         data: data,
         time: time
       };
       await cache.set('lastUpdateCheck', result);
     } else {
-      result = fromCache;
+      result = _objectSpread(_objectSpread({}, fromCache), {}, {
+        cached: true
+      });
     }
   } catch (error) {
     result = {
       success: false,
+      cached: false,
       error: error,
       time: time
     };

package/dist/types/utils/__mockdata__/src/B.stories.d.ts

@@ -1,5 +1,6 @@
 declare const _default: {
     component: {};
+    tags: string[];
 };
 export default _default;
 export declare const StoryOne: {};

package/dist/types/utils/metadata.d.ts

@@ -1,3 +1,3 @@
-import { Router } from 'express';
+import type { Router } from 'express';
 export declare function extractStorybookMetadata(outputFile: string, configDir: string): Promise<void>;
 export declare function useStorybookMetadata(router: Router, configDir?: string): void;

package/dist/types/utils/server-init.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Express } from 'express';
+import type { Express } from 'express';
 import http from 'http';
 import https from 'https';
 export declare function getServer(app: Express, options: {

package/dist/types/utils/stories-json.d.ts

@@ -1,7 +1,7 @@
-import { Router } from 'express';
+import type { Router } from 'express';
 import type { CoreCommon_NormalizedStoriesSpecifier, Store_StoryIndex, Store_StoryIndexV3 } from '@storybook/types';
-import { StoryIndexGenerator } from './StoryIndexGenerator';
-import { ServerChannel } from './get-server-channel';
+import type { StoryIndexGenerator } from './StoryIndexGenerator';
+import type { ServerChannel } from './get-server-channel';
 export declare const DEBOUNCE = 100;
 export declare function extractStoriesJson(outputFile: string, initializedStoryIndexGenerator: Promise<StoryIndexGenerator>, transform?: (index: Store_StoryIndex) => any): Promise<void>;
 export declare function useStoriesJson({ router, initializedStoryIndexGenerator, workingDir, serverChannel, normalizedStories, }: {

package/dist/types/utils/summarizeIndex.d.ts

@@ -0,0 +1,8 @@
+import type { Store_StoryIndex } from '@storybook/types';
+export declare function summarizeIndex(storyIndex: Store_StoryIndex): {
+    storyCount: number;
+    docsPageCount: number;
+    storiesMdxCount: number;
+    mdxCount: number;
+    version: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "7.0.0-alpha.45",
+  "version": "7.0.0-alpha.46",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -35,17 +35,17 @@
   "dependencies": {
     "@aw-web-design/x-default-browser": "1.4.88",
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/builder-manager": "7.0.0-alpha.45",
-    "@storybook/core-client": "7.0.0-alpha.45",
-    "@storybook/core-common": "7.0.0-alpha.45",
-    "@storybook/core-events": "7.0.0-alpha.45",
+    "@storybook/builder-manager": "7.0.0-alpha.46",
+    "@storybook/core-client": "7.0.0-alpha.46",
+    "@storybook/core-common": "7.0.0-alpha.46",
+    "@storybook/core-events": "7.0.0-alpha.46",
     "@storybook/csf": "next",
-    "@storybook/csf-tools": "7.0.0-alpha.45",
+    "@storybook/csf-tools": "7.0.0-alpha.46",
     "@storybook/docs-mdx": "0.0.1-canary.12433cf.0",
-    "@storybook/node-logger": "7.0.0-alpha.45",
-    "@storybook/store": "7.0.0-alpha.45",
-    "@storybook/telemetry": "7.0.0-alpha.45",
-    "@storybook/types": "7.0.0-alpha.45",
+    "@storybook/node-logger": "7.0.0-alpha.46",
+    "@storybook/store": "7.0.0-alpha.46",
+    "@storybook/telemetry": "7.0.0-alpha.46",
+    "@storybook/types": "7.0.0-alpha.46",
     "@types/node": "^16.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
@@ -77,7 +77,7 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "7.0.0-alpha.45",
+    "@storybook/builder-webpack5": "7.0.0-alpha.46",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -103,5 +103,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3ef14366115c56c1d45c0359ff681cc47ed50532"
+  "gitHead": "c64b5be851ed2affac56e1daaac3f453fbe6f230"
 }