@storybook/core-server 6.4.0-rc.3 → 6.4.0-rc.7

package/dist/cjs/build-static.js

@@ -127,7 +127,8 @@ async function buildStaticStandalone(options) {
     };
     var stories = (0, _coreCommon.normalizeStories)(await presets.apply('stories'), directories);
     await (0, _storiesJson.extractStoriesJson)(_path.default.join(options.outputDir, 'stories.json'), stories, _objectSpread(_objectSpread({}, directories), {}, {
-      storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7)
+      storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
+      storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
     }));
   }
 

package/dist/cjs/cli/utils.js

@@ -44,7 +44,7 @@ var warnDLLsDeprecated = warnDeprecatedFlag(`
 var warnStaticDirDeprecated = warnDeprecatedFlag(`
     --static-dir CLI flag is deprecated, see:
 
-    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-static-dir-flag
+    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated---static-dir-cli-flag
   `);
 
 function checkDeprecatedFlags({

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -23,6 +23,8 @@ var _slash = _interopRequireDefault(require("slash"));
 
 var _store = require("@storybook/store");
 
+var _coreCommon = require("@storybook/core-common");
+
 var _nodeLogger = require("@storybook/node-logger");
 
 var _csfTools = require("@storybook/csf-tools");
@@ -47,15 +49,6 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function sortExtractedStories(stories, storySortParameter, fileNameOrder) {
-  var sortableStories = Object.values(stories);
-  (0, _store.sortStoriesV7)(sortableStories, storySortParameter, fileNameOrder);
-  return sortableStories.reduce(function (acc, item) {
-    acc[item.id] = item;
-    return acc;
-  }, {});
-}
-
 class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
   // Later, we'll combine each of these subsets together to form the full index
@@ -117,7 +110,7 @@ class StoryIndexGenerator {
     var entry = this.storyIndexEntries.get(specifier);
 
     try {
-      var importPath = (0, _slash.default)(relativePath[0] === '.' ? relativePath : `./${relativePath}`);
+      var importPath = (0, _slash.default)((0, _coreCommon.normalizeStoryPath)(relativePath));
       var defaultTitle = (0, _store.autoTitleFromSpecifier)(importPath, specifier);
       var csf = (await (0, _csfTools.readCsfOrMdx)(absolutePath, {
         defaultTitle: defaultTitle
@@ -152,8 +145,19 @@ class StoryIndexGenerator {
     storiesList.forEach(function (subStories) {
       Object.assign(stories, subStories);
     });
-    var storySortParameter = await this.getStorySortParameter();
-    return sortExtractedStories(stories, storySortParameter, this.storyFileNames());
+    var sortableStories = Object.values(stories); // Skip sorting if we're in v6 mode because we don't have
+    // all the info we need here
+
+    if (this.options.storyStoreV7) {
+      var storySortParameter = await this.getStorySortParameter();
+      var fileNameOrder = this.storyFileNames();
+      (0, _store.sortStoriesV7)(sortableStories, storySortParameter, fileNameOrder);
+    }
+
+    return sortableStories.reduce(function (acc, item) {
+      acc[item.id] = item;
+      return acc;
+    }, {});
   }
 
   async getIndex() {

package/dist/cjs/utils/stories-json.js

@@ -42,7 +42,8 @@ async function useStoriesJson(router, serverChannel, options, workingDir = proce
   var generator = new _StoryIndexGenerator.StoryIndexGenerator(normalizedStories, {
     configDir: options.configDir,
     workingDir: workingDir,
-    storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7)
+    storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
+    storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
   }); // Wait until someone actually requests `stories.json` before we start generating/watching.
   // This is mainly for testing purposes.
 

package/dist/esm/build-static.js

@@ -98,7 +98,8 @@ export async function buildStaticStandalone(options) {
     };
     var stories = normalizeStories(await presets.apply('stories'), directories);
     await extractStoriesJson(path.join(options.outputDir, 'stories.json'), stories, _objectSpread(_objectSpread({}, directories), {}, {
-      storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7)
+      storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
+      storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
     }));
   }
 

package/dist/esm/cli/utils.js

@@ -30,7 +30,7 @@ var warnDLLsDeprecated = warnDeprecatedFlag(`
 var warnStaticDirDeprecated = warnDeprecatedFlag(`
     --static-dir CLI flag is deprecated, see:
 
-    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-static-dir-flag
+    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated---static-dir-cli-flag
   `);
 export function checkDeprecatedFlags({
   dll: dll,

package/dist/esm/utils/StoryIndexGenerator.js

@@ -25,18 +25,9 @@ import fs from 'fs-extra';
 import glob from 'globby';
 import slash from 'slash';
 import { autoTitleFromSpecifier, sortStoriesV7 } from '@storybook/store';
+import { normalizeStoryPath } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 import { readCsfOrMdx, getStorySortParameter } from '@storybook/csf-tools';
-
-function sortExtractedStories(stories, storySortParameter, fileNameOrder) {
-  var sortableStories = Object.values(stories);
-  sortStoriesV7(sortableStories, storySortParameter, fileNameOrder);
-  return sortableStories.reduce(function (acc, item) {
-    acc[item.id] = item;
-    return acc;
-  }, {});
-}
-
 export class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
   // Later, we'll combine each of these subsets together to form the full index
@@ -95,7 +86,7 @@ export class StoryIndexGenerator {
     var entry = this.storyIndexEntries.get(specifier);
 
     try {
-      var importPath = slash(relativePath[0] === '.' ? relativePath : `./${relativePath}`);
+      var importPath = slash(normalizeStoryPath(relativePath));
       var defaultTitle = autoTitleFromSpecifier(importPath, specifier);
       var csf = (await readCsfOrMdx(absolutePath, {
         defaultTitle: defaultTitle
@@ -129,8 +120,19 @@ export class StoryIndexGenerator {
     storiesList.forEach(function (subStories) {
       Object.assign(stories, subStories);
     });
-    var storySortParameter = await this.getStorySortParameter();
-    return sortExtractedStories(stories, storySortParameter, this.storyFileNames());
+    var sortableStories = Object.values(stories); // Skip sorting if we're in v6 mode because we don't have
+    // all the info we need here
+
+    if (this.options.storyStoreV7) {
+      var storySortParameter = await this.getStorySortParameter();
+      var fileNameOrder = this.storyFileNames();
+      sortStoriesV7(sortableStories, storySortParameter, fileNameOrder);
+    }
+
+    return sortableStories.reduce(function (acc, item) {
+      acc[item.id] = item;
+      return acc;
+    }, {});
   }
 
   async getIndex() {

package/dist/esm/utils/stories-json.js

@@ -21,7 +21,8 @@ export async function useStoriesJson(router, serverChannel, options, workingDir
   var generator = new StoryIndexGenerator(normalizedStories, {
     configDir: options.configDir,
     workingDir: workingDir,
-    storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7)
+    storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
+    storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
   }); // Wait until someone actually requests `stories.json` before we start generating/watching.
   // This is mainly for testing purposes.
 

package/dist/modern/build-static.js

@@ -98,7 +98,8 @@ export async function buildStaticStandalone(options) {
     };
     var stories = normalizeStories(await presets.apply('stories'), directories);
     await extractStoriesJson(path.join(options.outputDir, 'stories.json'), stories, _objectSpread(_objectSpread({}, directories), {}, {
-      storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7)
+      storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
+      storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
     }));
   }
 

package/dist/modern/cli/utils.js

@@ -30,7 +30,7 @@ var warnDLLsDeprecated = warnDeprecatedFlag(`
 var warnStaticDirDeprecated = warnDeprecatedFlag(`
     --static-dir CLI flag is deprecated, see:
 
-    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-static-dir-flag
+    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated---static-dir-cli-flag
   `);
 export function checkDeprecatedFlags({
   dll: dll,

package/dist/modern/utils/StoryIndexGenerator.js

@@ -25,18 +25,9 @@ import fs from 'fs-extra';
 import glob from 'globby';
 import slash from 'slash';
 import { autoTitleFromSpecifier, sortStoriesV7 } from '@storybook/store';
+import { normalizeStoryPath } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 import { readCsfOrMdx, getStorySortParameter } from '@storybook/csf-tools';
-
-function sortExtractedStories(stories, storySortParameter, fileNameOrder) {
-  var sortableStories = Object.values(stories);
-  sortStoriesV7(sortableStories, storySortParameter, fileNameOrder);
-  return sortableStories.reduce(function (acc, item) {
-    acc[item.id] = item;
-    return acc;
-  }, {});
-}
-
 export class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
   // Later, we'll combine each of these subsets together to form the full index
@@ -95,7 +86,7 @@ export class StoryIndexGenerator {
     var entry = this.storyIndexEntries.get(specifier);
 
     try {
-      var importPath = slash(relativePath[0] === '.' ? relativePath : `./${relativePath}`);
+      var importPath = slash(normalizeStoryPath(relativePath));
       var defaultTitle = autoTitleFromSpecifier(importPath, specifier);
       var csf = (await readCsfOrMdx(absolutePath, {
         defaultTitle: defaultTitle
@@ -129,8 +120,19 @@ export class StoryIndexGenerator {
     storiesList.forEach(function (subStories) {
       Object.assign(stories, subStories);
     });
-    var storySortParameter = await this.getStorySortParameter();
-    return sortExtractedStories(stories, storySortParameter, this.storyFileNames());
+    var sortableStories = Object.values(stories); // Skip sorting if we're in v6 mode because we don't have
+    // all the info we need here
+
+    if (this.options.storyStoreV7) {
+      var storySortParameter = await this.getStorySortParameter();
+      var fileNameOrder = this.storyFileNames();
+      sortStoriesV7(sortableStories, storySortParameter, fileNameOrder);
+    }
+
+    return sortableStories.reduce(function (acc, item) {
+      acc[item.id] = item;
+      return acc;
+    }, {});
   }
 
   async getIndex() {

package/dist/modern/utils/stories-json.js

@@ -21,7 +21,8 @@ export async function useStoriesJson(router, serverChannel, options, workingDir
   var generator = new StoryIndexGenerator(normalizedStories, {
     configDir: options.configDir,
     workingDir: workingDir,
-    storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7)
+    storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
+    storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
   }); // Wait until someone actually requests `stories.json` before we start generating/watching.
   // This is mainly for testing purposes.
 

package/dist/ts3.4/utils/StoryIndexGenerator.d.ts

@@ -6,6 +6,7 @@ export declare class StoryIndexGenerator {
         workingDir: Path;
         configDir: Path;
         storiesV2Compatibility: boolean;
+        storyStoreV7: boolean;
     };
     private storyIndexEntries;
     private lastIndex?;
@@ -13,6 +14,7 @@ export declare class StoryIndexGenerator {
         workingDir: Path;
         configDir: Path;
         storiesV2Compatibility: boolean;
+        storyStoreV7: boolean;
     });
     initialize(): Promise<void>;
     ensureExtracted(): Promise<StoryIndex['stories'][]>;

package/dist/ts3.4/utils/stories-json.d.ts

@@ -6,5 +6,6 @@ export declare function extractStoriesJson(outputFile: string, normalizedStories
     configDir: string;
     workingDir: string;
     storiesV2Compatibility: boolean;
+    storyStoreV7: boolean;
 }): Promise<void>;
 export declare function useStoriesJson(router: Router, serverChannel: ServerChannel, options: Options, workingDir?: string): Promise<void>;

package/dist/ts3.9/utils/StoryIndexGenerator.d.ts

@@ -6,6 +6,7 @@ export declare class StoryIndexGenerator {
         workingDir: Path;
         configDir: Path;
         storiesV2Compatibility: boolean;
+        storyStoreV7: boolean;
     };
     private storyIndexEntries;
     private lastIndex?;
@@ -13,6 +14,7 @@ export declare class StoryIndexGenerator {
         workingDir: Path;
         configDir: Path;
         storiesV2Compatibility: boolean;
+        storyStoreV7: boolean;
     });
     initialize(): Promise<void>;
     ensureExtracted(): Promise<StoryIndex['stories'][]>;

package/dist/ts3.9/utils/stories-json.d.ts

@@ -6,5 +6,6 @@ export declare function extractStoriesJson(outputFile: string, normalizedStories
     configDir: string;
     workingDir: string;
     storiesV2Compatibility: boolean;
+    storyStoreV7: boolean;
 }): Promise<void>;
 export declare function useStoriesJson(router: Router, serverChannel: ServerChannel, options: Options, workingDir?: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "6.4.0-rc.3",
+  "version": "6.4.0-rc.7",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -41,16 +41,16 @@
   },
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/builder-webpack4": "6.4.0-rc.3",
-    "@storybook/core-client": "6.4.0-rc.3",
-    "@storybook/core-common": "6.4.0-rc.3",
-    "@storybook/core-events": "6.4.0-rc.3",
+    "@storybook/builder-webpack4": "6.4.0-rc.7",
+    "@storybook/core-client": "6.4.0-rc.7",
+    "@storybook/core-common": "6.4.0-rc.7",
+    "@storybook/core-events": "6.4.0-rc.7",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/csf-tools": "6.4.0-rc.3",
-    "@storybook/manager-webpack4": "6.4.0-rc.3",
-    "@storybook/node-logger": "6.4.0-rc.3",
+    "@storybook/csf-tools": "6.4.0-rc.7",
+    "@storybook/manager-webpack4": "6.4.0-rc.7",
+    "@storybook/node-logger": "6.4.0-rc.7",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "6.4.0-rc.3",
+    "@storybook/store": "6.4.0-rc.7",
     "@types/node": "^14.0.10",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
@@ -84,7 +84,7 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "6.4.0-rc.3",
+    "@storybook/builder-webpack5": "6.4.0-rc.7",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -92,8 +92,8 @@
     "jest-specific-snapshot": "^4.0.0"
   },
   "peerDependencies": {
-    "@storybook/builder-webpack5": "6.4.0-rc.3",
-    "@storybook/manager-webpack5": "6.4.0-rc.3",
+    "@storybook/builder-webpack5": "6.4.0-rc.7",
+    "@storybook/manager-webpack5": "6.4.0-rc.7",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
@@ -111,6 +111,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f23a6daa88a2f051e2a94d803431ab3b3d11e26b",
+  "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40",
   "sbmodern": "dist/modern/index.js"
 }